rpms/libglade/devel libglade-0.17-multiarch.patch, NONE, 1.1 libglade-0.17-no-local-intl.patch, NONE, 1.1 libglade.spec, 1.1, 1.2

Mon Oct 22 15:32:36 UTC 2007

Author: pghmcfc

Update of /cvs/pkgs/rpms/libglade/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4223

Modified Files:
	libglade.spec 
Added Files:
	libglade-0.17-multiarch.patch 
	libglade-0.17-no-local-intl.patch 
Log Message:
- clarify license as LGPL version 2 or later
- remove bundled libintl (GPL) in %%prep to be absolutely sure that it isn't
  used
- patch libglade-config to generate cflags/libs values at runtime instead of
  build-time and hence be multiarch compatible (#342131); we can get away with
  this because the entire (legacy) library stack is stable and isn't going to
  change in any significant way
- enumerate more of the %%files list to narrow scope of wildcards
- re-encode ChangeLog as UTF-8


libglade-0.17-multiarch.patch:

--- NEW FILE libglade-0.17-multiarch.patch ---
--- libglade-0.17/libglade-config.in	2001-09-01 15:03:47.000000000 +0100
+++ libglade-0.17/libglade-config.in	2007-10-22 15:52:08.000000000 +0100
@@ -123,9 +123,9 @@
     elif test "$lib_gnomedb" = "yes"; then
         cflags="$cflags @GNOMEDB_CFLAGS@"
     elif test "$lib_gnome" = "yes"; then
-	cflags="$cflags @GNOME_INCLUDEDIR@"
+	cflags="$cflags `gnome-config --cflags gnorba gnomeui`"
     else
-	cflags="$cflags @GTK_CFLAGS@"
+	cflags="$cflags `gtk-config --cflags`"
     fi
     echo $cflags
 fi
@@ -135,21 +135,21 @@
     libsa=""
     if test "$lib_gtk" = "yes"; then
 	libs="-lglade"
-	libsa="@GTK_LIBS@"
+	libsa="`gtk-config --libs`"
     fi
     if test "$lib_gnome" = "yes"; then
 	libs="-lglade-gnome $libs"
-	libsa="@GNOME_LIBDIR@ @GNOMEUI_LIBS@"
+	libsa="`gnome-config --libs-only-L gnorba gnomeui` `gnome-config --libs-only-l gnomeui`"
     fi
     if test "$lib_bonobo" = "yes"; then
 	libs="-lglade-bonobo $libs"
-	libsa="@GNOME_LIBDIR@ @BONOBO_LIBS@"
+	libsa="`gnome-config --libs-only-L gnorba gnomeui` @BONOBO_LIBS@"
     fi
     if test "$lib_gnomedb" = "yes"; then
 	libs="-lglade-gnomedb $libs"
-	libsa="@GNOME_LIBDIR@ @GNOMEDB_LIBS@"
+	libsa="`gnome-config --libs-only-L gnorba gnomeui` @GNOMEDB_LIBS@"
     fi
-    echo -L at libdir@ $libs @XML_LIBS@ $libsa
+    echo -L`pkg-config --variable=libdir libglade` $libs `xml-config --libs` $libsa
 fi
 
 exit 0

libglade-0.17-no-local-intl.patch:

--- NEW FILE libglade-0.17-no-local-intl.patch ---
--- libglade-0.17/Makefile.am	2001-09-07 04:00:13.000000000 +0100
+++ libglade-0.17/Makefile.am	2007-10-22 12:11:34.000000000 +0100
@@ -43,7 +43,7 @@
 bin_SCRIPTS = libglade-config libglade-xgettext
 noinst_PROGRAMS = test-libglade
 test_libglade_LDADD = $(THE_LIBS) $(XML_LIBS)
-SUBDIRS = intl macros glade doc
+SUBDIRS = macros glade doc
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = libglade.m4
--- libglade-0.17/Makefile.in	2001-09-07 04:00:35.000000000 +0100
+++ libglade-0.17/Makefile.in	2007-10-22 12:32:20.000000000 +0100
@@ -167,7 +167,7 @@
 bin_SCRIPTS = libglade-config libglade-xgettext
 noinst_PROGRAMS = test-libglade
 test_libglade_LDADD = $(THE_LIBS) $(XML_LIBS)
-SUBDIRS = intl macros glade doc
+SUBDIRS = macros glade doc
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = libglade.m4
--- libglade-0.17/configure.in	2007-10-17 13:22:53.000000000 +0100
+++ libglade-0.17/configure.in	2007-10-22 14:05:52.000000000 +0100
@@ -96,7 +96,6 @@
 AC_CONFIG_FILES([Makefile
 libglade.spec
 macros/Makefile
-intl/Makefile
 glade/Makefile
 doc/Makefile
 libglade-config


Index: libglade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libglade/devel/libglade.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libglade.spec	2 Oct 2006 12:15:12 -0000	1.1
+++ libglade.spec	22 Oct 2007 15:32:03 -0000	1.2
@@ -1,9 +1,9 @@
 Summary:	Gnome-1 support library for loading user interfaces
 Name:		libglade
 Version:	0.17
-Release:	19%{?dist}
+Release:	20%{?dist}
 Epoch:		1
-License:	LGPL
+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
@@ -12,6 +12,8 @@
 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
 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
@@ -48,6 +50,17 @@
 %patch3 -p1 -b .underquoted
 %patch4 -p1 -b .non-weak-symbols
 
+# Make really sure that the bundled libintl (GPL) isn't used
+%patch5 -p1 -b .no-local-intl
+%{__rm} -rf intl
+
+# Patch libglade-config for multiarch compatibility (#342131)
+%patch6 -p1 -b .multiarch
+
+# 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
@@ -68,23 +81,38 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog NEWS README COPYING
-%{_libdir}/lib*.so.*
+%{_libdir}/libglade-gnome.so.*
+%{_libdir}/libglade.so.*
 
 %files devel
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc test-libglade.c
 %doc *.glade
-%{_bindir}/*
-%{_libdir}/lib*.so
-%{_includedir}/*
-%{_datadir}/aclocal/*
+%{_bindir}/libglade-config
+%{_bindir}/libglade-xgettext
+%{_includedir}/libglade-1.0/
+%{_libdir}/libglade-gnome.so
+%{_libdir}/libglade.so
+%{_datadir}/aclocal/libglade.m4
 %{_libdir}/libgladeConf.sh
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/libglade-gnome.pc
+%{_libdir}/pkgconfig/libglade.pc
 %doc %{_datadir}/gnome/html/
 
 %changelog
+* Mon Oct 22 2007 Paul Howarth <paul at city-fan.org> 1:0.17-20
+- clarify license as LGPL version 2 or later
+- remove bundled libintl (GPL) in %%prep to be absolutely sure that it isn't
+  used
+- patch libglade-config to generate cflags/libs values at runtime instead of
+  build-time and hence be multiarch compatible (#342131); we can get away with
+  this because the entire (legacy) library stack is stable and isn't going to
+  change in any significant way
+- enumerate more of the %%files list to narrow scope of wildcards
+- re-encode ChangeLog as UTF-8
+
 * Mon Oct  2 2006 Paul Howarth <paul at city-fan.org> 1:0.17-19
 - add new buildreq libtool and use the system libtool instead of the bundled
   one to avoid /usr/lib64 rpaths


