rpms/steghide/devel steghide-0.5.1-gcc43.patch, NONE, 1.1 steghide.spec, 1.7, 1.8

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/steghide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4646

Modified Files:
	steghide.spec 
Added Files:
	steghide-0.5.1-gcc43.patch 
Log Message:
Fix gcc-4.3 issues

steghide-0.5.1-gcc43.patch:

--- NEW FILE steghide-0.5.1-gcc43.patch ---
diff -up steghide-0.5.1/src/Graph.cc.gcc43 steghide-0.5.1/src/Graph.cc
--- steghide-0.5.1/src/Graph.cc.gcc43	2003-10-11 23:54:26.000000000 +0200
+++ steghide-0.5.1/src/Graph.cc	2008-01-17 17:05:36.000000000 +0100
@@ -23,6 +23,8 @@
 #include <map>
 #include <vector>
 
+#include <climits>
+
 #include "BitString.h"
 #include "CvrStgFile.h"
 #include "Edge.h"
diff -up steghide-0.5.1/Makefile.am.gcc43 steghide-0.5.1/Makefile.am
--- steghide-0.5.1/Makefile.am.gcc43	2003-10-13 10:43:08.000000000 +0200
+++ steghide-0.5.1/Makefile.am	2008-01-17 17:05:36.000000000 +0100
@@ -1,4 +1,5 @@
-AUTOMAKE_OPTIONS = dist-bzip2 dist-zip
+LIBTOOL = --tag=CXX
+AUTOMAKE_OPTIONS = dist-bzip2 dist-zip foreign
 SUBDIRS = m4 intl po doc src tests
 docdir = $(prefix)/share/doc/$(PACKAGE)
 EXTRA_DIST = config.rpath mkinstalldirs  ABOUT-NLS BUGS CREDITS HISTORY LEAME depcomp
diff -up steghide-0.5.1/configure.in.gcc43 steghide-0.5.1/configure.in
--- steghide-0.5.1/configure.in.gcc43	2003-10-15 09:48:52.000000000 +0200
+++ steghide-0.5.1/configure.in	2008-01-17 17:08:52.000000000 +0100
@@ -9,10 +9,12 @@ AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_AWK
 AC_PROG_LN_S
+AM_PROG_LIBTOOL
 
 dnl GNU gettext
 AC_CHECK_FUNCS(strchr)
 AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION
 AM_CONDITIONAL(USE_INTLDIR, test "$nls_cv_use_gnu_gettext" = yes)
 
 dnl check if debugging support is requested


Index: steghide.spec
===================================================================
RCS file: /cvs/extras/rpms/steghide/devel/steghide.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- steghide.spec	9 Oct 2007 19:10:50 -0000	1.7
+++ steghide.spec	17 Jan 2008 16:22:10 -0000	1.8
@@ -1,7 +1,7 @@
 Name: steghide
 Summary: A steganography program
 Version: 0.5.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: GPLv2
 Group: Applications/File
@@ -10,8 +10,9 @@
 Source: http://prdownloads.sourceforge.net/steghide/steghide-%{version}.tar.gz
 Patch0: steghide-0.5.1-gcc41.patch
 Patch2: steghide-0.5.1-mhash.patch
+patch3: steghide-0.5.1-gcc43.patch
 
-BuildRequires: gettext-devel, libtool
+BuildRequires: gettext-devel, libtool, automake, autoconf,
 BuildRequires: libmcrypt-devel, mhash-devel, libjpeg-devel, zlib-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -31,10 +32,13 @@
 %setup
 %patch0 -p1 
 %patch2 -p1
+%patch3 -p1 -b .gcc43
 
 %build
-%configure 
-make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS" LIBTOOL="/usr/bin/libtool"
+libtoolize --force
+autoreconf
+%configure  
+make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -59,6 +63,9 @@
 %doc ABOUT-NLS BUGS COPYING CREDITS HISTORY README TODO
 
 %Changelog
+* Thu Jan 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.5.1-8
+- Fix issues for compiling with gcc-4.3
+
 * Tue Oct  9 2007 Jochen Schmitt <Jochen herr-schmitt de> 0.5.1-7
 - Add Req to libmcrypt >= 2.5.8-3 (#275641)