rpms/gpp4/devel gpp4-gfortran.patch, NONE, 1.1 gpp4-ppc.patch, NONE, 1.1 gpp4.spec, 1.9, 1.10

[Timothy Fenn]

Author: timfenn

Update of /cvs/pkgs/rpms/gpp4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17924

Modified Files:
	gpp4.spec 
Added Files:
	gpp4-gfortran.patch gpp4-ppc.patch 
Log Message:
* Wed Sep 16 2009 Tim Fenn <fenn at stanford.edu> - 1.2.0-2.20090916bzr58
- add patch for mixed fortran/c library
- add gfortran to buildrequires
- updated PPC patches



gpp4-gfortran.patch:
 configure.ac      |    1 +
 src_f/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gpp4-gfortran.patch ---
--- configure.ac_orig	2009-09-16 13:36:47.717928637 -0700
+++ configure.ac	2009-09-16 14:49:20.850157550 -0700
@@ -16,6 +16,7 @@
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
+AC_F77_LIBRARY_LDFLAGS
 
 # check for libm
 AC_CHECK_LIBM
--- src_f/Makefile.am_orig	2009-09-16 13:36:08.036157950 -0700
+++ src_f/Makefile.am	2009-09-16 13:36:40.134908087 -0700
@@ -16,7 +16,7 @@
 
 CLEANFILES = unix.f
 
-libgpp4f_la_LIBADD = $(top_builddir)/src/libgpp4.la @MMDB_LIBS@
+libgpp4f_la_LIBADD = $(top_builddir)/src/libgpp4.la @MMDB_LIBS@ $(FLIBS)
 libgpp4f_la_CFLAGS = $(AM_CFLAGS) @MMDB_CFLAGS@
 
 # IMPORTANT!

gpp4-ppc.patch:
 library_f.c |   31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

--- NEW FILE gpp4-ppc.patch ---
--- src_f/library_f.c_orig	2009-09-16 15:07:40.731159438 -0700
+++ src_f/library_f.c	2009-09-16 15:10:54.746202079 -0700
@@ -686,28 +686,12 @@
   return isatty(*iunit);
 }
 
-#endif /* end of linuxppc xlf support */
-
-
-#if defined (sun)
-int isatty_(int *iunit)
-{
-  return isatty(*iunit);
-}
-#endif
-
-/* neither gfortran or g95 have isatty */
-/* not true, since August 05 this has been added to gfortran */
-// It's not in gfortran 4.4.3
-
 /* G95 support */
-#if defined(G95) || defined (GFORTRAN)
+#elif defined(G95) || defined (GFORTRAN)
 int isatty_(int *iunit)
 {
   return isatty(*iunit);
 }
-#endif
-#if defined(G95) || defined (GFORTRAN)
 
 /* FORTRAN gerror intrinsic */
 int gerror_(str, Lstr)
@@ -725,7 +709,20 @@
   }
   return 0;
 }
+#endif
+
+#if defined (sun)
+int isatty_(int *iunit)
+{
+  return isatty(*iunit);
+}
+#endif
 
+/* neither gfortran or g95 have isatty */
+/* not true, since August 05 this has been added to gfortran */
+// It's not in gfortran 4.4.3
+
+#if defined(G95) || defined (GFORTRAN)
 /* FORTRAN IErrNo intrinsic */
 int ierrno_() {
   return errno;


Index: gpp4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpp4/devel/gpp4.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gpp4.spec	16 Sep 2009 20:11:56 -0000	1.9
+++ gpp4.spec	16 Sep 2009 22:41:52 -0000	1.10
@@ -3,7 +3,7 @@
 Summary: Library providing specific CCP4 functionality 
 Name: gpp4
 Version: 1.2.0
-Release: 1.20090916bzr58%{?dist}
+Release: 2.20090916bzr58%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 URL: http://dmz-212.daimi.au.dk/~mok/%{name}
@@ -12,12 +12,15 @@ URL: http://dmz-212.daimi.au.dk/~mok/%{n
 #  bzr branch -r 58 lp:gpp4 gpp4-1.2.0
 #  tar cvzf gpp4-1.2.0-20090916bzr58.tar.gz gpp4-1.2.0
 Source0: gpp4-1.2.0-20090916bzr58.tar.gz
+Patch0: gpp4-gfortran.patch
+Patch1: gpp4-ppc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: doxygen
 BuildRequires: mmdb-devel
+BuildRequires: gcc-gfortran
 
 %description
 
@@ -67,6 +70,8 @@ development.
 
 %prep
 %setup -q
+%patch0 -p0
+%patch1 -p0
 aclocal
 libtoolize --automake --copy
 autoconf
@@ -110,6 +115,11 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}f.pc
 
 %changelog
+* Wed Sep 16 2009 Tim Fenn <fenn at stanford.edu> - 1.2.0-2.20090916bzr58
+- add patch for mixed fortran/c library
+- add gfortran to buildrequires
+- updated PPC patches
+
 * Wed Sep 16 2009 Tim Fenn <fenn at stanford.edu> - 1.2.0-1.20090916bzr58
 - update to 1.2.0
 - update to new website