rpms/libglade/F-10 libglade-0.17-cleanlibs.patch, NONE, 1.1 Makefile, 1.1, 1.2 libglade.spec, 1.4, 1.5

Wed May 6 19:56:48 UTC 2009

Author: pghmcfc

Update of /cvs/pkgs/rpms/libglade/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8008

Modified Files:
	Makefile libglade.spec 
Added Files:
	libglade-0.17-cleanlibs.patch 
Log Message:
* Mon Apr 20 2009 Paul Howarth <paul at city-fan.org> 1:0.17-23
- use an alternative approach to rpath-fixing - hacking the supplied libtool
  rather than trying to use the system one
- specify Instruction Set Architecture (%{?_isa}) in devel package requires
- link against the libs that are needed, and only those libs


libglade-0.17-cleanlibs.patch:

--- NEW FILE libglade-0.17-cleanlibs.patch ---
--- libglade-0.17/glade/Makefile.am	2009-04-20 20:54:24.000000000 +0100
+++ libglade-0.17/glade/Makefile.am	2009-04-20 20:59:54.000000000 +0100
@@ -43,12 +43,14 @@
 	$(build_glade_gnomedb)
 
 libglade_la_SOURCES  = $(the_sources)
-libglade_la_LIBADD   = $(GTK_LIBS) $(XML_LIBS)
+libglade_la_LIBADD   = $(filter-out -ldl -lm -lX11 -lXext -lXi, $(GTK_LIBS) $(XML_LIBS))
 libglade_la_LDFLAGS  = -version-info $(LTVERSION)
+libglade_la_DEPENDENCIES =
 
 libglade_gnome_la_SOURCES  = glade-gnome.c glade-build.h glade-xml.h
-libglade_gnome_la_LIBADD   = libglade.la $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)
+libglade_gnome_la_LIBADD   = libglade.la $(filter-out -ldl -lm -lart_lgpl -laudiofile -lesd -lgmodule -lgnomesupport -lxml -lSM -lICE -lX11 -lXext -lXi, $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS))
 libglade_gnome_la_LDFLAGS  = -version-info $(LTVERSION)
+libglade_gnome_la_DEPENDENCIES = libglade.la
 
 libglade_bonobo_la_SOURCES  = glade-bonobo.c glade-build.h glade-xml.h
 libglade_bonobo_la_LIBADD   = $(BONOBO_LIBS) $(XML_LIBS)
--- libglade-0.17/glade/Makefile.in	2009-04-20 20:54:30.000000000 +0100
+++ libglade-0.17/glade/Makefile.in	2009-04-20 21:00:09.000000000 +0100
@@ -172,12 +172,14 @@
 
 
 libglade_la_SOURCES = $(the_sources)
-libglade_la_LIBADD = $(GTK_LIBS) $(XML_LIBS)
+libglade_la_LIBADD = $(filter-out -ldl -lm -lX11 -lXext -lXi, $(GTK_LIBS) $(XML_LIBS))
 libglade_la_LDFLAGS = -version-info $(LTVERSION)
+libglade_la_DEPENDENCIES = 
 
 libglade_gnome_la_SOURCES = glade-gnome.c glade-build.h glade-xml.h
-libglade_gnome_la_LIBADD = libglade.la $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)
+libglade_gnome_la_LIBADD = libglade.la $(filter-out -ldl -lm -lart_lgpl -laudiofile -lesd -lgmodule -lgnomesupport -lxml -lSM -lICE -lX11 -lXext -lXi, $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS))
 libglade_gnome_la_LDFLAGS = -version-info $(LTVERSION)
+libglade_gnome_la_DEPENDENCIES = libglade.la
 
 libglade_bonobo_la_SOURCES = glade-bonobo.c glade-build.h glade-xml.h
 libglade_bonobo_la_LIBADD = $(BONOBO_LIBS) $(XML_LIBS)
@@ -203,13 +205,11 @@
 libglade_bonobo_la_DEPENDENCIES =
 am_libglade_bonobo_la_OBJECTS = glade-bonobo.lo
 libglade_bonobo_la_OBJECTS = $(am_libglade_bonobo_la_OBJECTS)
-libglade_gnome_la_DEPENDENCIES =
 am_libglade_gnome_la_OBJECTS = glade-gnome.lo
 libglade_gnome_la_OBJECTS = $(am_libglade_gnome_la_OBJECTS)
 libglade_gnomedb_la_DEPENDENCIES =
 am_libglade_gnomedb_la_OBJECTS = glade-gnomedb.lo
 libglade_gnomedb_la_OBJECTS = $(am_libglade_gnomedb_la_OBJECTS)
-libglade_la_DEPENDENCIES =
 am_libglade_la_OBJECTS = glade-init.lo glade-sax.lo glade-xml.lo \
 	glade-gtk.lo glade-tree.lo
 libglade_la_OBJECTS = $(am_libglade_la_OBJECTS)
--- libglade-0.17/ltmain.sh	2001-09-05 03:58:41.000000000 +0100
+++ libglade-0.17/ltmain.sh	2009-04-20 17:09:38.000000000 +0100
@@ -754,6 +757,7 @@
     linker_flags=
     dllsearchpath=
     lib_search_path=`pwd`
+    inst_prefix_dir=
 
     avoid_version=no
     dlfiles=
@@ -884,6 +888,11 @@
 	  prev=
 	  continue
 	  ;;
+        inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
 	release)
 	  release="-$arg"
 	  prev=
@@ -985,6 +994,11 @@
 	continue
 	;;
 
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
       # so, if we see these flags be careful not to treat them like -L
       -L[A-Z][A-Z]*:*)
@@ -1872,7 +1885,16 @@
 	    if test "$hardcode_direct" = yes; then
 	      add="$libdir/$linklib"
 	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      add_dir=
+	      if test -n "$inst_prefix_dir"; then
+		case "$libdir" in
+		[\\/]*)
+		  add_dir="-L$inst_prefix_dir$libdir"
+		  ;;
+		esac
+	      fi
+	      add_dir="$add_dir -L$libdir"
 	      add="-l$name"
 	    elif test "$hardcode_shlibpath_var" = yes; then
 	      case :$finalize_shlibpath: in
@@ -1882,11 +1904,21 @@
 	      add="-l$name"
 	    else
 	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
+ 	      # Try looking first in the location we're being installed to.
+ 	      add_dir=
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case "$libdir" in
+ 		[\\/]*)
+ 		  add_dir="-L$inst_prefix_dir$libdir"
+ 		  ;;
+ 		esac
+ 	      fi
+ 	      add_dir="$add_dir -L$libdir"
+
 	      add="-l$name"
 	    fi
 
-	    if test $linkmode = prog; then
+	    if test "$linkmode" = prog; then
 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
 	    else
@@ -3856,7 +3888,7 @@
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
+      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@"
       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
 
       # Only create the output if not a dry run.
@@ -4157,12 +4189,30 @@
 	dir="$dir$objdir"
 
 	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  if test "$inst_prefix_dir" = "$destdir"; then
+	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+	    exit 1
+	  fi
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
+	  fi
+
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
 	  $show "$relink_command"
 	  if $run eval "$relink_command"; then :
 	  else
 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    continue
+	    exit 1
 	  fi
 	fi
 


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/libglade/F-10/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Makefile	2 Oct 2006 12:13:51 -0000	1.1
+++ Makefile	6 May 2009 19:56:18 -0000	1.2
@@ -10,7 +10,7 @@ endef
 MAKEFILE_COMMON := $(shell $(find-makefile-common))
 
 ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
+# attempt a checkout
 define checkout-makefile-common
 test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
 endef


Index: libglade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libglade/F-10/libglade.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libglade.spec	13 Feb 2008 12:35:28 -0000	1.4
+++ libglade.spec	6 May 2009 19:56:18 -0000	1.5
@@ -1,22 +1,23 @@
 Summary:	Gnome-1 support library for loading user interfaces
 Name:		libglade
 Version:	0.17
-Release:	21%{?dist}
+Release:	23%{?dist}
 Epoch:		1
 License:	LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://www.jamesh.id.au/software/libglade/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libglade/%{version}/libglade-%{version}.tar.gz
-Patch:		libglade-0.16-fixquote.patch
+Patch0:		libglade-0.16-fixquote.patch
 Patch1:		libglade-0.17-gtkdoc.patch
 Patch2:		libglade-0.17-clist-gettext.patch
 Patch3:		libglade-0.17-underquoted.patch
 Patch4:		libglade-0.17-non-weak-symbols.patch
 Patch5:		libglade-0.17-no-local-intl.patch
 Patch6:		libglade-0.17-multiarch.patch
+Patch7:		libglade-0.17-cleanlibs.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gnome-libs-devel >= 1:1.4.1.2
-BuildRequires:	libxml-devel >= 1:1.8.16
+BuildRequires:	gnome-libs-devel%{?_isa} >= 1:1.4.1.2
+BuildRequires:	libxml-devel%{?_isa} >= 1:1.8.16
 BuildRequires:	autoconf, gettext, gtk-doc, libtool
 
 %description
@@ -33,9 +34,9 @@ interface loading time, there is no perf
 %package devel
 Summary:	The files needed for libglade application development
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	gnome-libs-devel >= 1:1.4.1.2
-Requires:	libxml-devel >= 1:1.8.16
+Requires:	%{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:	gnome-libs-devel%{?_isa} >= 1:1.4.1.2
+Requires:	libxml-devel%{?_isa} >= 1:1.8.16
 Requires:	pkgconfig
 
 %description devel
@@ -43,8 +44,8 @@ The libglade-devel package contains the 
 that you can use to develop libglade applications.
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch -p1 -b ".fixquote"
+%setup -q
+%patch0 -p1 -b .fixquote
 %patch1 -p1 -b .gtkdoc
 %patch2 -p1 -b .clist-gettext
 %patch3 -p1 -b .underquoted
@@ -57,22 +58,28 @@ that you can use to develop libglade app
 # Patch libglade-config for multiarch compatibility (#342131)
 %patch6 -p1 -b .multiarch
 
+# Link against the libs that are needed, and only those libs
+%patch7 -p1 -b .clean-libs
+
 # Convert docs to UTF-8
 /usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf8
 %{__mv} -f ChangeLog.utf8 ChangeLog
 
 %build
 %{__autoconf}
-%configure --without-bonobo
-%{__make} LIBTOOL=/usr/bin/libtool
+%configure --without-bonobo --disable-static
+
+# Kill bogus RPATHs
+%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+
+%{__make}
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} LIBTOOL=/usr/bin/libtool INSTALL="%{__install} -p" install
+%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
 
-# remove unpackaged files from the buildroot
-%{__rm} -f %{buildroot}%{_libdir}/{libglade.a,libglade.la}
-%{__rm} -f %{buildroot}%{_libdir}/{libglade-gnome.a,libglade-gnome.la}
+# Don't package libtool archives
+%{__rm} %{buildroot}%{_libdir}/libglade{,-gnome}.la
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -102,6 +109,15 @@ that you can use to develop libglade app
 %doc %{_datadir}/gnome/html/
 
 %changelog
+* Mon Apr 20 2009 Paul Howarth <paul at city-fan.org> 1:0.17-23
+- use an alternative approach to rpath-fixing - hacking the supplied libtool
+  rather than trying to use the system one
+- specify Instruction Set Architecture (%%{?_isa}) in devel package requires
+- link against the libs that are needed, and only those libs
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.17-22
+- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Feb 13 2008 Paul Howarth <paul at city-fan.org> 1:0.17-21
 - rebuild with gcc 4.3.0 for Fedora 9
 


