rpms/udunits/EL-6 udunits-1.12.11-64bit.patch, NONE, 1.1 udunits-1.12.11-linuxfixes.patch, NONE, 1.1 sources, 1.3, 1.4 udunits.spec, 1.22, 1.23

Thu Jul 8 18:49:34 UTC 2010

Author: spot

Update of /cvs/pkgs/rpms/udunits/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8954

Modified Files:
	sources udunits.spec 
Added Files:
	udunits-1.12.11-64bit.patch udunits-1.12.11-linuxfixes.patch 
Log Message:
sync

udunits-1.12.11-64bit.patch:
 master.mk.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE udunits-1.12.11-64bit.patch ---
diff -up udunits-1.12.11/src/port/master.mk.in.orig udunits-1.12.11/src/port/master.mk.in
--- udunits-1.12.11/src/port/master.mk.in.orig	2010-07-01 14:34:42.000000000 -0400
+++ udunits-1.12.11/src/port/master.mk.in	2010-07-01 14:35:15.305078324 -0400
@@ -144,7 +144,7 @@ FORTC		= @FORTC@
 # Libraries:
 ############################################################################
 RANLIB		= @RANLIB@
-LIBDIR		= $(DESTDIR)$(exec_prefix)/lib
+LIBDIR		= $(DESTDIR)$(exec_prefix)/lib64
 LIB_A		= lib$(LIBRARY).a
 LIBFILE		= dummy-libfile		# to silence GNU make(1)
 

udunits-1.12.11-linuxfixes.patch:
 Makefile.in              |    2 +-
 lib/Makefile.in          |    4 ++--
 port/cfortran/cfortran.h |    2 +-
 port/master.mk.in        |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE udunits-1.12.11-linuxfixes.patch ---
diff -up udunits-1.12.11/src/lib/Makefile.in.linuxfixes udunits-1.12.11/src/lib/Makefile.in
--- udunits-1.12.11/src/lib/Makefile.in.linuxfixes	2008-07-22 13:05:50.000000000 -0400
+++ udunits-1.12.11/src/lib/Makefile.in	2010-07-01 14:41:07.677083004 -0400
@@ -6,8 +6,8 @@
 
 LIBRARY		= udunits
 
-FLEX		= /usr/local/gnu/bin/flex
-cpp_path	= -DUT_DEFAULT_PATH='"$(prefix)/etc/udunits.dat"'
+FLEX		= /usr/bin/flex
+cpp_path	= -DUT_DEFAULT_PATH='"/etc/udunits.dat"'
 CPPFLAGS	= -I../port/misc -I../port/cfortran $(cpp_path) @CPPFLAGS@
 CFLAGS		= @CFLAGS@
 
diff -up udunits-1.12.11/src/Makefile.in.linuxfixes udunits-1.12.11/src/Makefile.in
--- udunits-1.12.11/src/Makefile.in.linuxfixes	2009-01-05 12:03:31.000000000 -0500
+++ udunits-1.12.11/src/Makefile.in	2010-07-01 14:41:07.677083004 -0400
@@ -68,7 +68,7 @@ $(MANUALS) dummy:
 @PERL_DISTCLEAN@ dummy:	perl/Makefile
 
 perl/Makefile:		perl/Makefile.PL
-	-cd perl && $(PERL) Makefile.PL
+	-cd perl && $(PERL) Makefile.PL PREFIX=$(RPM_BUILD_ROOT)/usr INSTALLDIRS=vendor
 
 install:	whatis
 
diff -up udunits-1.12.11/src/port/cfortran/cfortran.h.linuxfixes udunits-1.12.11/src/port/cfortran/cfortran.h
--- udunits-1.12.11/src/port/cfortran/cfortran.h.linuxfixes	2008-07-22 12:47:24.000000000 -0400
+++ udunits-1.12.11/src/port/cfortran/cfortran.h	2010-07-01 14:41:07.677083004 -0400
@@ -84,7 +84,7 @@ only C calling FORTRAN subroutines will 
 #if !(defined(NAGf90Fortran)||defined(f2cFortran)||defined(hpuxFortran)||defined(apolloFortran)||defined(sunFortran)||defined(IBMR2Fortran)||defined(CRAYFortran))
 #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
 /* If no Fortran compiler is given, we choose one for the machines we know.   */
-#if defined(lynx) || defined(VAXUltrix)
+#if defined(lynx) || defined(VAXUltrix) || defined(__linux__)
 #define f2cFortran    /* Lynx:      Only support f2c at the moment.
                          VAXUltrix: f77 behaves like f2c.
                            Support f2c or f77 with gcc, vcc with f2c. 
diff -up udunits-1.12.11/src/port/master.mk.in.linuxfixes udunits-1.12.11/src/port/master.mk.in
--- udunits-1.12.11/src/port/master.mk.in.linuxfixes	2010-06-04 11:34:57.000000000 -0400
+++ udunits-1.12.11/src/port/master.mk.in	2010-07-01 14:41:23.436203759 -0400
@@ -351,7 +351,7 @@ dummy_incdir $(INCDIR):
 ############################################################################
 # `etc/' files:
 ############################################################################
-ETCDIR	= $(DESTDIR)$(prefix)/etc
+ETCDIR	= $(DESTDIR)/etc
 ETCFILE	= dummy-etcfile		# to silence GNU make(1)
 
 installed_etcfiles:
@@ -382,7 +382,7 @@ dummy_etcdir $(ETCDIR):
 ############################################################################
 # Manual Pages:
 ############################################################################
-MANDIR		= $(DESTDIR)$(prefix)/man
+MANDIR		= $(DESTDIR)$(prefix)/share/man
 MANUAL		= dummy-manual	# to slience GNU make
 WHATIS		= @WHATIS@
 # The following macro should be empty on systems that don't


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udunits/EL-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Sep 2008 17:24:38 -0000	1.3
+++ sources	8 Jul 2010 18:49:33 -0000	1.4
@@ -1 +1 @@
-2bf4ba7a92e4c45b9e6003a295ca4e65  udunits-1.12.9.tar.gz
+2d984c738be0d674ec774d03997fdd9c  udunits-1.12.11.tar.gz


Index: udunits.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udunits/EL-6/udunits.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- udunits.spec	20 Aug 2009 02:47:15 -0000	1.22
+++ udunits.spec	8 Jul 2010 18:49:34 -0000	1.23
@@ -1,15 +1,14 @@
 Name: udunits
-Version: 1.12.9
-Release: 5%{?dist}
+Version: 1.12.11
+Release: 1%{?dist}
 Summary: A library for manipulating units of physical quantities
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.unidata.ucar.edu/software/udunits/
-Source0: ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-1.12.9.tar.gz
+Source0: ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-%{version}.tar.gz
 Source1: udunits-wrapper.inc
-Patch0: udunits-1.12.4-linuxfixes.patch
-Patch1: udunits-1.12.4-64bit.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: udunits-1.12.11-linuxfixes.patch
+Patch1: udunits-1.12.11-64bit.patch
 BuildRequires: gcc-gfortran, gcc-c++, groff, byacc
 BuildRequires: perl(ExtUtils::MakeMaker)
 
@@ -36,6 +35,7 @@ of the input unit.
 Group: Development/Libraries
 Summary: Headers and libraries for udunits
 Requires: %{name} = %{version}-%{release}
+Provides: %{name}-static = %{version}-%{release}
 
 %description devel
 This package contains the files needed for compiling programs using
@@ -67,12 +67,10 @@ export LD_MATH=-lm 
 make all 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 cd src/
-sed "s?/usr?${RPM_BUILD_ROOT}/usr?" Makefile > Makefile.install
-make PREFIX=${RPM_BUILD_ROOT}/usr datadir=${RPM_BUILD_ROOT}/etc sysconfigdir=${RPM_BUILD_ROOT}/etc -f Makefile.install install
+make PREFIX=%{_prefix} datadir=%{_sysconfdir} sysconfigdir=%{_sysconfdir} DESTDIR=%{buildroot} install
 cp -p COPYRIGHT README RELEASE_NOTES VERSION ../
-rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man3f
+rm -rf %{buildroot}%{_mandir}/man3f
 
 # Handle multilib
 # Rename udunits.inc to udunits-<arch>.inc to avoid file conflicts on multilib systems and install wrapper include file
@@ -90,14 +88,11 @@ basearch=sparc
 basearch=sparc64
 %endif
 # Rename files and install wrappers
-mv $RPM_BUILD_ROOT%{_includedir}/udunits.inc $RPM_BUILD_ROOT%{_includedir}/udunits-${basearch}.inc
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/udunits.inc
+mv %{buildroot}%{_includedir}/udunits.inc %{buildroot}%{_includedir}/udunits-${basearch}.inc
+install -m644 %{SOURCE1} %{buildroot}%{_includedir}/udunits.inc
 %endif
 
-find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+find %{buildroot} \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
 
 %files
 %defattr(-,root,root)
@@ -125,6 +120,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/udunitsperl.1.gz
 
 %changelog
+* Thu Jul  1 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.12.11-1
+- update to 1.2.11
+- add -static Provides to -devel
+
+* Fri May 07 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.12.9-7
+- Mass rebuild with perl-5.12.0
+
+* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.12.9-6
+- rebuild against perl 5.10.1
+
 * Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.12.9-5
 - fix upstream URL
 

