From 965999c63ee997ea1bbec715ec20323b96588daf Mon Sep 17 00:00:00 2001 From: Bartlomiej Palmowski Date: Tue, 28 Oct 2008 17:50:00 +0100 Subject: [PATCH] graveman: cleaner patch --- graveman/.md5sum | 4 +- graveman/Pkgfile | 8 +-- graveman/graveman-0.3.12-5_nointltoolv2.patch | 62 +++++++++++++++++++ 3 files changed, 65 insertions(+), 9 deletions(-) create mode 100644 graveman/graveman-0.3.12-5_nointltoolv2.patch diff --git a/graveman/.md5sum b/graveman/.md5sum index 2671f4441..18608ffba 100644 --- a/graveman/.md5sum +++ b/graveman/.md5sum @@ -1,4 +1,2 @@ c9c80782282c6699effa91d1a806723b graveman-0.3.12-5.tar.bz2 -42811bb9c43e18efc7159d25da70eecf graveman-0.3.12-5_nointltool.patch -e957d96ed391c9079969894e48bd752c graveman.desktop.in -279928e63f707ae626d6eb1d4cd9eeae graveman48.png +f16d683e766c86a00cf22bbd8b6a4ca0 graveman-0.3.12-5_nointltoolv2.patch diff --git a/graveman/Pkgfile b/graveman/Pkgfile index baee70481..5eccbfb2d 100644 --- a/graveman/Pkgfile +++ b/graveman/Pkgfile @@ -8,17 +8,13 @@ name=graveman version=0.3.12-5 release=1 source=(http://$name.tuxfamily.org/sources/$name-$version.tar.bz2 - $name.desktop.in - ${name}48.png - $name-${version}_nointltool.patch) + $name-${version}_nointltoolv2.patch) build(){ cd $name-$version - patch -p1 -i ../$name-${version}_nointltool.patch + patch -p1 -i ../$name-${version}_nointltoolv2.patch autoreconf --force --install --verbose ./configure --mandir=/usr/man --prefix=/usr make make DESTDIR=$PKG install - install -D -m 0644 $SRC/graveman.desktop.in $PKG/usr/share/applications/graveman.desktop - install -D -m 0644 $SRC/graveman48.png $PKG/usr/share/pixmaps/graveman48.png } diff --git a/graveman/graveman-0.3.12-5_nointltoolv2.patch b/graveman/graveman-0.3.12-5_nointltoolv2.patch new file mode 100644 index 000000000..78e8ca86e --- /dev/null +++ b/graveman/graveman-0.3.12-5_nointltoolv2.patch @@ -0,0 +1,62 @@ +diff -pruN graveman-0.3.12-5.old/configure.in graveman-0.3.12-5/configure.in +--- graveman-0.3.12-5.old/configure.in 2006-06-06 03:30:17.000000000 +0200 ++++ graveman-0.3.12-5/configure.in 2008-10-24 20:42:37.000000000 +0200 +@@ -32,7 +32,6 @@ VERSION=0.3.12-5 + + AM_INIT_AUTOMAKE([$PACKAGE], [$VERSION]) + +-AC_PROG_INTLTOOL(0.22) + AC_ISC_POSIX + AC_PROG_CC + AC_HEADER_STDC +diff -pruN graveman-0.3.12-5.old/desktop/Makefile.am graveman-0.3.12-5/desktop/Makefile.am +--- graveman-0.3.12-5.old/desktop/Makefile.am 2005-05-14 18:44:47.000000000 +0200 ++++ graveman-0.3.12-5/desktop/Makefile.am 2008-10-24 20:50:29.000000000 +0200 +@@ -13,10 +13,12 @@ Application_predata = graveman.desktop.i + Application_DATA = $(Application_predata:.desktop.in=.desktop) + Applicationicon_DATA = graveman48.png + +-@INTLTOOL_DESKTOP_RULE@ +- + EXTRA_DIST = $(Application_DATA) \ + $(Applicationicon_DATA) \ + $(Application_predata) + + CONFIG_CLEAN_FILES = graveman.desktop ++ ++graveman.desktop: graveman.desktop.in ++ cp graveman.desktop.in graveman.desktop ++ +diff -pruN graveman-0.3.12-5.old/Makefile.am graveman-0.3.12-5/Makefile.am +--- graveman-0.3.12-5.old/Makefile.am 2006-06-06 03:33:40.000000000 +0200 ++++ graveman-0.3.12-5/Makefile.am 2008-10-24 20:43:35.000000000 +0200 +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + +-SUBDIRS = m4 src po desktop glade pixmaps man themes ++SUBDIRS = m4 src desktop glade pixmaps man themes + + EXTRA_DIST = autogen.sh + +diff -pruN graveman-0.3.12-5.old/man/Makefile.am graveman-0.3.12-5/man/Makefile.am +--- graveman-0.3.12-5.old/man/Makefile.am 2005-05-22 13:20:41.000000000 +0200 ++++ graveman-0.3.12-5/man/Makefile.am 2008-10-24 20:42:37.000000000 +0200 +@@ -2,7 +2,6 @@ + + ## the subdir where the MAN pages should go .. + mansubdir = man1 +-LOCALES = fr nl + + ## + ## and the MAN +@@ -11,9 +10,4 @@ all: + @true + + install: +- ${INSTALL_DATA} -D graveman.man ${DESTDIR}${mandir}/${mansubdir}/graveman.1 ; \ +- if test "A${USE_NLS}" = "Ayes"; then \ +- for lang in ${LOCALES}; do \ +- ${INSTALL_DATA} -D "${srcdir}/graveman.$$lang.man" "${DESTDIR}${mandir}/$$lang/${mansubdir}/graveman.1"; \ +- done \ +- fi ++ ${INSTALL_DATA} -D graveman.man ${DESTDIR}${mandir}/${mansubdir}/graveman.1