rpms/pfstools/F-11 pfstools-1.7-strcmp.patch, NONE, 1.1 pfstools-1.7.0-debuginfo.patch, NONE, 1.1 pfstools.spec, 1.4, 1.5

[alexlan]

Author: alexlan

Update of /cvs/pkgs/rpms/pfstools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19881

Modified Files:
	pfstools.spec 
Added Files:
	pfstools-1.7-strcmp.patch pfstools-1.7.0-debuginfo.patch 
Log Message:
Sync with F-12 branch and rebuild against new octave (#525423)


pfstools-1.7-strcmp.patch:
 picture_io.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pfstools-1.7-strcmp.patch ---
--- pfstools-1.7.0/src/pfsglview/picture_io.cpp-d	2009-05-10 02:08:04.185662227 -0700
+++ pfstools-1.7.0/src/pfsglview/picture_io.cpp	2009-05-10 02:09:51.029678179 -0700
@@ -87,7 +87,7 @@ void PictureIO::setFrame(pfs::Frame *fra
 		return;
 
 	// only XYZ channels are taken into consideration
-	if( channel != "XYZ" &&  channel != "X00" && channel != "0Y0" && channel != "00Z" ) {
+	if(strcmp(channel, "XYZ") != 0 && strcmp(channel, "X00") != 0 && strcmp(channel, "0Y0") != 0 && strcmp(channel, "00Z") != 0 ) {
 		if(verbose)
 			fprintf( stderr, "WARNING: wrong channel (PictureIO::setFrame())\n");
 		return;

pfstools-1.7.0-debuginfo.patch:
 configure.ac |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE pfstools-1.7.0-debuginfo.patch ---
diff -up pfstools-1.7.0/configure.ac~ pfstools-1.7.0/configure.ac
--- pfstools-1.7.0/configure.ac~	2008-10-15 01:38:00.000000000 +0300
+++ pfstools-1.7.0/configure.ac	2009-05-08 22:55:28.000000000 +0300
@@ -29,8 +29,6 @@ AC_ARG_ENABLE(debug,
 		     AC_DEFINE([DEBUG])
 		  fi],
                   [enable_debug="no"
-                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /; s/-g//"`
-   	             CXXFLAGS="-O3 $temp_CXXFLAGS"
                      AC_DEFINE(NDEBUG, 1, [Disable assertion checks])
                   ])
 


Index: pfstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfstools/F-11/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	18 Oct 2009 05:48:24 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		pfstools
 Version:	1.7.0
-Release:	5%{?dist}
+Release:	8%{?dist}
 Summary:	Programs for handling high-dynamic range images
 
 Group:		Applications/Multimedia
@@ -10,6 +10,8 @@ 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
+Patch5:		pfstools-1.7.0-debuginfo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	automake
@@ -119,15 +121,15 @@ etc., for developing programs which can 
 %patch1 -p1 -b .mDATA
 %patch2 -p1 -b .bf1
 %patch3 -p1 -b .gcc44
-# Remove the following once the patch for the Makefile.am file
-# is not necessary anymore.
-aclocal
-automake
-libtoolize --automake
+%patch4 -p1 -b .strcmp
+%patch5 -p1 -b .debuginfo
+# Remove the following once the patches for configure.ac and Makefile.am
+# are not necessary anymore.
+autoreconf -i
 
 
 %build
-%configure
+%configure --disable-static --disable-dependency-tracking
 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,20 @@ 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 Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jun  9 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.7.0-7
+- Patch to generate useful debuginfo subpackage (#499912).
+- Disable autotools dependency tracking during build for cleaner build logs
+  and possible slight build speedup.
+
+* 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