From 813172326304f632499d0ea3b275420e6a8f9fbe19947c805f4068b663aadb3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20V=C3=B6gl?= Date: Tue, 27 Aug 2019 11:42:29 +0000 Subject: [PATCH] Accepting request 725656 from home:jengelh:branches:Base:System - Heed SLPP by placing libtextstyle.so.0 in the right package. - Drop documentation from libtextstyle0, no one will read it there. - Drop static library. - Remove pointless ldconfig calls for libtextstyle-devel. - Avoid pointless sh invocation of libtextstyle0 scriptlets. - Avoid unnecessary |xargs rm. - Remove redundant %clean section. OBS-URL: https://build.opensuse.org/request/show/725656 OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=157 --- gettext-csharp.spec | 2 +- gettext-java.spec | 4 ++-- gettext-runtime-mini.changes | 11 +++++++++++ gettext-runtime-mini.spec | 26 +++++++++----------------- gettext-runtime.changes | 11 +++++++++++ gettext-runtime.spec | 32 +++++++++----------------------- 6 files changed, 43 insertions(+), 43 deletions(-) diff --git a/gettext-csharp.spec b/gettext-csharp.spec index 76e1f1f..21f2724 100644 --- a/gettext-csharp.spec +++ b/gettext-csharp.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # diff --git a/gettext-java.spec b/gettext-java.spec index 73892ed..838382c 100644 --- a/gettext-java.spec +++ b/gettext-java.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -88,7 +88,7 @@ fdupes -r *|while read dupe; do fi done cd .. -find -size 0 -print0 | xargs -0 --no-run-if-empty rm +find -type f -size 0 -delete mkdir -p %{buildroot}%{_libdir}/gettext mv %{buildroot}/%{_datadir}/gettext/gettext.jar %{buildroot}%{_libdir}/gettext/ # Create scripts that will launch the tools diff --git a/gettext-runtime-mini.changes b/gettext-runtime-mini.changes index d693507..58c3688 100644 --- a/gettext-runtime-mini.changes +++ b/gettext-runtime-mini.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Aug 23 16:56:05 UTC 2019 - Jan Engelhardt + +- Heed SLPP by placing libtextstyle.so.0 in the right package. +- Drop documentation from libtextstyle0, no one will read it there. +- Drop static library. +- Remove pointless ldconfig calls for libtextstyle-devel. +- Avoid pointless sh invocation of libtextstyle0 scriptlets. +- Avoid unnecessary |xargs rm. +- Remove redundant %clean section. + ------------------------------------------------------------------- Thu Jun 20 09:56:30 UTC 2019 - Martin Liška diff --git a/gettext-runtime-mini.spec b/gettext-runtime-mini.spec index ce87a19..469d1b8 100644 --- a/gettext-runtime-mini.spec +++ b/gettext-runtime-mini.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -171,7 +171,7 @@ export CXXFLAGS="$CFLAGS -Dgcc_is_lint" %if 0%{?qemu_user_space_build:1} OPTS="--disable-openmp" %endif -%configure --enable-shared $OPTS +%configure --disable-static $OPTS make %{?_smp_mflags} GMSGFMT=../src/msgfmt V=1 # use texinfo.tex supplied by the system (texinfo) # make -C gettext-tools/doc gettext.pdf @@ -179,7 +179,7 @@ make %{?_smp_mflags} GMSGFMT=../src/msgfmt V=1 %install %define my_docdir %{_defaultdocdir}/%{name} export LC_CTYPE=ISO-8859-15 -make install DESTDIR=%{buildroot} docdir=%{my_docdir} +%make_install docdir=%{my_docdir} cp -pr AUTHORS NEWS README* %{buildroot}/%{my_docdir} mkdir -p %{buildroot}/usr/share/emacs/site-lisp install -m 644 %SOURCE2 %{buildroot}/usr/share/emacs/site-lisp @@ -198,7 +198,7 @@ rm -rf %{buildroot}/%_datadir/locale/en@{bold,}quot rm -f %{buildroot}/usr/share/doc/packages/gettext/README.{mingw,vms,woe32} rm -f %_datadir/%name/gettext.jar rm -f %{buildroot}/%_libdir/libtextstyle.la -#find %%{buildroot} -maxdepth 2 -name '*html' | xargs rm -f +#find %%{buildroot} -maxdepth 2 -name '*html' -delete # hardlink the dupes in the documentation: cd %{buildroot}/%{my_docdir}/examples sh %{SOURCE3} @@ -232,9 +232,6 @@ make check || { } %endif -%clean -rm -rf %{buildroot} - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -247,11 +244,8 @@ rm -rf %{buildroot} %install_info_delete --info-dir=%{_infodir} %{_infodir}/gettext.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz -%post -n libtextstyle0 -ldconfig - -%postun -n libtextstyle0 -ldconfig +%post -n libtextstyle0 -p /sbin/ldconfig +%postun -n libtextstyle0 -p /sbin/ldconfig %files -f gettext-runtime.lang %defattr(-,root,root) @@ -338,9 +332,7 @@ ldconfig %files -n libtextstyle0 %defattr(-,root,root) - -%doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html -%doc %_infodir/libtextstyle.info.gz +%_libdir/libtextstyle.so.0 %_libdir/libtextstyle.so.0.0.0 %files -n libtextstyle-devel @@ -350,8 +342,8 @@ ldconfig %_includedir/textstyle/stdbool.h %_includedir/textstyle/version.h %_includedir/textstyle/woe32dll.h -%_libdir/libtextstyle.a %_libdir/libtextstyle.so -%_libdir/libtextstyle.so.0 +%doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html +%doc %_infodir/libtextstyle.info.gz %changelog diff --git a/gettext-runtime.changes b/gettext-runtime.changes index d693507..58c3688 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Aug 23 16:56:05 UTC 2019 - Jan Engelhardt + +- Heed SLPP by placing libtextstyle.so.0 in the right package. +- Drop documentation from libtextstyle0, no one will read it there. +- Drop static library. +- Remove pointless ldconfig calls for libtextstyle-devel. +- Avoid pointless sh invocation of libtextstyle0 scriptlets. +- Avoid unnecessary |xargs rm. +- Remove redundant %clean section. + ------------------------------------------------------------------- Thu Jun 20 09:56:30 UTC 2019 - Martin Liška diff --git a/gettext-runtime.spec b/gettext-runtime.spec index b4299b5..170af44 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -171,7 +171,7 @@ export CXXFLAGS="$CFLAGS -Dgcc_is_lint" %if 0%{?qemu_user_space_build:1} OPTS="--disable-openmp" %endif -%configure --enable-shared $OPTS +%configure --disable-static $OPTS make %{?_smp_mflags} GMSGFMT=../src/msgfmt V=1 # use texinfo.tex supplied by the system (texinfo) # make -C gettext-tools/doc gettext.pdf @@ -179,7 +179,7 @@ make %{?_smp_mflags} GMSGFMT=../src/msgfmt V=1 %install %define my_docdir %{_defaultdocdir}/%{name} export LC_CTYPE=ISO-8859-15 -make install DESTDIR=%{buildroot} docdir=%{my_docdir} +%make_install docdir=%{my_docdir} cp -pr AUTHORS NEWS README* %{buildroot}/%{my_docdir} mkdir -p %{buildroot}/usr/share/emacs/site-lisp install -m 644 %SOURCE2 %{buildroot}/usr/share/emacs/site-lisp @@ -198,7 +198,7 @@ rm -rf %{buildroot}/%_datadir/locale/en@{bold,}quot rm -f %{buildroot}/usr/share/doc/packages/gettext/README.{mingw,vms,woe32} rm -f %_datadir/%name/gettext.jar rm -f %{buildroot}/%_libdir/libtextstyle.la -#find %%{buildroot} -maxdepth 2 -name '*html' | xargs rm -f +#find %%{buildroot} -maxdepth 2 -name '*html' -delete # hardlink the dupes in the documentation: cd %{buildroot}/%{my_docdir}/examples sh %{SOURCE3} @@ -232,9 +232,6 @@ make check || { } %endif -%clean -rm -rf %{buildroot} - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -247,17 +244,8 @@ rm -rf %{buildroot} %install_info_delete --info-dir=%{_infodir} %{_infodir}/gettext.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz -%post -n libtextstyle0 -ldconfig - -%postun -n libtextstyle0 -ldconfig - -%post -n libtextstyle-devel -ldconfig - -%postun -n libtextstyle-devel -ldconfig +%post -n libtextstyle0 -p /sbin/ldconfig +%postun -n libtextstyle0 -p /sbin/ldconfig %files -f gettext-runtime.lang %defattr(-,root,root) @@ -344,9 +332,7 @@ ldconfig %files -n libtextstyle0 %defattr(-,root,root) - -%doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html -%doc %_infodir/libtextstyle.info.gz +%_libdir/libtextstyle.so.0 %_libdir/libtextstyle.so.0.0.0 %files -n libtextstyle-devel @@ -356,8 +342,8 @@ ldconfig %_includedir/textstyle/stdbool.h %_includedir/textstyle/version.h %_includedir/textstyle/woe32dll.h -%_libdir/libtextstyle.a %_libdir/libtextstyle.so -%_libdir/libtextstyle.so.0 +%doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html +%doc %_infodir/libtextstyle.info.gz %changelog