From c182dbdc56c696eb469ea12151ed28053b381acc Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Feb 09 2005 14:12:30 +0000 Subject: x86_64 fix + enable debuginfo package --- diff --git a/manedit-0.5.11-multilib.patch b/manedit-0.5.11-multilib.patch new file mode 100644 index 0000000..8369c66 --- /dev/null +++ b/manedit-0.5.11-multilib.patch @@ -0,0 +1,27 @@ +diff -Nur manedit-0.5.11-orig/manedit/platforms.ini manedit-0.5.11/manedit/platforms.ini +--- manedit-0.5.11-orig/manedit/platforms.ini 2004-04-17 23:36:20.000000000 +0200 ++++ manedit-0.5.11/manedit/platforms.ini 2005-02-09 15:02:30.899962320 +0100 +@@ -104,10 +104,10 @@ + PlatformSearchPathInclude = /usr/include/ + PlatformSearchPathInclude = /usr/X11R6/include/ + PlatformSearchPathInclude = /usr/local/include/ +- PlatformSearchPathLib = /lib/ +- PlatformSearchPathLib = /usr/lib/ +- PlatformSearchPathLib = /usr/X11R6/lib/ +- PlatformSearchPathLib = /usr/local/lib/ ++ PlatformSearchPathLib = /@LIB@/ ++ PlatformSearchPathLib = /usr/@LIB@/ ++ PlatformSearchPathLib = /usr/X11R6/@LIB@/ ++ PlatformSearchPathLib = /usr/local/@LIB@/ + PlatformSearchPathEtc = /etc/ + PlatformSearchPathEtc = /usr/etc/ + PlatformSearchPathEtc = /usr/local/etc/ +@@ -191,7 +191,7 @@ + MustExist = Yes + FeatureCFLAGS = `gtk-config --cflags` + FeatureLIBS = `gtk-config --libs` +- FeatureLIB_DIR = -L/usr/X11R6/lib/ ++ FeatureLIB_DIR = -L/usr/X11R6/@LIB@/ + FeatureDepend = gtk-lib + DependType = Library + MustExist = Yes diff --git a/manedit-0.5.11-nostrip.patch b/manedit-0.5.11-nostrip.patch new file mode 100644 index 0000000..3ff12d7 --- /dev/null +++ b/manedit-0.5.11-nostrip.patch @@ -0,0 +1,16 @@ +diff -Nur manedit-0.5.11-orig/manedit/Makefile.install.UNIX manedit-0.5.11/manedit/Makefile.install.UNIX +--- manedit-0.5.11-orig/manedit/Makefile.install.UNIX 2004-04-17 23:36:17.000000000 +0200 ++++ manedit-0.5.11/manedit/Makefile.install.UNIX 2005-02-09 15:04:35.725072744 +0100 +@@ -12,10 +12,10 @@ + # + + INSTALL = install +-INSTBINFLAGS = -m 0755 -s ++INSTBINFLAGS = -m 0755 + INSTSCRFLAGS = -m 0755 + INSTUIDFLAGS = -m 4755 +-INSTLIBFLAGS = -m 0755 -s ++INSTLIBFLAGS = -m 0755 + INSTINCFLAGS = -m 0644 + INSTMANFLAGS = -m 0644 + INSTCFGFLAGS = -m 0644 diff --git a/manedit.spec b/manedit.spec index f664a01..f8e612b 100644 --- a/manedit.spec +++ b/manedit.spec @@ -1,8 +1,8 @@ Name: manedit Version: 0.5.11 -Release: 2 +Release: 3 Epoch: 0 -Summary: GUI editor for creating man pages. +Summary: GUI editor for creating man pages Group: Development/Tools License: GPL @@ -10,6 +10,8 @@ URL: http://wolfpack.twu.net/ManEdit/ Source0: ftp://wolfpack.twu.net/users/wolfpack/manedit-0.5.11.tar.bz2 Source1: manedit.desktop Patch: manedit-0.5.11-bzip2.patch +Patch1: manedit-0.5.11-nostrip.patch +Patch2: manedit-0.5.11-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel zlib-devel desktop-file-utils bzip2-devel @@ -24,8 +26,11 @@ and requires the X Window Systems. %prep %setup -q %patch -p1 -b .bzip2 +%patch1 -p1 -b .nostrip +%patch2 -p1 -b .multilib perl -pi -e "s|/usr/man|%{_mandir}|" manedit/pref.c perl -pi -e "s|/usr/man|%{_mandir}|" manedit/prefcb.c +perl -pi -e "s|\@LIB\@|%{_lib}|" manedit/platforms.ini %build #manedit uses some weird configuration system @@ -60,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %changelog +* Wed Feb 9 2005 Michael Schwendt - 0:0.5.11-3 +- Add patch for multilib and substitute hardcoded 'lib' in %%prep. +- Add patch to disable stripping. + * Wed Nov 17 2004 Michael Schwendt - 0:0.5.11-2 - BR bzip2-devel + patch to enable bzip2, bump release