rpms/libjpeg/devel libjpeg.spec,1.26,1.27

[Tom Lane]

Author: tgl

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

Modified Files:
	libjpeg.spec 
Log Message:
Fix libtool hacking so it works with libtool 2.2.


Index: libjpeg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libjpeg/devel/libjpeg.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libjpeg.spec	25 Sep 2008 12:48:55 -0000	1.26
+++ libjpeg.spec	19 Feb 2009 02:13:41 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: A library for manipulating JPEG image format files
 Name: libjpeg
 Version: 6b
-Release: 43%{?dist}
+Release: 44%{?dist}
 License: IJG
 Group: System Environment/Libraries
 URL: http://www.ijg.org/
@@ -68,7 +68,17 @@
 # Blow it away and replace with build system's version.
 rm -f config.guess config.sub ltmain.sh ltconfig aclocal.m4
 cp /usr/share/aclocal/libtool.m4 aclocal.m4
-libtoolize
+# this is conditional so we can build with either libtool 2.2 or 1.5
+if [ -f /usr/share/aclocal/ltoptions.m4 ]; then
+  cat /usr/share/aclocal/ltoptions.m4 \
+      /usr/share/aclocal/ltversion.m4 \
+      /usr/share/aclocal/ltsugar.m4 \
+      /usr/share/aclocal/lt~obsolete.m4 \
+    >>aclocal.m4
+fi
+# this hack is so we can build with either libtool 2.2 or 1.5
+libtoolize --install || libtoolize
+
 autoconf
 
 %build
@@ -118,6 +128,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Feb 18 2009 Tom Lane <tgl at redhat.com> - 6b-44
+- Fix libtool hacking so it also works with libtool 2.2.  (For the
+  moment the specfile still also works with libtool 1.5, but that can
+  go away eventually.)
+
 * Thu Sep 25 2008 Tom Lane <tgl at redhat.com> - 6b-43
 - Revert to using .gz instead of .bz2 tarball
 Resolves: #463903