rpms/udunits/devel udunits-1.12.4-linuxfixes.patch, NONE, 1.1 udunits.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Thu Apr 14 21:59:59 UTC 2005
Author: spot
Update of /cvs/extras/rpms/udunits/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22666/devel
Modified Files:
.cvsignore sources
Added Files:
udunits-1.12.4-linuxfixes.patch udunits.spec
Log Message:
auto-import udunits-1.12.4-4 on branch devel from udunits-1.12.4-4.src.rpm
udunits-1.12.4-linuxfixes.patch:
--- NEW FILE udunits-1.12.4-linuxfixes.patch ---
--- 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"
#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 @@
@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
--- 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 @@
############################################################################
# `etc/' files:
############################################################################
-ETCDIR = $(prefix)/etc
+ETCDIR = $(RPM_BUILD_ROOT)/etc
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 @@
############################################################################
# Manual Pages:
############################################################################
-MANDIR = $(prefix)/man
+MANDIR = $(prefix)/share/man
MANUAL = dummy-manual # to slience GNU make
WHATIS = @WHATIS@
# The following macro should be empty on systems that don't
--- NEW FILE udunits.spec ---
Name: udunits
Version: 1.12.4
Release: 4
Summary: A library for manipulating units of physical quantities
License: Freely distributable (BSD-like)
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
Patch0: udunits-1.12.4-linuxfixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-gfortran, gcc-c++, groff
%description
The Unidata units utility, udunits, supports conversion of unit specifications
between formatted and binary forms, arithmetic manipulation of unit
specifications, and conversion of values between compatible scales of
measurement. A unit is the amount by which a physical quantity is measured. For
example:
Physical Quantity Possible Unit
_________________ _____________
time weeks
distance centimeters
power watts
This utility works interactively and has two modes. In one mode, both an input
and output unit specification are given, causing the utility to print the
conversion between them. In the other mode, only an input unit specification is
given. This causes the utility to print the definition -- in standard units --
of the input unit.
%package devel
Group: Development/Libraries
Summary: Headers and libraries for udunits
Requires: %{name} = %{version}-%{release}
%description devel
This package contains the files needed for compiling programs using
the udunits library.
%package -n perl-udunits
Summary: Perl module for udunits
Group: System Environment/Libraries
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: %{name}
%description -n perl-udunits
A perl module for udunits.
%prep
%setup -q
%patch0 -p1
%build
cd src/
export LD_MATH=-lm
%configure
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
cp -p COPYRIGHT README RELEASE_NOTES VERSION ../
find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc COPYRIGHT README RELEASE_NOTES VERSION
%{_bindir}/udunits
%{_mandir}/man1/udunits.1.gz
%config(noreplace) %{_sysconfdir}/udunits.dat
%files devel
%defattr(-,root,root)
%{_includedir}/udunits.h
%{_includedir}/udunits.inc
%{_libdir}/libudport.a
%{_libdir}/libudunits.a
%{_mandir}/man3/udunits.3.gz
%{_mandir}/man3/udunits.3f.gz
%files -n perl-udunits
%defattr(-,root,root)
%{perl_vendorarch}/UDUNITS.pm
%{perl_vendorarch}/auto/UDUNITS/UDUNITS.bs
%{perl_vendorarch}/auto/UDUNITS/UDUNITS.so
%{perl_vendorarch}/auto/UDUNITS/autosplit.ix
%dir %{perl_vendorarch}/auto/UDUNITS/
%{_mandir}/man1/udunitsperl.1.gz
%changelog
* Mon Apr 11 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.12.4-4
- use perl macros
* Mon Apr 11 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.12.4-3
- Corrected license
- Add BuildRequires: groff
- Add perl MODULE_COMPAT requires for perl-udunits
- Roll in fixes from Ed Hill's package
- Make -devel package
* Mon Apr 11 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.12.4-2
- minor spec cleanup
* Fri Mar 25 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.12.4-1
- inital package for Fedora Extras
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/udunits/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 14 Apr 2005 21:59:30 -0000 1.1
+++ .cvsignore 14 Apr 2005 21:59:57 -0000 1.2
@@ -0,0 +1 @@
+udunits-1.12.4.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/udunits/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 14 Apr 2005 21:59:30 -0000 1.1
+++ sources 14 Apr 2005 21:59:57 -0000 1.2
@@ -0,0 +1 @@
+ecafe00024ef19327b1c55af5c021b96 udunits-1.12.4.tar.bz2
More information about the fedora-extras-commits
mailing list