From 14350037899a11564cd9143637e8da8ab65cb6bf2f4dc1d3e2eb3eeff08f44f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Thu, 17 Nov 2011 03:38:10 +0000 Subject: [PATCH 1/2] Accepting request 91690 from home:jengelh:branches:devel:libraries:c_c++ - Remove redundant/unwanted tags/section (cf. specfile guidelines) - Use %_smp_mflags for parallel building - Apply shared library packaging (-> libwv-1_2 subpackage) OBS-URL: https://build.opensuse.org/request/show/91690 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/wv?expand=0&rev=7 --- wv.changes | 7 +++++++ wv.spec | 30 ++++++++++++++++++------------ 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/wv.changes b/wv.changes index 5998c7d..f4d1d70 100644 --- a/wv.changes +++ b/wv.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 15 16:14:30 UTC 2011 - jengelh@medozas.de + +- Remove redundant/unwanted tags/section (cf. specfile guidelines) +- Use %_smp_mflags for parallel building +- Apply shared library packaging (-> libwv-1_2 subpackage) + ------------------------------------------------------------------- Tue Nov 15 13:14:56 UTC 2011 - coolo@suse.com diff --git a/wv.spec b/wv.spec index 77f19f3..f5e0b76 100644 --- a/wv.spec +++ b/wv.spec @@ -15,18 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: wv +%define lname libwv-1_2-1 BuildRequires: glib2-devel libgsf-devel libtiff-devel libtool libwmf-devel libxml2-devel pkgconfig License: GPL v2 or later ; LGPL v2.1 or later Group: Productivity/Publishing/Word -AutoReqProv: on Version: 1.2.2 Release: 216 -Summary: Library and Tools for Importing Microsoft Word (tm) Documents -Url: http://wvWare.sourceforge.net/ +Summary: Tools for Importing Microsoft Word (tm) Documents +URL: http://wvWare.sourceforge.net/ Source: wv-%{version}.tar.gz Patch: wv-1.2.2-automake.patch Patch5: wv-1.0.3-wvText.patch @@ -47,12 +46,19 @@ Authors: -------- Caolan McNamara +%package -n %lname +License: LGPL-2.1+ +Summary: Library for importing Microsoft Word documents +Group: System/Libraries + +%description -n %lname +libwv can parse the Microsoft Word 8 binary file format (Office97). + %package devel License: GPL v2 or later -Requires: %{name} = %{version} libgsf-devel libwmf-devel +Requires: %lname = %version, libgsf-devel libwmf-devel Summary: Static Libraries and Header Files for wv Group: Development/Libraries/C and C++ -AutoReqProv: on %description devel Static Libraries and Header Files for wv. @@ -82,12 +88,9 @@ CFLAGS="$RPM_OPT_FLAGS %{warn_flags} -fno-strict-aliasing -fstack-protector" \ make DESTDIR=$RPM_BUILD_ROOT manonedir=%{_mandir}/man1 install rm -f %{buildroot}%{_libdir}/*.la -%clean -rm -rf $RPM_BUILD_ROOT +%post -n %lname -p /sbin/ldconfig -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig %files %defattr(-,root,root) @@ -108,10 +111,13 @@ rm -rf $RPM_BUILD_ROOT /usr/bin/wvWml /usr/bin/wvDocBook /usr/share/wv -%{_libdir}/*.so.* %doc %{_mandir}/*/* %doc COPYING README +%files -n %lname +%defattr(-,root,root) +%_libdir/libwv-1.2.so.1* + %files devel %defattr(-,root,root) %_libdir/pkgconfig/* From 549bb0c56e2567f2d0d033cb1001d3e561ef4ea2542d92e24369077b559dc86e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 22 Nov 2011 15:34:30 +0000 Subject: [PATCH 2/2] Correct License: field and use SPDX format (bnc#731983) OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/wv?expand=0&rev=8 --- wv.changes | 5 +++++ wv.spec | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/wv.changes b/wv.changes index f4d1d70..2756d87 100644 --- a/wv.changes +++ b/wv.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 22 15:34:06 UTC 2011 - jengelh@medozas.de + +- Correct License: field and use SPDX format (bnc#731983) + ------------------------------------------------------------------- Tue Nov 15 16:14:30 UTC 2011 - jengelh@medozas.de diff --git a/wv.spec b/wv.spec index f5e0b76..b948533 100644 --- a/wv.spec +++ b/wv.spec @@ -20,7 +20,7 @@ Name: wv %define lname libwv-1_2-1 BuildRequires: glib2-devel libgsf-devel libtiff-devel libtool libwmf-devel libxml2-devel pkgconfig -License: GPL v2 or later ; LGPL v2.1 or later +License: GPL-2.0+ Group: Productivity/Publishing/Word Version: 1.2.2 Release: 216 @@ -47,7 +47,6 @@ Authors: Caolan McNamara %package -n %lname -License: LGPL-2.1+ Summary: Library for importing Microsoft Word documents Group: System/Libraries @@ -55,7 +54,6 @@ Group: System/Libraries libwv can parse the Microsoft Word 8 binary file format (Office97). %package devel -License: GPL v2 or later Requires: %lname = %version, libgsf-devel libwmf-devel Summary: Static Libraries and Header Files for wv Group: Development/Libraries/C and C++