rpms/udunits/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 udunits-1.12.4-linuxfixes.patch, 1.1, 1.2 udunits.spec, 1.16, 1.17
Tom Callaway
spot at fedoraproject.org
Fri Sep 12 17:25:09 UTC 2008
Author: spot
Update of /cvs/pkgs/rpms/udunits/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13895
Modified Files:
.cvsignore sources udunits-1.12.4-linuxfixes.patch
udunits.spec
Log Message:
update to 1.12.9
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/udunits/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 14 Apr 2005 21:59:57 -0000 1.2
+++ .cvsignore 12 Sep 2008 17:24:38 -0000 1.3
@@ -1 +1 @@
-udunits-1.12.4.tar.bz2
+udunits-1.12.9.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udunits/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 14 Apr 2005 21:59:57 -0000 1.2
+++ sources 12 Sep 2008 17:24:38 -0000 1.3
@@ -1 +1 @@
-ecafe00024ef19327b1c55af5c021b96 udunits-1.12.4.tar.bz2
+2bf4ba7a92e4c45b9e6003a295ca4e65 udunits-1.12.9.tar.gz
udunits-1.12.4-linuxfixes.patch:
Index: udunits-1.12.4-linuxfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udunits/devel/udunits-1.12.4-linuxfixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udunits-1.12.4-linuxfixes.patch 14 Apr 2005 21:59:57 -0000 1.1
+++ udunits-1.12.4-linuxfixes.patch 12 Sep 2008 17:24:38 -0000 1.2
@@ -1,35 +1,21 @@
---- udunits-1.12.4/src/port/cfortran/cfortran.h.BAD 2005-03-25 22:15:13.000000000 -0600
-+++ udunits-1.12.4/src/port/cfortran/cfortran.h 2005-03-25 22:17:24.000000000 -0600
-@@ -83,7 +83,7 @@
- #if !(defined(NAGf90Fortran)||defined(f2cFortran)||defined(hpuxFortran)||defined(apolloFortran)||defined(sunFortran)||defined(IBMR2Fortran)||defined(CRAYFortran)||defined(pgiFortran))
- #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.
---- udunits-1.12.4/src/udunits/udunits.c.BAD 2005-03-25 22:24:50.000000000 -0600
-+++ udunits-1.12.4/src/udunits/udunits.c 2005-03-25 22:33:08.000000000 -0600
-@@ -4,12 +4,15 @@
- * Test program for the Unidata udunits(3) library.
- */
-
-+#define _POSIX_SOURCE 1
-+
- #include <limits.h> /* for _POSIX_MAX_INPUT */
- #include <stddef.h> /* for size_t */
- #include <stdio.h> /* for I/O functions, and NULL */
- #include <string.h> /* for strlen() & memmove() */
- #include <errno.h> /* for errno */
- #include <ctype.h> /* for isspace() */
-+#include <stdlib.h> /* for exit */
- #include "udunits.h"
+diff -up udunits-1.12.9/src/lib/Makefile.in.linuxfixes udunits-1.12.9/src/lib/Makefile.in
+--- udunits-1.12.9/src/lib/Makefile.in.linuxfixes 2008-07-22 13:05:50.000000000 -0400
++++ udunits-1.12.9/src/lib/Makefile.in 2008-09-12 13:15:25.000000000 -0400
+@@ -6,8 +6,8 @@
- #ifdef YYDEBUG
---- udunits-1.12.4/src/Makefile.in.BAD 2005-03-25 23:03:01.000000000 -0600
-+++ udunits-1.12.4/src/Makefile.in 2005-03-25 23:03:14.000000000 -0600
-@@ -68,7 +68,7 @@
+ 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.9/src/Makefile.in.linuxfixes udunits-1.12.9/src/Makefile.in
+--- udunits-1.12.9/src/Makefile.in.linuxfixes 2003-08-29 14:27:07.000000000 -0400
++++ udunits-1.12.9/src/Makefile.in 2008-09-12 13:15:25.000000000 -0400
+@@ -68,7 +68,7 @@ $(MANUALS) dummy:
@PERL_DISTCLEAN@ dummy: perl/Makefile
perl/Makefile: perl/Makefile.PL
@@ -38,20 +24,22 @@
install: whatis
---- udunits-1.12.4/src/lib/Makefile.in.BAD 2005-03-25 23:28:38.000000000 -0600
-+++ udunits-1.12.4/src/lib/Makefile.in 2005-03-25 23:28:56.000000000 -0600
-@@ -7,7 +7,7 @@
- LIBRARY = udunits
-
- FLEX = /usr/local/gnu/bin/flex
--cpp_path = -DUT_DEFAULT_PATH='"$(prefix)/etc/udunits.dat"'
-+cpp_path = -DUT_DEFAULT_PATH='"/etc/udunits.dat"'
- CPPFLAGS = -I../port/misc -I../port/cfortran $(cpp_path) @CPPFLAGS@
- CFLAGS = @CFLAGS@
-
---- udunits-1.12.4/src/port/master.mk.in.BAD 2005-03-25 23:37:16.000000000 -0600
-+++ udunits-1.12.4/src/port/master.mk.in 2005-03-25 23:37:25.000000000 -0600
-@@ -351,7 +351,7 @@
+diff -up udunits-1.12.9/src/port/cfortran/cfortran.h.linuxfixes udunits-1.12.9/src/port/cfortran/cfortran.h
+--- udunits-1.12.9/src/port/cfortran/cfortran.h.linuxfixes 2008-07-22 12:47:24.000000000 -0400
++++ udunits-1.12.9/src/port/cfortran/cfortran.h 2008-09-12 13:16:41.000000000 -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.9/src/port/master.mk.in.linuxfixes udunits-1.12.9/src/port/master.mk.in
+--- udunits-1.12.9/src/port/master.mk.in.linuxfixes 2008-07-22 13:06:02.000000000 -0400
++++ udunits-1.12.9/src/port/master.mk.in 2008-09-12 13:15:25.000000000 -0400
+@@ -351,7 +351,7 @@ dummy_incdir $(INCDIR):
############################################################################
# `etc/' files:
############################################################################
@@ -60,20 +48,7 @@
ETCFILE = dummy-etcfile # to silence GNU make(1)
installed_etcfiles:
---- udunits-1.12.4/src/lib/Makefile.in.BAD 2005-04-11 11:45:36.000000000 -0500
-+++ udunits-1.12.4/src/lib/Makefile.in 2005-04-11 11:46:17.000000000 -0500
-@@ -6,7 +6,7 @@
-
- LIBRARY = udunits
-
--FLEX = /usr/local/gnu/bin/flex
-+FLEX = /usr/bin/flex
- cpp_path = -DUT_DEFAULT_PATH='"/etc/udunits.dat"'
- CPPFLAGS = -I../port/misc -I../port/cfortran $(cpp_path) @CPPFLAGS@
- CFLAGS = @CFLAGS@
---- udunits-1.12.4/src/port/master.mk.in.BAD 2005-04-11 11:44:37.000000000 -0500
-+++ udunits-1.12.4/src/port/master.mk.in 2005-04-11 11:44:55.000000000 -0500
-@@ -382,7 +382,7 @@
+@@ -382,7 +382,7 @@ dummy_etcdir $(ETCDIR):
############################################################################
# Manual Pages:
############################################################################
@@ -82,3 +57,14 @@
MANUAL = dummy-manual # to slience GNU make
WHATIS = @WHATIS@
# The following macro should be empty on systems that don't
+diff -up udunits-1.12.9/src/udunits/udunits.c.linuxfixes udunits-1.12.9/src/udunits/udunits.c
+--- udunits-1.12.9/src/udunits/udunits.c.linuxfixes 2008-07-22 12:47:25.000000000 -0400
++++ udunits-1.12.9/src/udunits/udunits.c 2008-09-12 13:17:18.000000000 -0400
+@@ -13,6 +13,7 @@
+ #include <string.h> /* for strlen() & memmove() */
+ #include <errno.h> /* for errno */
+ #include <ctype.h> /* for isspace() */
++#include <stdlib.h> /* for exit */
+ #include "udunits.h"
+
+ #ifdef YYDEBUG
Index: udunits.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udunits/devel/udunits.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- udunits.spec 11 Mar 2008 02:27:40 -0000 1.16
+++ udunits.spec 12 Sep 2008 17:24:38 -0000 1.17
@@ -1,13 +1,11 @@
Name: udunits
-Version: 1.12.4
-Release: 15%{?dist}
+Version: 1.12.9
+Release: 1%{?dist}
Summary: A library for manipulating units of physical quantities
License: MIT
Group: System Environment/Libraries
URL: http://my.unidata.ucar.edu/content/software/udunits/index.html
-# Upstream actually packages it as a .tar.Z, I repackaged to prevent ncompress
-# as a dependency.
-Source0: udunits-1.12.4.tar.bz2
+Source0: ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-1.12.9.tar.gz
Source1: udunits-wrapper.inc
Patch0: udunits-1.12.4-linuxfixes.patch
Patch1: udunits-1.12.4-64bit.patch
@@ -54,7 +52,7 @@
%prep
%setup -q
-%patch0 -p1
+%patch0 -p1 -b .linuxfixes
# Yes, this is a dirty hack.
%ifarch x86_64 ppc64 sparc64
%patch1 -p1
@@ -127,6 +125,9 @@
%{_mandir}/man1/udunitsperl.1.gz
%changelog
+* Fri Sep 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.12.9-1
+- update to 1.12.9
+
* Mon Mar 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.12.4-15
- ia64 doesn't need lib64 hack
More information about the fedora-extras-commits
mailing list