rpms/glib/EL-5 glib-1.2.10-unused-dep.patch, NONE, 1.1 glib.spec, 1.6, 1.7

Tue Apr 21 13:20:43 UTC 2009

Author: pghmcfc

Update of /cvs/pkgs/rpms/glib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26383

Modified Files:
	glib.spec 
Added Files:
	glib-1.2.10-unused-dep.patch 
Log Message:
- remove redundant linkage of libgmodule to libgthread
- cosmetic spec changes


glib-1.2.10-unused-dep.patch:

--- NEW FILE glib-1.2.10-unused-dep.patch ---
--- glib-1.2.10/gthread/Makefile.am	2009-04-17 15:47:42.000000000 +0100
+++ glib-1.2.10/gthread/Makefile.am	2009-04-17 15:49:26.000000000 +0100
@@ -20,8 +20,8 @@
 	-no-undefined -Wl,--no-undefined \
 	-export-dynamic
 
-libgthread_la_DEPENDENCIES = $(libglib) $(top_builddir)/gmodule/libgmodule.la
-libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib) $(top_builddir)/gmodule/libgmodule.la
+libgthread_la_DEPENDENCIES = $(libglib)
+libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib)
 
 noinst_PROGRAMS = testgthread
 testgthread_LDADD = libgthread.la 


Index: glib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib/EL-5/glib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- glib.spec	11 Jan 2007 17:47:20 -0000	1.6
+++ glib.spec	21 Apr 2009 13:20:42 -0000	1.7
@@ -1,18 +1,15 @@
-
-Summary: A library of handy utility functions
-Name: 	 glib
-Epoch:	 1
-Version: 1.2.10
-Release: 26%{?dist}
-
-License: LGPL
-Group:	 System Environment/Libraries
-URL:	 http://www.gtk.org/
-Source:  ftp://ftp.gimp.org/pub/gtk/v1.2/glib-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: automake14 autoconf213
-BuildRequires: libtool
+Summary:	A library of handy utility functions
+Name:		glib
+Epoch:		1
+Version:	1.2.10
+Release:	32%{?dist}
+License:	LGPLv2+
+Group:		System Environment/Libraries
+URL:		http://www.gtk.org/
+Source:		ftp://ftp.gimp.org/pub/gtk/v1.2/glib-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	automake14 autoconf213
+BuildRequires:	libtool
 
 # Suppress warnings about varargs macros for -pedantic
 Patch1: glib-1.2.10-isowarning.patch
@@ -21,17 +18,22 @@
 Patch4: glib-1.2.10-no_undefined.patch
 # http://bugzilla.redhat.com/222296
 Patch5: glib-1.2.10-multilib.patch
+# Fix unused direct shared library dependency on libgmodule for libgthread
+Patch6: glib-1.2.10-unused-dep.patch
+
 
 %description
 GLib is a handy library of utility functions. This C library is
 designed to solve some portability problems and provide other useful
-functionality which most programs require.
+functionality that most programs require.
+
 
 %package devel
 Summary: Libraries and header files for %{name} development 
 Group:	 Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: pkgconfig
+
 %description devel
 %{summary}.
 
@@ -44,6 +46,12 @@
 %patch3 -p1 -b .underquoted
 %patch4 -p1 -b .no_undefined
 %patch5 -p1 -b .multilib
+%patch6 -p1 -b .unused-dep
+
+# The original config.{guess,sub} do not work on x86_64
+#
+# The following /usr/lib cannot be %%_libdir !!
+cp -p /usr/lib/rpm/config.{guess,sub} .
 
 #cp -f %{_datadir}/aclocal/libtool.m4 .
 #libtoolize --copy --force
@@ -53,38 +61,36 @@
 autoheader-2.13
 
 
-
 %build
 LIBTOOL=%{_bindir}/libtool \
 %configure --disable-static
 
-make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
+%{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=%{_bindir}/libtool
+%{__make} install DESTDIR=%{buildroot} LIBTOOL=%{_bindir}/libtool
 
 # libgmodule-1.2.so.0* missing eXecute bit
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so*
+%{__chmod} a+x %{buildroot}%{_libdir}/lib*.so*
 
 ## Unpackaged files
 # info
-rm -rf $RPM_BUILD_ROOT%{_infodir}
+%{__rm} -rf %{buildroot}%{_infodir}
 # .la fies... die die die.
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.la
 # despite use of --disable-static, delete static libs that get built anyway
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
+%{__rm} -rf %{buildroot}%{_libdir}/lib*.a
 
 
-# I *know* ||: isn't needed, but this could end up used by legacy
-%check ||:
-make check LIBTOOL=%{_bindir}/libtool
+%check
+%{__make} check LIBTOOL=%{_bindir}/libtool
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -107,8 +113,27 @@
 %{_mandir}/man1/*
 %{_datadir}/aclocal/*
 
-
 %changelog
+* Fri Apr 17 2009 Paul Howarth <paul at city-fan.org> 1:1.2.10-32
+- remove redundant linkage of libgmodule to libgthread
+- cosmetic spec changes
+
+* Wed Feb 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 1:1.2.10-31
+- rebuild for pkgconfig deps
+
+* Wed Oct  1 2008 Patrice Dumas <pertusus at free.fr> 1:1.2.10-30
+- copy config.* from rpm directory, those shipped are too old. Should
+  fix #462650.
+
+* Mon Feb 11 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.2.10-29 
+- respin (gcc43)
+
+* Tue Aug 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:1.2.10-28
+- respin (buildID)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:1.2.10-27
+- License: LGPLv2+
+
 * Thu Jan 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:1.2.10-26
 - revert libtool-related breakage 
 
@@ -272,7 +297,7 @@
 - new description tags 
 
 * Sun Feb 21 1999 Michael Fulbright <drmike at redhat.com>
-- removed libtoolize from %build
+- removed libtoolize from %%build
 
 * Thu Feb 11 1999 Michael Fulbright <drmike at redhat.com>
 - added libgthread to file list


