From cd5a4d5c1e54ee40d08664dacbcfb9ffcc4b2a2ba505f1cc06b8ad7cbb866a5f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 24 Jan 2012 10:07:54 +0000 Subject: [PATCH 1/2] Remove redundant tags, parallel build, SPDX, rpm groups OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libwpg?expand=0&rev=9 --- libwpg.changes | 8 ++++++++ libwpg.spec | 16 +++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/libwpg.changes b/libwpg.changes index 860eaf1..db527a7 100644 --- a/libwpg.changes +++ b/libwpg.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jan 24 09:40:42 UTC 2012 - jengelh@medozas.de + +- Remove redundant tags/sections (see specfile guidelines) +- SPDX-style license field +- Parallel build with %_smp_mflags +- Adjust rpm group of -tools and (main) to match libwpd + ------------------------------------------------------------------- Mon Jan 23 18:06:20 UTC 2012 - crrodriguez@opensuse.org diff --git a/libwpg.spec b/libwpg.spec index 904c866..4657b80 100644 --- a/libwpg.spec +++ b/libwpg.spec @@ -30,7 +30,7 @@ Summary: Library to read and parse graphics in WordPerfect Graphics forma Version: 0.2.1 Release: 0 License: LGPL-2.1+ -Group: System/Libraries +Group: Productivity/Publishing/Word Url: http://libwpg.sourceforge.net/ Source: libwpg-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -51,9 +51,9 @@ Authors: Fridrich Strba (fridrich.strba@bluewin.ch) Ariya Hidayat (ariya@kde.org) -%package -n libwpg-0_2-2 %define libname libwpg-0_2-2 -License: LGPL-2.1+ + +%package -n %libname # remove the old non-versioned package (built in the bs for instance) Obsoletes: libwpg < %version Summary: Library to read and parse graphics in WordPerfect Graphics format @@ -64,7 +64,6 @@ libwpg is a C++ library to read and parse graphics in WPG (WordPerfect Graphics) format. %package devel -License: LGPL-2.1+ Summary: Files for Developing with libwpg Group: Development/Libraries/C and C++ Provides: libwpg-devel = %version-%release @@ -89,7 +88,6 @@ Authors: %if %build_doc %package devel-doc -License: LGPL-2.1+ Summary: Documentation for the libwpg API Group: Documentation/HTML @@ -108,9 +106,8 @@ Authors: %endif %package tools -License: LGPL-2.1+ Summary: Tools for converting WordPerfect Graphics files -Group: System/Libraries +Group: Productivity/Publishing/Word %description tools Tools to work with graphics in WPG (WordPerfect Graphics) format. @@ -131,7 +128,7 @@ Authors: %build export CXXFLAGS="%optflags -fvisibility-inlines-hidden" %configure --disable-static --docdir=%_docdir/%name -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install @@ -140,9 +137,6 @@ rm $RPM_BUILD_ROOT%_libdir/*.la mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} cp -p AUTHORS COPYING ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name} -%clean -rm -rf $RPM_BUILD_ROOT - %post -n %libname -p /sbin/ldconfig %postun -n %libname -p /sbin/ldconfig From 59798ae3d2d1b1f153af2b8129578616a2637c2427d2ec465447b5a034b8da23 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 29 Jan 2012 22:08:05 +0000 Subject: [PATCH 2/2] Remove redundant tags/sections OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libwpg?expand=0&rev=12 --- libwpg.spec | 47 +++++------------------------------------------ 1 file changed, 5 insertions(+), 42 deletions(-) diff --git a/libwpg.spec b/libwpg.spec index 4657b80..010c1ec 100644 --- a/libwpg.spec +++ b/libwpg.spec @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: libwpg # note: the main package is empty, it only sets a sane name for the source rpm %if 0%{?suse_version} > 1020 @@ -25,32 +23,24 @@ BuildRequires: doxygen %else %define build_doc 0 %endif -BuildRequires: gcc-c++ libwpd-devel >= 0.9.0 pkgconfig +BuildRequires: gcc-c++ +BuildRequires: libwpd-devel >= 0.9.0 +BuildRequires: pkgconfig Summary: Library to read and parse graphics in WordPerfect Graphics format -Version: 0.2.1 -Release: 0 License: LGPL-2.1+ Group: Productivity/Publishing/Word +Version: 0.2.1 +Release: 0 Url: http://libwpg.sourceforge.net/ Source: libwpg-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: libwpg-nodatetime.patch -%define debug_package_requires libwpg-0_2-2 = %{version}-%{release} %description libwpg is a C++ library to read and parse graphics in WPG (WordPerfect Graphics) format. It is cross-platform, at the moment it can be build on Microsoft Windows and Linux. - - -Authors: --------- - Marc Oude Kotte (marc@solcon.nl) - Marc Maurer (uwog@uwog.net) - Fridrich Strba (fridrich.strba@bluewin.ch) - Ariya Hidayat (ariya@kde.org) - %define libname libwpg-0_2-2 %package -n %libname @@ -76,15 +66,6 @@ on Microsoft Windows and Linux. This package contains the libwpg development files. - - -Authors: --------- - Marc Oude Kotte (marc@solcon.nl) - Marc Maurer (uwog@uwog.net) - Fridrich Strba (fridrich.strba@bluewin.ch) - Ariya Hidayat (ariya@kde.org) - %if %build_doc %package devel-doc @@ -94,15 +75,6 @@ Group: Documentation/HTML %description devel-doc This package contains documentation for the libwpg API. - - -Authors: --------- - Marc Oude Kotte (marc@solcon.nl) - Marc Maurer (uwog@uwog.net) - Fridrich Strba (fridrich.strba@bluewin.ch) - Ariya Hidayat (ariya@kde.org) - %endif %package tools @@ -112,15 +84,6 @@ Group: Productivity/Publishing/Word %description tools Tools to work with graphics in WPG (WordPerfect Graphics) format. - - -Authors: --------- - Marc Oude Kotte (marc@solcon.nl) - Marc Maurer (uwog@uwog.net) - Fridrich Strba (fridrich.strba@bluewin.ch) - Ariya Hidayat (ariya@kde.org) - %prep %setup -q %patch0