From 602fa188d8b77e1acd05f8d4ace42dfbd1ebc5d372dc91d901eb5714e8c09a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sun, 11 Mar 2012 21:01:35 +0000 Subject: [PATCH] Accepting request 108815 from home:jengelh:branches:devel:libraries:c_c++ - Nuke unnecessary libunistring binary package: move documentation files to devel subpackage OBS-URL: https://build.opensuse.org/request/show/108815 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libunistring?expand=0&rev=15 --- libunistring.changes | 6 ++++++ libunistring.spec | 47 ++++++++++++++++---------------------------- 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/libunistring.changes b/libunistring.changes index cf73967..2d2f0b0 100644 --- a/libunistring.changes +++ b/libunistring.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Mar 11 19:50:47 UTC 2012 - jengelh@medozas.de + +- Nuke unnecessary libunistring binary package: move documentation + files to devel subpackage + ------------------------------------------------------------------- Mon Jan 30 13:11:15 UTC 2012 - jengelh@medozas.de diff --git a/libunistring.spec b/libunistring.spec index c8747e1..7b9517e 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -14,8 +14,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: libunistring +%define lname libunistring0 Version: 0.9.3 Release: 0 Summary: GNU Unicode string library @@ -24,7 +24,6 @@ Group: Development/Libraries/C and C++ Url: http://www.gnu.org/software/libunistring/ Source0: libunistring-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: info %description This portable C library implements Unicode string types in three flavours: @@ -36,18 +35,21 @@ case folding and regular expressions). %package devel Summary: GNU Unicode string library - development files Group: Development/Libraries/C and C++ -Requires: libunistring0 = %{version} +Requires: %lname = %version +Requires: info +# Obsoletes added in 12.2 +Obsoletes: %name < %version-%release +Provides: %name = %version-%release %description devel Development files for programs using libunistring and documentation for UniString library. -%package -n libunistring0 +%package -n %lname Summary: GNU Unicode string library - development files Group: Development/Libraries/C and C++ -Requires: %{name} -%description -n libunistring0 +%description -n %lname This portable C library implements Unicode string types in three flavours: (UTF-8, UTF-16, UTF-32), together with functions for character processing (names, classifications, properties) and functions for string processing @@ -59,7 +61,7 @@ case folding and regular expressions). %setup -q %build -%configure --disable-static --disable-rpath --docdir=%{_docdir}/%{name} +%configure --disable-static --disable-rpath --docdir=%_docdir/%name make %{?_smp_mflags} %install @@ -70,45 +72,30 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libunistring.la %check %if ! 0%{?qemu_user_space_build} -make check +make check %{?_smp_mflags} %endif -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc %{_docdir}/%{name}/AUTHORS -%doc %{_docdir}/%{name}/NEWS -%doc %{_docdir}/%{name}/README - -%files -n libunistring0 +%files -n %lname %defattr(-,root,root) -%{_libdir}/libunistring.so.* +%{_libdir}/libunistring.so.0* %files devel -%defattr(-,root,root,-) -%dir %{_docdir}/%{name} -%doc %{_docdir}/%{name}/HACKING -%doc %{_docdir}/%{name}/DEPENDENCIES -%doc %{_docdir}/%{name}/THANKS -%doc %{_docdir}/%{name}/ChangeLog -%doc %{_docdir}/%{name}/*.html +%defattr(-,root,root) +%_docdir/%name %{_infodir}/libunistring.info* %{_libdir}/libunistring.so %{_includedir}/unistring %{_includedir}/*.h -%post -n libunistring0 -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig -%postun -n libunistring0 -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig %post devel /sbin/install-info %{_infodir}/libunistring.info.gz %{_infodir}/dir || : %preun devel -if [ $1 = 0 ]; then +if [ "$1" = 0 ]; then /sbin/install-info --delete %{_infodir}/libunistring.info.gz %{_infodir}/dir || : fi