From 0c0435356d6f7deb07408ed35be9c9831008fdfc Mon Sep 17 00:00:00 2001 From: jorton Date: Fri, 7 Mar 2008 15:21:05 +0000 Subject: [PATCH] - drop libidn.a - move shared library to /lib{,64} (#283651) --- libidn.spec | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/libidn.spec b/libidn.spec index c51bfd4..a6cc5b0 100644 --- a/libidn.spec +++ b/libidn.spec @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn Version: 0.6.14 -Release: 5 +Release: 6 URL: http://www.gnu.org/software/libidn/ License: LGPLv2+ Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -41,7 +41,7 @@ mv iconv.tmp doc/libidn.info %build # Must re-bootstrap to get multilib-aware libtool autoreconf -%configure --disable-csharp +%configure --disable-csharp --disable-static --libdir=/%{_lib} make %{?_smp_mflags} %check @@ -49,7 +49,7 @@ make %{?_smp_mflags} -C tests check %install rm -rf %{buildroot} -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT pkgconfigdir=%{_libdir}/pkgconfig # provide more examples make %{?_smp_mflags} -C examples distclean @@ -61,9 +61,15 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/info/dir # Make multilib safe: sed -i '/gnu compiler/d' $RPM_BUILD_ROOT%{_includedir}/idn-int.h -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \ +rm -f $RPM_BUILD_ROOT/%{_lib}/*.la \ $RPM_BUILD_ROOT%{_datadir}/info/*.png +mkdir -p $RPM_BUILD_ROOT%{_libdir} +mv $RPM_BUILD_ROOT/%{_lib}/libidn.so $RPM_BUILD_ROOT%{_libdir} + +lib=`echo $RPM_BUILD_ROOT/%{_lib}/libidn.so.*.*` +ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libidn.so + %find_lang %{name} %post @@ -86,19 +92,22 @@ rm -rf %{buildroot} %{_bindir}/idn %{_mandir}/man1/idn.1* %{_datadir}/emacs/site-lisp -%{_libdir}/libidn.so.* +/%{_lib}/libidn.so.* %{_infodir}/%{name}.info.gz %files devel %defattr(0644,root,root,755) %doc doc/libidn.html examples %{_libdir}/libidn.so -%{_libdir}/libidn.a %{_includedir}/*.h %{_libdir}/pkgconfig/*.pc %{_mandir}/man3/* %changelog +* Fri Mar 7 2008 Joe Orton 0.6.14-6 +- drop libidn.a +- move shared library to /lib{,64} (#283651) + * Thu Feb 7 2008 Joe Orton 0.6.14-5 - fix DT_RPATH in /usr/bin/idn - convert libidn.iconv to UTF-8 (Jon Ciesla, #226029)