rpms/gnome-commander/devel gnome-commander-1.2.8-trunk-libtool22.patch, NONE, 1.1 gnome-commander.spec, 1.35, 1.36
Mamoru Tasaka
mtasaka at fedoraproject.org
Wed Dec 3 19:16:46 UTC 2008
- Previous message (by thread): rpms/ctrlproxy/devel lib_connection.c.patch, NONE, 1.1 ctrlproxy.spec, 1.19, 1.20
- Next message (by thread): rpms/sugar-presence-service/F-10 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 sugar-presence-service.spec, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/gnome-commander/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14055
Modified Files:
gnome-commander.spec
Added Files:
gnome-commander-1.2.8-trunk-libtool22.patch
Log Message:
libtool 2.2 patch
gnome-commander-1.2.8-trunk-libtool22.patch:
--- NEW FILE gnome-commander-1.2.8-trunk-libtool22.patch ---
--- 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
Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnome-commander.spec 3 Dec 2008 18:05:48 -0000 1.35
+++ gnome-commander.spec 3 Dec 2008 19:16:16 -0000 1.36
@@ -40,7 +40,8 @@
Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}%{?extratag:-%extratag}.tar.bz2
Source1: gnome-commander.sh
Source10: mimeedit-svn%{mimeedit_rev}.sh
-#Patch0: gnome-commander-rev1874-hexmode-display.patch
+# Patch0 must be sent upstream
+Patch0: gnome-commander-1.2.8-trunk-libtool22.patch
Patch10: mimeedit-svn1958.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -105,7 +106,8 @@
%prep
%setup -q -n %{name}-%{version}%{?extratag:-%extratag}
-#%%patch0 -p0 -b .hexdumpmode
+%patch0 -p1 -b .libtool22
+
%if 0%{use_autotool} > 0
%{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh
sh autogen.sh
@@ -145,7 +147,10 @@
--bindir=%{_libexecdir}/%{name} \
--disable-scrollkeeper \
--enable-python
-%{__make} %{?_smp_mflags} -k
+# Sometimes parallel make fails (perhaps), however once
+# force it.
+%{__make} %{?_smp_mflags} -k || :
+%{__make}
%install
%{__rm} -rf %{buildroot}
@@ -211,6 +216,7 @@
%changelog
* Thu Dec 4 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 2330
+- Add patch to compile with libtool 2.2
* Mon Oct 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- 1.2.8 branch
- Previous message (by thread): rpms/ctrlproxy/devel lib_connection.c.patch, NONE, 1.1 ctrlproxy.spec, 1.19, 1.20
- Next message (by thread): rpms/sugar-presence-service/F-10 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 sugar-presence-service.spec, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list