From dcdbfe3aa6abc60adc53d93a4df29d9255ee074c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 10 May 2009 09:20:37 +0000 Subject: [PATCH] Clean up spec file. Remove unnecessary code. --- pfstools.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pfstools.spec b/pfstools.spec index c8a426d..e453f8a 100644 --- a/pfstools.spec +++ b/pfstools.spec @@ -1,6 +1,6 @@ Name: pfstools Version: 1.7.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Programs for handling high-dynamic range images Group: Applications/Multimedia @@ -10,6 +10,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch1: pfstools-mDATA.patch Patch2: pfstools-1.7.0-bf1.patch Patch3: pfstools-1.7.0-gcc44.patch +Patch4: pfstools-1.7-strcmp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake @@ -119,6 +120,7 @@ etc., for developing programs which can handle HDR graphics files. %patch1 -p1 -b .mDATA %patch2 -p1 -b .bf1 %patch3 -p1 -b .gcc44 +%patch4 -p1 -b .strcmp # Remove the following once the patch for the Makefile.am file # is not necessary anymore. aclocal @@ -127,7 +129,7 @@ libtoolize --automake %build -%configure +%configure --disable-static make %{?_smp_mflags} @@ -138,7 +140,6 @@ make DESTDIR=$RPM_BUILD_ROOT "INSTALL=install -p" install # XXX Nuke unpackaged files { cd ${RPM_BUILD_ROOT} - rm -f .%{_libdir}/libpfs-1.2.a rm -f .%{_libdir}/libpfs-1.2.la rm -f .%{_mandir}/man1/pfsinjpeghdr.1 rm -f .%{_mandir}/man1/pfsoutjpeghdr.1 @@ -248,10 +249,8 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/pfsoctavelum %{_bindir}/pfsoctavergb %{_bindir}/pfsstat -%{_libexecdir}/octave/*/site/oct/*/pfstools/ -#%{_libexecdir}/octave/*/site/oct/*/pfstools/*.oct +%{_libexecdir}/octave/*/site/oct/*/pfstools %{_datadir}/octave/*/site/m/pfstools -%{_datadir}/octave/*/site/m/pfstools/*.m %{_mandir}/man1/pfsoctavelum.1.gz %{_mandir}/man1/pfsoctavergb.1.gz %{_mandir}/man1/pfsstat.1.gz @@ -267,10 +266,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libpfs-1.2.so %{_libdir}/pkgconfig/pfs.pc %{_includedir}/pfs-1.2 -%{_includedir}/pfs-1.2/array2d.h -%{_includedir}/pfs-1.2/pfs.h %changelog +* Sun May 10 2009 Ulrich Drepper - 1.7.0-6 +- fix up spec file. Remove unnecessary code. +- fix comparison of strings + * Mon Mar 23 2009 Alex Lancaster - 1.7.0-5 - Add patch to fix building with GCC 4.4