rpms/pfstools/devel pfstools.spec,1.4,1.5

[Ulrich Drepper]

Author: drepper

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

Modified Files:
	pfstools.spec 
Log Message:
Clean up spec file.  Remove unnecessary code.



Index: pfstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfstools/devel/pfstools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pfstools.spec	24 Mar 2009 00:45:46 -0000	1.4
+++ pfstools.spec	10 May 2009 09:20:37 -0000	1.5
@@ -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.ne
 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 
 %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=in
 
 # 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 <drepper at redhat.com> - 1.7.0-6
+- fix up spec file.  Remove unnecessary code.
+- fix comparison of strings
+
 * Mon Mar 23 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.7.0-5
 - Add patch to fix building with GCC 4.4