rpms/epiphany/F-10 python-paths.patch, NONE, 1.1 epiphany.spec, 1.205, 1.206

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/epiphany/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26437

Modified Files:
	epiphany.spec 
Added Files:
	python-paths.patch 
Log Message:
try again


python-paths.patch:

--- NEW FILE python-paths.patch ---
diff -up epiphany-2.24.2/configure.ac.python-paths epiphany-2.24.2/configure.ac
--- epiphany-2.24.2/configure.ac.python-paths	2008-11-25 12:08:57.000000000 -0500
+++ epiphany-2.24.2/configure.ac	2008-11-25 12:10:24.000000000 -0500
@@ -493,8 +493,9 @@ fi
 if test "$have_python" != "no"; then
 	PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'`
 	PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
+        PYTHON_LIBDIR=`$PYTHON -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,1)"`
 	PYTHON_LIBS="-lpython$PYTHON_VERSION"
-	PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config"
+	PYTHON_LIB_LOC="-L$PYTHON_LIBDIR/config"
 	PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION"
 	PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile"
 	PYTHON_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`


Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/F-10/epiphany.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- epiphany.spec	25 Nov 2008 16:30:13 -0000	1.205
+++ epiphany.spec	25 Nov 2008 17:13:42 -0000	1.206
@@ -8,7 +8,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.24.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -51,6 +51,7 @@
 Patch2: epiphany-2.18.1-default-bookmarks.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=334751
 Patch3: epiphany-2.20.1-wrapped-plugins.patch
+Patch4: python-paths.patch
 
 %description
 Epiphany is a simple GNOME web browser based on the Mozilla rendering
@@ -78,7 +79,7 @@
 # We install python stuff
 Requires: pygtk2-devel
 # We install an automake macro
-Requires: automake
+Requires: automake, autoconf, libtool
 
 %description devel
 Epiphany is a web browser based on the Mozilla rendering engine.
@@ -93,12 +94,15 @@
 %patch1 -p1 -b .use-pango
 %patch2 -p1 -b .default-bookmarks
 %patch3 -p1 -b .wrapped-plugins
+%patch4 -p1 -b .python-paths
 # Fedora Epiphany version
 cat >> data/default-prefs-common.js << EOF
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "%{version}-%{release}");
 EOF
 
+autoreconf
+
 %build
 # Build with -Os as it helps the browser; also, don't override mozilla's warning
 # level; they use -Wall but disable a few warnings that show up _everywhere_
@@ -241,7 +245,7 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
-* Tue Nov 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.2-1
+* Tue Nov 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.2-2
 - Update to 2.24.2
 
 * Wed Nov 12 2008 Christopher Aillon <caillon at redhat.com> - 2.24.1-2