From 7ed4974359acf913bb91695ef7cfae718e824da5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Feb 07 2011 05:33:57 +0000 Subject: remove internal libgettextlib.so and libgettextsrc.so (#650471) --- diff --git a/gettext.spec b/gettext.spec index caf3ec7..edeb38a 100644 --- a/gettext.spec +++ b/gettext.spec @@ -6,7 +6,7 @@ Summary: GNU libraries and utilities for producing multi-lingual messages Name: gettext Version: 0.18.1.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv3+ and LGPLv2+ Group: Development/Tools URL: http://www.gnu.org/software/gettext/ @@ -36,7 +36,6 @@ BuildRequires: emacs BuildRequires: git %endif BuildRequires: chrpath -Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires(post): info Requires(preun): info @@ -150,7 +149,6 @@ make %{?_smp_mflags} %{?with_java:GCJFLAGS="-findirect-dispatch"} %install -rm -rf %{buildroot} make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="%{__install} -p" \ lispdir=%{_datadir}/emacs/site-lisp/gettext \ aclocaldir=%{_datadir}/aclocal EXAMPLESFILES="" @@ -197,9 +195,12 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/libintl.jar rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/gettext.jar -# remove unpackaged files from the buildroot +# remove .la files rm ${RPM_BUILD_ROOT}%{_libdir}/lib*.la +# remove internal .so lib files +rm ${RPM_BUILD_ROOT}%{_libdir}/libgettext{src,lib}.so + # move po-mode initialization elisp file to the right place, and remove byte # compiled file install -d ${RPM_BUILD_ROOT}%{_emacs_sitestartdir} @@ -218,10 +219,6 @@ for i in $RPM_BUILD_ROOT%{_bindir}/* `find $RPM_BUILD_ROOT%{_libdir} -type f`; d done -%clean -rm -rf ${RPM_BUILD_ROOT} - - %if %{with check} %check # this takes quite a lot of time to run @@ -299,8 +296,6 @@ fi %{_infodir}/autosprintf* %{_libdir}/libasprintf.so %{_libdir}/libgettextpo.so -%{_libdir}/libgettextlib.so -%{_libdir}/libgettextsrc.so %{_libdir}/preloadable_libintl.so %{_mandir}/man1/autopoint.1* %{_mandir}/man3/* @@ -313,8 +308,8 @@ fi %files libs %defattr(-,root,root,-) %{_libdir}/libasprintf.so.* -%{_libdir}/libgettextlib-0.*.so %{_libdir}/libgettextpo.so.* +%{_libdir}/libgettextlib-0.*.so %{_libdir}/libgettextsrc-0.*.so %if %{with jar} %{_datadir}/%{name}/libintl.jar @@ -331,6 +326,9 @@ fi %{_emacs_sitelispdir}/%{name}/*.el %changelog +* Mon Feb 7 2011 Jens Petersen - 0.18.1.1-6 +- remove internal libgettextlib.so and libgettextsrc.so (#650471) + * Mon Feb 7 2011 Jens Petersen - 0.18.1.1-5 - fix license field of gettext-libs since libgettextpo is GPLv3+ (#640158)