rpms/glib/devel glib.spec,1.5,1.6

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	glib.spec 
Log Message:
* Thu Jan 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:1.2.10-25
- cleanup libtool hacks



Index: glib.spec
===================================================================
RCS file: /cvs/extras/rpms/glib/devel/glib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- glib.spec	11 Jan 2007 16:06:47 -0000	1.5
+++ glib.spec	11 Jan 2007 16:26:52 -0000	1.6
@@ -3,7 +3,7 @@
 Name: 	 glib
 Epoch:	 1
 Version: 1.2.10
-Release: 24%{?dist}
+Release: 25%{?dist}
 
 License: LGPL
 Group:	 System Environment/Libraries
@@ -19,6 +19,7 @@
 Patch2: glib-1.2.10-gcc34.patch
 Patch3: glib-1.2.10-underquoted.patch
 Patch4: glib-1.2.10-no_undefined.patch
+# http://bugzilla.redhat.com/222296
 Patch5: glib-1.2.10-multilib.patch
 
 %description
@@ -44,24 +45,25 @@
 %patch4 -p1 -b .no_undefined
 %patch5 -p1 -b .multilib
 
-#libtoolize --copy --force
+cp -f %{_datadir}/aclocal/libtool.m4 .
+libtoolize --copy --force
 automake-1.4
 aclocal-1.4
 autoconf-2.13
 autoheader-2.13
 
 
+
 %build
-LIBTOOL=/usr/bin/libtool \
 %configure --disable-static
 
-make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+make %{?_smp_mflags} 
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
+make install DESTDIR=$RPM_BUILD_ROOT 
 
 # libgmodule-1.2.so.0* missing eXecute bit
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so*
@@ -77,7 +79,7 @@
 
 # I *know* ||: isn't needed, but this could end up used by legacy
 %check ||:
-make check LIBTOOL=/usr/bin/libtool
+make check 
 
 
 %clean
@@ -106,6 +108,9 @@
 
 
 %changelog
+* Thu Jan 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:1.2.10-25
+- cleanup libtool hacks
+
 * Thu Jan 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:1.2.10-24
 - multilib patch (#222296)