From 31b7e7e4a8ca0e86d9103e7c232f44d9e597e56a486f5f2e98e32d2fae36a23b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 28 Jan 2012 22:28:08 +0000 Subject: [PATCH] resolve merge conflict OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/xerces-c?expand=0&rev=8 --- ready | 0 xerces-c.changes | 7 +++++++ xerces-c.spec | 34 +++++----------------------------- 3 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 ready diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/xerces-c.changes b/xerces-c.changes index c7ca3bb..c0f2efd 100644 --- a/xerces-c.changes +++ b/xerces-c.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Jan 28 22:15:56 UTC 2012 - jengelh@medozas.de + +- Remove redundant tags/sections per specfile guideline suggestions +- Parallel building using %_smp_mflags +- Restore missing pkgconfig provides + ------------------------------------------------------------------- Wed Oct 7 15:04:42 CEST 2009 - prusnak@suse.cz diff --git a/xerces-c.spec b/xerces-c.spec index 0ec85e8..99d4645 100644 --- a/xerces-c.spec +++ b/xerces-c.spec @@ -1,7 +1,7 @@ # -# spec file for package xerces-c (Version 3.0.1) +# spec file for package xerces-c # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,12 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: xerces-c -BuildRequires: gcc-c++ libicu-devel -License: Apache Software License .. +BuildRequires: gcc-c++ libicu-devel pkgconfig +License: Apache-2.0 Group: Productivity/Publishing/XML Version: 3.0.1 Release: 4 @@ -39,14 +38,7 @@ generating, manipulating, and validating XML documents. Xerces-C is faithful to the XML 1.0 recommendation and associated standards ( DOM 1.0, DOM 2.0. SAX 1.0, SAX 2.0, Namespaces). - - -Authors: --------- - The Apache Group - %package -n libxerces-c-3_0 -License: Apache Software License .. Group: Productivity/Publishing/XML Summary: Shared libraries for Xerces-c - a validating XML parser Provides: Xerces-c = %{version} @@ -62,14 +54,7 @@ faithful to the XML 1.0 recommendation and associated standards ( DOM This package contains just the shared libraries. - - -Authors: --------- - The Apache Group - %package -n libxerces-c-devel -License: Apache Software License .. Requires: libxerces-c-3_0 = %{version} Provides: Xerces-c-devel = %{version} Obsoletes: Xerces-c-devel <= %{version} @@ -86,12 +71,6 @@ generating, manipulating, and validating XML documents. This package includes files needed for development with Xerces-c - - -Authors: --------- - The Apache Group - %prep %setup -q -n xerces-c-%{version} %patch0 @@ -100,15 +79,12 @@ Authors: %build %configure \ --disable-static -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -%clean -rm -rf $RPM_BUILD_ROOT - %post -n libxerces-c-3_0 -p /sbin/ldconfig %postun -n libxerces-c-3_0 -p /sbin/ldconfig