rpms/lftp/devel lftp.spec,1.68,1.69

Martin Nagy (mnagy) fedora-extras-commits at redhat.com
Mon Mar 3 13:26:28 UTC 2008


Author: mnagy

Update of /cvs/extras/rpms/lftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28990

Modified Files:
	lftp.spec 
Log Message:
* Thu Feb 28 2008 Martin Nagy <mnagy at redhat.com> - 3.6.3-2
- fix rpath



Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- lftp.spec	25 Feb 2008 09:40:18 -0000	1.68
+++ lftp.spec	3 Mar 2008 13:25:47 -0000	1.69
@@ -1,13 +1,13 @@
-Summary: 	A sophisticated file transfer program
-Name: 		lftp 
-Version: 	3.6.3
-Release: 	1%{?dist}
-License: 	GPLv2+
-Group: 		Applications/Internet
-Source0: 	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz
-URL: 		http://lftp.yar.ru/
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: 	ncurses-devel, openssl-devel, pkgconfig, readline-devel, gettext
+Summary:	A sophisticated file transfer program
+Name:		lftp
+Version:	3.6.3
+Release:	2%{?dist}
+License:	GPLv2+
+Group:		Applications/Internet
+Source0:	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz
+URL:		http://lftp.yar.ru/
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	ncurses-devel, openssl-devel, pkgconfig, readline-devel, gettext
 
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@@ -17,16 +17,17 @@
 
 %prep
 %setup -q
+sed -i.rpath -e '/lftp_cv_openssl/s|-R.*lib||' configure
+sed -i.norpath -e \
+	'/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib64 |' \
+	configure
 
 %build
 if pkg-config openssl ; then
 	CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
 	LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS
 fi
-%configure --with-modules --disable-static --with-openssl=/usr --with-debug --disable-rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-export tagname=CC
+%configure --with-modules --disable-static --with-openssl=%{_prefix} --with-debug
 make %{?_smp_mflags}
 
 %install
@@ -39,8 +40,6 @@
 iconv -f ISO88591 -t UTF8 NEWS -o NEWS.tmp
 touch -r NEWS NEWS.tmp
 mv -f NEWS.tmp NEWS
-mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
-echo "%{_libdir}/lftp/%{version}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 # Remove files from $RPM_BUILD_ROOT that we aren't shipping.
 rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-jobs.*a
@@ -78,9 +77,11 @@
 %{_libdir}/lftp/%{version}/liblftp-getdate.so
 %{_libdir}/liblftp-jobs*
 %{_libdir}/liblftp-tasks*
-%config /etc/ld.so.conf.d/*
 
 %changelog
+* Thu Feb 28 2008 Martin Nagy <mnagy at redhat.com> - 3.6.3-2
+- fix rpath
+
 * Mon Feb 25 2008 Martin Nagy <mnagy at redhat.com> - 3.6.3-1
 - update to newest version
 - remove patches fixed in upstream: progress_overflow, empty_argument
@@ -124,7 +125,7 @@
 * Thu Jan 18 2007 Maros Barabas <mbarabas at redhat.com> - 3.5.9
 - Upgrade to 3.5.9 from upstream 
 
-* Wed Aug 23 2006 Maros Barabas	<mbarabas at redhat.com> - 3.5.1-2
+* Wed Aug 23 2006 Maros Barabas <mbarabas at redhat.com> - 3.5.1-2
 - remove .a & .la from libdir
 
 * Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 3.5.1-1.fc6




More information about the fedora-extras-commits mailing list