rpms/gnome-libs/devel gnome-libs.spec,1.13,1.14

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/gnome-libs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5501

Modified Files:
	gnome-libs.spec 
Log Message:
- Provide pkgconfig(gnomeui) needed to satisfy autogenerated dependency in
  libglade and possibly other packages built on gnome-libs; an actual .pc file
  isn't needed because pkg-config knows to use gnome-config for this
- Weed out redundant -L%%{_libdir} options from gnome-config output



Index: gnome-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-libs/devel/gnome-libs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-libs.spec	24 Feb 2009 23:02:04 -0000	1.13
+++ gnome-libs.spec	5 Mar 2009 16:19:51 -0000	1.14
@@ -5,7 +5,7 @@
 Name:           gnome-libs
 Epoch:          1
 Version:        1.4.2
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        The main GNOME1 libraries
 License:        LGPLv2+ and BSD with advertising and (LGPLv2+ and BSD with advertising)
 Group:          System Environment/Libraries
@@ -74,6 +74,7 @@
 Patch104:       gnome-libs-1.4.2-xdg-open.patch
 Patch105:       gnome-libs-1.4.2-popthelp-format.patch
 Patch106:       gnome-libs-1.4.2-norecurse.patch
+Patch107:       gnome-libs-1.4.2-gnome-config-no-Llibdir.patch
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI
@@ -94,12 +95,17 @@
 Requires:       libSM-devel%{?_isa}
 Requires:       pkgconfig
 
+# pkg-config knows to use gnome-config when asked about libgnomeui
+Provides:       pkgconfig(gnomeui) = %{version}
+
 # For ownership of %{_datadir}/aclocal
 Requires:       automake
 
 # Make sure we have the same-arch glib-devel package (#445981)
 # Needed where %{_isa} isn't yet supported
+%if "%{?_isa}" == ""
 Requires:       %{_libdir}/pkgconfig/glib.pc
+%endif
 
 %description devel
 GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI
@@ -149,6 +155,7 @@
 %endif
 %patch105 -p1 -b .popthelp-format
 %patch106 -p1 -b .norecurse
+%patch107 -p1 -b .nolibdir
 
 /usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf-8
 %{__mv} -f ChangeLog.utf-8 ChangeLog
@@ -303,7 +310,13 @@
 %{_libdir}/libgnomeui.so
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.4.2-12
+* Thu Mar  5 2009 Paul Howarth <paul at city-fan.org> 1:1.4.2-13
+- Provide pkgconfig(gnomeui) needed to satisfy autogenerated dependency in
+  libglade and possibly other packages built on gnome-libs; an actual .pc file
+  isn't needed because pkg-config knows to use gnome-config for this
+- Weed out redundant -L%%{_libdir} options from gnome-config output
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.4.2-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Nov 20 2008 Paul Howarth <paul at city-fan.org> 1:1.4.2-11