1
0

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
This commit is contained in:
Christian Vögl 2019-08-27 11:42:29 +00:00 committed by Git OBS Bridge
parent d175f3ec13
commit 8131723263
6 changed files with 43 additions and 43 deletions

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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/
# #

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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 fi
done done
cd .. cd ..
find -size 0 -print0 | xargs -0 --no-run-if-empty rm find -type f -size 0 -delete
mkdir -p %{buildroot}%{_libdir}/gettext mkdir -p %{buildroot}%{_libdir}/gettext
mv %{buildroot}/%{_datadir}/gettext/gettext.jar %{buildroot}%{_libdir}/gettext/ mv %{buildroot}/%{_datadir}/gettext/gettext.jar %{buildroot}%{_libdir}/gettext/
# Create scripts that will launch the tools # Create scripts that will launch the tools

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Aug 23 16:56:05 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- 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 <mliska@suse.cz> Thu Jun 20 09:56:30 UTC 2019 - Martin Liška <mliska@suse.cz>

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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} %if 0%{?qemu_user_space_build:1}
OPTS="--disable-openmp" OPTS="--disable-openmp"
%endif %endif
%configure --enable-shared $OPTS %configure --disable-static $OPTS
make %{?_smp_mflags} GMSGFMT=../src/msgfmt V=1 make %{?_smp_mflags} GMSGFMT=../src/msgfmt V=1
# use texinfo.tex supplied by the system (texinfo) # use texinfo.tex supplied by the system (texinfo)
# make -C gettext-tools/doc gettext.pdf # make -C gettext-tools/doc gettext.pdf
@ -179,7 +179,7 @@ make %{?_smp_mflags} GMSGFMT=../src/msgfmt V=1
%install %install
%define my_docdir %{_defaultdocdir}/%{name} %define my_docdir %{_defaultdocdir}/%{name}
export LC_CTYPE=ISO-8859-15 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} cp -pr AUTHORS NEWS README* %{buildroot}/%{my_docdir}
mkdir -p %{buildroot}/usr/share/emacs/site-lisp mkdir -p %{buildroot}/usr/share/emacs/site-lisp
install -m 644 %SOURCE2 %{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 %{buildroot}/usr/share/doc/packages/gettext/README.{mingw,vms,woe32}
rm -f %_datadir/%name/gettext.jar rm -f %_datadir/%name/gettext.jar
rm -f %{buildroot}/%_libdir/libtextstyle.la 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: # hardlink the dupes in the documentation:
cd %{buildroot}/%{my_docdir}/examples cd %{buildroot}/%{my_docdir}/examples
sh %{SOURCE3} sh %{SOURCE3}
@ -232,9 +232,6 @@ make check || {
} }
%endif %endif
%clean
rm -rf %{buildroot}
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -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}/gettext.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz
%post -n libtextstyle0 %post -n libtextstyle0 -p /sbin/ldconfig
ldconfig %postun -n libtextstyle0 -p /sbin/ldconfig
%postun -n libtextstyle0
ldconfig
%files -f gettext-runtime.lang %files -f gettext-runtime.lang
%defattr(-,root,root) %defattr(-,root,root)
@ -338,9 +332,7 @@ ldconfig
%files -n libtextstyle0 %files -n libtextstyle0
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libtextstyle.so.0
%doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html
%doc %_infodir/libtextstyle.info.gz
%_libdir/libtextstyle.so.0.0.0 %_libdir/libtextstyle.so.0.0.0
%files -n libtextstyle-devel %files -n libtextstyle-devel
@ -350,8 +342,8 @@ ldconfig
%_includedir/textstyle/stdbool.h %_includedir/textstyle/stdbool.h
%_includedir/textstyle/version.h %_includedir/textstyle/version.h
%_includedir/textstyle/woe32dll.h %_includedir/textstyle/woe32dll.h
%_libdir/libtextstyle.a
%_libdir/libtextstyle.so %_libdir/libtextstyle.so
%_libdir/libtextstyle.so.0 %doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html
%doc %_infodir/libtextstyle.info.gz
%changelog %changelog

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Aug 23 16:56:05 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- 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 <mliska@suse.cz> Thu Jun 20 09:56:30 UTC 2019 - Martin Liška <mliska@suse.cz>

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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} %if 0%{?qemu_user_space_build:1}
OPTS="--disable-openmp" OPTS="--disable-openmp"
%endif %endif
%configure --enable-shared $OPTS %configure --disable-static $OPTS
make %{?_smp_mflags} GMSGFMT=../src/msgfmt V=1 make %{?_smp_mflags} GMSGFMT=../src/msgfmt V=1
# use texinfo.tex supplied by the system (texinfo) # use texinfo.tex supplied by the system (texinfo)
# make -C gettext-tools/doc gettext.pdf # make -C gettext-tools/doc gettext.pdf
@ -179,7 +179,7 @@ make %{?_smp_mflags} GMSGFMT=../src/msgfmt V=1
%install %install
%define my_docdir %{_defaultdocdir}/%{name} %define my_docdir %{_defaultdocdir}/%{name}
export LC_CTYPE=ISO-8859-15 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} cp -pr AUTHORS NEWS README* %{buildroot}/%{my_docdir}
mkdir -p %{buildroot}/usr/share/emacs/site-lisp mkdir -p %{buildroot}/usr/share/emacs/site-lisp
install -m 644 %SOURCE2 %{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 %{buildroot}/usr/share/doc/packages/gettext/README.{mingw,vms,woe32}
rm -f %_datadir/%name/gettext.jar rm -f %_datadir/%name/gettext.jar
rm -f %{buildroot}/%_libdir/libtextstyle.la 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: # hardlink the dupes in the documentation:
cd %{buildroot}/%{my_docdir}/examples cd %{buildroot}/%{my_docdir}/examples
sh %{SOURCE3} sh %{SOURCE3}
@ -232,9 +232,6 @@ make check || {
} }
%endif %endif
%clean
rm -rf %{buildroot}
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -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}/gettext.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz
%post -n libtextstyle0 %post -n libtextstyle0 -p /sbin/ldconfig
ldconfig %postun -n libtextstyle0 -p /sbin/ldconfig
%postun -n libtextstyle0
ldconfig
%post -n libtextstyle-devel
ldconfig
%postun -n libtextstyle-devel
ldconfig
%files -f gettext-runtime.lang %files -f gettext-runtime.lang
%defattr(-,root,root) %defattr(-,root,root)
@ -344,9 +332,7 @@ ldconfig
%files -n libtextstyle0 %files -n libtextstyle0
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libtextstyle.so.0
%doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html
%doc %_infodir/libtextstyle.info.gz
%_libdir/libtextstyle.so.0.0.0 %_libdir/libtextstyle.so.0.0.0
%files -n libtextstyle-devel %files -n libtextstyle-devel
@ -356,8 +342,8 @@ ldconfig
%_includedir/textstyle/stdbool.h %_includedir/textstyle/stdbool.h
%_includedir/textstyle/version.h %_includedir/textstyle/version.h
%_includedir/textstyle/woe32dll.h %_includedir/textstyle/woe32dll.h
%_libdir/libtextstyle.a
%_libdir/libtextstyle.so %_libdir/libtextstyle.so
%_libdir/libtextstyle.so.0 %doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html
%doc %_infodir/libtextstyle.info.gz
%changelog %changelog