From afadebb89f8ebe4c83374b6770080e18508f5684 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sun, 1 Feb 2009 13:24:25 +0000 Subject: [PATCH] - rev 2448 --- .cvsignore | 2 +- gnome-commander-1.2.8-trunk-libtool22.patch | 14 -------------- gnome-commander.spec | 9 ++++----- sources | 2 +- 4 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 gnome-commander-1.2.8-trunk-libtool22.patch diff --git a/.cvsignore b/.cvsignore index 2a5bf3d..7e1b6e8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-commander-1.2.8-svn2426_trunk.tar.bz2 +gnome-commander-1.2.8-svn2448_trunk.tar.bz2 diff --git a/gnome-commander-1.2.8-trunk-libtool22.patch b/gnome-commander-1.2.8-trunk-libtool22.patch deleted file mode 100644 index db3c3d4..0000000 --- a/gnome-commander-1.2.8-trunk-libtool22.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- gnome-commander-1.2.8-svn2330_trunk/configure.in.debug 2008-11-15 02:31:22.000000000 +0900 -+++ gnome-commander-1.2.8-svn2330_trunk/configure.in 2008-12-04 04:00:43.000000000 +0900 -@@ -299,9 +299,8 @@ - } - EOF - -- if /bin/sh ../libtool --mode=compile ${CC} $PYTHON_CFLAGS -c testpython.c >/dev/null 2>&1 && \ -- /bin/sh ../libtool --mode=link ${CC} -o testpython.la -rpath `pwd` -module -avoid-version $PYTHON_LIB_LOC testpython.lo $PYTHON_LIBS $PYTHON_EXTRA_LIBS >/dev/null 2>&1 && \ -- grep 'dlname.*testpython' testpython.la >/dev/null 2>&1; then -+ if ${CC} $PYTHON_CFLAGS $PYTHON_LIBS $PYTHON_EXTRA_LIBS -fPIC -shared -o testpython.so testpython.c -Wl,-soname,testpython.so >/dev/null 2>&1 && \ -+ ( objdump --headers --private-headers testpython.so | grep 'testpython' ) >/dev/null 2>&1; then - result=yes - else - result=no diff --git a/gnome-commander.spec b/gnome-commander.spec index d81cda2..529bf48 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -18,7 +18,7 @@ %define use_autotool 0 %define if_pre 1 %define main_release 3 -%define extratag svn2426_trunk +%define extratag svn2448_trunk %define mimeedit_rev 1958 %if 0%{?if_pre} > 0 @@ -146,8 +146,7 @@ replace_icon gnome-fs-web folder-remote --enable-python # Sometimes parallel make fails (perhaps), however once # force it. -%{__make} %{?_smp_mflags} -k || : -%{__make} +%{__make} %{?_smp_mflags} -k || { %{__make} || exit 1; } %install %{__rm} -rf %{buildroot} @@ -211,8 +210,8 @@ scrollkeeper-update -q || : %{_datadir}/pixmaps/%{name}/ %changelog -* Wed Jan 14 2009 Mamoru Tasaka -- rev 2426 +* Sun Feb 1 2009 Mamoru Tasaka +- rev 2448 * Thu Dec 18 2008 Rex Dieter - respin (exiv2) diff --git a/sources b/sources index 4f79008..da3be00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cdd27dc1bea60e00ea64b5eee3f0b673 gnome-commander-1.2.8-svn2426_trunk.tar.bz2 +df0c9d62ee36bb0469027557de4550a0 gnome-commander-1.2.8-svn2448_trunk.tar.bz2