rpms/gnome-python2-extras/devel gnome-python-extras-2.19.1-pkg-config.patch, NONE, 1.1 gnome-python2-extras.spec, 1.24, 1.25

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/gnome-python2-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23646

Modified Files:
	gnome-python2-extras.spec 
Added Files:
	gnome-python-extras-2.19.1-pkg-config.patch 
Log Message:

* Sun Feb 17 2008 Matthew Barnes <mbarnes at redhat.com> - 2.19.1-14.fc9
- Rebuild with GCC 4.3


gnome-python-extras-2.19.1-pkg-config.patch:

--- NEW FILE gnome-python-extras-2.19.1-pkg-config.patch ---
diff -up gnome-python-extras-2.19.1/configure.pkg-config gnome-python-extras-2.19.1/configure
--- gnome-python-extras-2.19.1/configure.pkg-config	2008-01-12 21:07:56.000000000 -0500
+++ gnome-python-extras-2.19.1/configure	2008-01-12 21:09:49.000000000 -0500
@@ -22096,14 +22096,14 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$mozpackage-gtkmozembed >= \$mozpackage_required_version,
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\mozilla-gtkmozembed >= \$mozpackage_required_version,
                                 gtk+-2.0                >= 2.4.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "$mozpackage-gtkmozembed >= $mozpackage_required_version,
+  ($PKG_CONFIG --exists --print-errors "mozilla-gtkmozembed >= $mozpackage_required_version,
                                 gtk+-2.0                >= 2.4.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "$mozpackage-gtkmozembed >= $mozpackage_required_version,
+  pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "mozilla-gtkmozembed >= $mozpackage_required_version,
                                 gtk+-2.0                >= 2.4.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -22117,14 +22117,14 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$mozpackage-gtkmozembed >= \$mozpackage_required_version,
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\mozilla-gtkmozembed >= \$mozpackage_required_version,
                                 gtk+-2.0                >= 2.4.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "$mozpackage-gtkmozembed >= $mozpackage_required_version,
+  ($PKG_CONFIG --exists --print-errors "mozilla-gtkmozembed >= $mozpackage_required_version,
                                 gtk+-2.0                >= 2.4.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "$mozpackage-gtkmozembed >= $mozpackage_required_version,
+  pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "mozilla-gtkmozembed >= $mozpackage_required_version,
                                 gtk+-2.0                >= 2.4.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -22144,10 +22144,10 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$mozpackage-gtkmozembed >= $mozpackage_required_version,
+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-gtkmozembed >= $mozpackage_required_version,
                                 gtk+-2.0                >= 2.4.0"`
         else
-	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$mozpackage-gtkmozembed >= $mozpackage_required_version,
+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-gtkmozembed >= $mozpackage_required_version,
                                 gtk+-2.0                >= 2.4.0"`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -22179,7 +22179,7 @@ fi
 if test -n "$export_dynamic"; then
   GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS | sed -e "s/$export_dynamic//"`
 fi
-MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
+MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
 
 
 


Index: gnome-python2-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-python2-extras/devel/gnome-python2-extras.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnome-python2-extras.spec	13 Jan 2008 01:31:13 -0000	1.24
+++ gnome-python2-extras.spec	17 Feb 2008 16:13:59 -0000	1.25
@@ -21,7 +21,7 @@
 
 Name: gnome-python2-extras
 Version: 2.19.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPL/LGPL
 Group: Development/Languages
 Summary: The sources for additional. PyGNOME Python extension modules.
@@ -36,6 +36,7 @@
 
 Patch1: gnome-python-extras-2.10.0-gtkspell-static.patch
 Patch2: gnome-python-extras-2.19.1-xulrunner.patch
+Patch3: gnome-python-extras-2.19.1-pkg-config.patch
 
 ### Dependencies ###
 
@@ -135,7 +136,8 @@
 %prep
 %setup -q -n gnome-python-extras-%{version}
 %patch1 -p1 -b .gtkspell-static
-%patch2 -p1 -b .xl
+%patch2 -p1 -b .xulrunner
+%patch3 -p1 -b .pkg-config
 
 %build
 %configure --with-gtkmozembed=xulrunner
@@ -196,10 +198,15 @@
 %{_libdir}/pkgconfig/pygda-3.0.pc
 
 %changelog
+* Sun Feb 17 2008 Matthew Barnes <mbarnes at redhat.com> - 2.19.1-14.fc9
+- Rebuild with GCC 4.3
+
 * Sat Jan 12 2008 Matthew Barnes <mbarnes at redhat.com> - 2.19.1-13.fc9
 - Rename anjuta-gdl dependency to libgdl.
 - Build now requires gecko-devel-unstable instead of gecko-devel
   (for mozilla-gtkmozembed pkg-config module).
+- Add patch to make pkg-config look for mozilla-gtkmozembed even
+  though we're using xulrunner.
 
 * Tue Nov 27 2007 Martin Stransky <stransky at redhat.com> - 2.19.1-12.fc9
 - added wraper for gtk_moz_embed_set_path()