rpms/gedit
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix multiarch problem

Browse Source
This commit is contained in:
Matthias Clasen 2006-02-06 15:10:05 +00:00
parent ce1752e6d2
commit bbd93b7c7f
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gedit-2.13.90-libdir.patch Normal file
View File

@ -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`

7
gedit.spec
View File

@ -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 <mclasen@redhat.com> - 1:2.13.90-2
- Enable python again
- Fix multiarch problem
* Mon Jan 30 2006 Matthias Clasen <mclasen@redhat.com> - 1:2.13.90-1
- Update to 2.13.90