From bbd93b7c7f17d70a85c67ce75282467ebd8d8ab0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 6 Feb 2006 15:10:05 +0000 Subject: [PATCH] Fix multiarch problem --- gedit-2.13.90-libdir.patch | 14 ++++++++++++++ gedit.spec | 7 +++++++ 2 files changed, 21 insertions(+) create mode 100644 gedit-2.13.90-libdir.patch diff --git a/gedit-2.13.90-libdir.patch b/gedit-2.13.90-libdir.patch new file mode 100644 index 0000000..756f531 --- /dev/null +++ b/gedit-2.13.90-libdir.patch @@ -0,0 +1,14 @@ +--- gedit-2.13.90/configure.ac.libdir 2006-02-06 10:06:16.000000000 -0500 ++++ gedit-2.13.90/configure.ac 2006-02-06 10:06:26.000000000 -0500 +@@ -148,9 +148,9 @@ + PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'` + PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'` + PYTHON_LIBS="-lpython$PYTHON_VERSION" +- PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config" ++ PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib64/python$PYTHON_VERSION/config" + PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION" +- PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile" ++ PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib64/python$PYTHON_VERSION/config/Makefile" + PYTHON_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` + PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` + PYTHON_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` diff --git a/gedit.spec b/gedit.spec index bb32074..1f88e37 100644 --- a/gedit.spec +++ b/gedit.spec @@ -30,6 +30,9 @@ PreReq: desktop-file-utils >= %{desktop_file_utils_version} # Make the file selector remember last window size Patch0: gedit-2.13.2-filesel.patch +%ifarch ppc64,x86_64,ia64,s390x +Patch1: gedit-2.13.90-libdir.patch +%endif BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} @@ -81,6 +84,9 @@ Install gedit-devel if you want to write plug-ins for gEdit. %setup -n gedit-%{version} -q %patch0 -p1 -b .filesel +%ifarch ppc64,x86_64,ia64,s390x +%patch1 -p1 -b .libdir +%endif %build %configure --disable-scrollkeeper --enable-python @@ -151,6 +157,7 @@ scrollkeeper-update %changelog * Mon Feb 6 2006 Matthias Clasen - 1:2.13.90-2 - Enable python again +- Fix multiarch problem * Mon Jan 30 2006 Matthias Clasen - 1:2.13.90-1 - Update to 2.13.90