rpms/gnome-libs/devel gnome-libs-1.4.2-norecurse.patch, NONE, 1.1 gnome-libs.spec, 1.9, 1.10
Paul Howarth (pghmcfc)
fedora-extras-commits at redhat.com
Wed May 28 12:55:29 UTC 2008
- Previous message (by thread): rpms/vino/F-9 .cvsignore, 1.34, 1.35 sources, 1.34, 1.35 vino.spec, 1.69, 1.70
- Next message (by thread): rpms/libgtop2/F-9 .cvsignore, 1.43, 1.44 libgtop2.spec, 1.63, 1.64 sources, 1.43, 1.44
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pghmcfc
Update of /cvs/pkgs/rpms/gnome-libs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13022
Modified Files:
gnome-libs.spec
Added Files:
gnome-libs-1.4.2-norecurse.patch
Log Message:
- Break recursive gnome-config <-> pkg-config loop if 64-bit glib-devel
package is not installed on a 64-bit system (#445981)
- Add file dependency on glib.pc to enforce installation of 64-bit glib-devel
with 64-bit gnome-libs-devel (#445981)
gnome-libs-1.4.2-norecurse.patch:
--- NEW FILE gnome-libs-1.4.2-norecurse.patch ---
--- gnome-libs-1.4.2/gnome-config.in 2008-05-28 09:19:04.000000000 +0100
+++ gnome-libs-1.4.2/gnome-config.in 2008-05-28 12:47:24.000000000 +0100
@@ -2,6 +2,23 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
+MODULE_VERSION=@PACKAGE at -@VERSION@
+
+# Break recursive pkg-config <-> gnome-config loop (#445981)
+if [ $# = 2 -a "$2" = "glib" ]; then
+ case $1 in
+ --libs) echo -lglib
+ exit 0;;
+ --modversion) echo $MODULE_VERSION
+ exit 0;;
+ --cflags) if [ -d /usr/lib64/glib/include ]; then
+ echo -I/usr/include/glib-1.2 /usr/lib64/glib/include
+ else
+ echo -I/usr/include/glib-1.2 /usr/lib/glib/include
+ fi
+ exit 0;;
+ esac
+fi
bindir=@bindir@
sbindir=@sbindir@
@@ -18,7 +35,6 @@
pkgdatadir=${datadir}/@PACKAGE@
pkglibdir=${libdir}/@PACKAGE@
pkgincludedir=${includedir}/@PACKAGE@
-MODULE_VERSION=@PACKAGE at -@VERSION@
module_dirs="$libdir"
# stolen from autoconf
Index: gnome-libs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-libs/devel/gnome-libs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-libs.spec 13 Feb 2008 12:26:33 -0000 1.9
+++ gnome-libs.spec 28 May 2008 12:54:44 -0000 1.10
@@ -5,7 +5,7 @@
Name: gnome-libs
Epoch: 1
Version: 1.4.2
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: The main GNOME1 libraries
License: LGPLv2+ and BSD with advertising and (LGPLv2+ and BSD with advertising)
Group: System Environment/Libraries
@@ -73,6 +73,7 @@
Patch103: gnome-libs-1.4.2-umode_t.patch
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
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI
@@ -95,6 +96,9 @@
# For ownership of %{_datadir}/aclocal
Requires: automake
+# Make sure we have the same-arch glib-devel package (#445981)
+Requires: %{_libdir}/pkgconfig/glib.pc
+
%description devel
GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI
applications and desktop tools to be used in conjunction with a window manager
@@ -142,6 +146,7 @@
%patch104 -p1 -b .xdg-open
%endif
%patch105 -p1 -b .popthelp-format
+%patch106 -p1 -b .norecurse
/usr/bin/iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf-8
%{__mv} -f ChangeLog.utf-8 ChangeLog
@@ -296,6 +301,12 @@
%{_libdir}/libgnomeui.so
%changelog
+* Wed May 28 2008 Paul Howarth <paul at city-fan.org> 1:1.4.2-9
+- Break recursive gnome-config <-> pkg-config loop if 64-bit glib-devel
+ package is not installed on a 64-bit system (#445981)
+- Add file dependency on glib.pc to enforce installation of 64-bit glib-devel
+ with 64-bit gnome-libs-devel (#445981)
+
* Wed Feb 13 2008 Paul Howarth <paul at city-fan.org> 1:1.4.2-8
- Rebuild with gcc 4.3.0 for Fedora 9
- Previous message (by thread): rpms/vino/F-9 .cvsignore, 1.34, 1.35 sources, 1.34, 1.35 vino.spec, 1.69, 1.70
- Next message (by thread): rpms/libgtop2/F-9 .cvsignore, 1.43, 1.44 libgtop2.spec, 1.63, 1.64 sources, 1.43, 1.44
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list