Attachment 295785 Details for Bug 432468 – move the linked shared objects to %_libdir

[patch] move the linked shared objects to %_libdir

lftp-shared.diff (text/plain), 2.55 KB, created by Patrice Dumas on 2008-02-25 11:11:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2008-02-25 11:11:43 UTC

Size: 2.55 KB

patch

obsolete

>? .build-3.6.3-1.fc9.log
>? .lftp.spec.swp
>? i386
>? lftp-3.6.3
>? lftp-3.6.3-1.fc9.src.rpm
>Index: lftp.spec
>===================================================================
>RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v
>retrieving revision 1.68
>diff -u -3 -p -r1.68 lftp.spec
>--- lftp.spec	25 Feb 2008 09:40:18 -0000	1.68
>+++ lftp.spec	25 Feb 2008 11:09:42 -0000
>@@ -33,19 +33,20 @@ make %{?_smp_mflags}
> rm -rf $RPM_BUILD_ROOT
> export tagname=CC
> make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
>-rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.la
> chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/*
> chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.so
>+# dlopened modules are linked against those shared objects, and they are
>+# not dlopened, so they are more like libraries... lacking sonames.
>+mv $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/liblftp-*.so $RPM_BUILD_ROOT%{_libdir}/
> 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
>+mv NEWS.tmp NEWS
> # 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
>-rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-tasks.*a
>-rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-*.so
>+#rm $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.la
>+rm $RPM_BUILD_ROOT%{_libdir}/liblftp-jobs.la
>+rm $RPM_BUILD_ROOT%{_libdir}/liblftp-tasks.la
>+rm $RPM_BUILD_ROOT%{_libdir}/liblftp-jobs.so
>+rm $RPM_BUILD_ROOT%{_libdir}/liblftp-tasks.so
> 
> %find_lang %{name}
> 
>@@ -68,17 +69,19 @@ rm -rf $RPM_BUILD_ROOT
> %dir %{_libdir}/lftp/%{version}
> %{_libdir}/lftp/%{version}/cmd-mirror.so
> %{_libdir}/lftp/%{version}/cmd-sleep.so
>-%{_libdir}/lftp/%{version}/liblftp-network.so
>-%{_libdir}/lftp/%{version}/liblftp-pty.so
>+#%{_libdir}/lftp/%{version}/liblftp-getdate.so
>+#%{_libdir}/lftp/%{version}/liblftp-network.so
>+#%{_libdir}/lftp/%{version}/liblftp-pty.so
> %{_libdir}/lftp/%{version}/proto-file.so
> %{_libdir}/lftp/%{version}/proto-fish.so
> %{_libdir}/lftp/%{version}/proto-ftp.so
> %{_libdir}/lftp/%{version}/proto-http.so
> %{_libdir}/lftp/%{version}/proto-sftp.so
>-%{_libdir}/lftp/%{version}/liblftp-getdate.so
>-%{_libdir}/liblftp-jobs*
>-%{_libdir}/liblftp-tasks*
>-%config /etc/ld.so.conf.d/*
>+%{_libdir}/liblftp-getdate.so
>+%{_libdir}/liblftp-network.so
>+%{_libdir}/liblftp-pty.so
>+%{_libdir}/liblftp-jobs.so.*
>+%{_libdir}/liblftp-tasks.so.*
> 
> %changelog
> * Mon Feb 25 2008 Martin Nagy <mnagy@redhat.com> - 3.6.3-1

Actions: View | Diff

Attachments on bug 432468: 295785 | 295807 | 296095