From 3a2a509001243de0a7974b7b0be6d4c1656d8f697b517a2abf62e6f5703e847e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 27 Jun 2016 12:41:54 +0000 Subject: [PATCH] Accepting request 404987 from home:scarabeus_iv:branches:devel:libraries:c_c++ - Use pkgconfig requires - Disable "pretty" make to make it bit faster - Fix the selfobsoleting provides/requires to silence rpmlint - Use valid group for the docs OBS-URL: https://build.opensuse.org/request/show/404987 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/xerces-c?expand=0&rev=24 --- xerces-c.changes | 10 ++++++++++ xerces-c.spec | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/xerces-c.changes b/xerces-c.changes index 2067297..b21eb7c 100644 --- a/xerces-c.changes +++ b/xerces-c.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 27 12:07:47 UTC 2016 - tchvatal@suse.com + +- Use pkgconfig requires +- Disable "pretty" make to make it bit faster +- Fix the selfobsoleting provides/requires to silence rpmlint +- Use valid group for the docs + ------------------------------------------------------------------- Wed Jun 22 14:02:13 UTC 2016 - jengelh@inai.de @@ -5,6 +13,7 @@ Wed Jun 22 14:02:13 UTC 2016 - jengelh@inai.de ------------------------------------------------------------------- Mon Jun 21 11:00:01 CEST 2016 - zawel1@gmail.com + - Update to 3.1.3 * bug fixes + memcpy used on overlapping memory regions causes sanity test failure @@ -83,6 +92,7 @@ Mon Sep 28 16:19:17 UTC 2015 - mpluskal@suse.com + Allow compiling Xerces-C using C++11 (especially Clang) + VS2012 Project +------------------------------------------------------------------- Thu Feb 19 12:39:37 UTC 2015 - mpluskal@suse.com - Use url for source diff --git a/xerces-c.spec b/xerces-c.spec index 7cd795f..30a72cb 100644 --- a/xerces-c.spec +++ b/xerces-c.spec @@ -31,8 +31,8 @@ Source3: baselibs.conf Patch3: %{name}-CVE-2016-2099.patch BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: libicu-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig +BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(libcurl) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,7 +46,7 @@ faithful to the XML 1.0 recommendation and associated standards ( DOM %package doc Summary: Documentation for %{name} -Group: Documentation +Group: Documentation/Other %description doc Xerces-C is a validating XML parser written in a portable subset of @@ -62,7 +62,7 @@ This package contains just documentation. Summary: Shared libraries for Xerces-c - a validating XML parser Group: Productivity/Publishing/XML Provides: Xerces-c = %{version} -Obsoletes: Xerces-c <= %{version} +Obsoletes: Xerces-c < %{version} %description -n libxerces-c-3_1 Xerces-C is a validating XML parser written in a portable subset of @@ -79,9 +79,9 @@ Summary: A validating XML parser - Development Files Group: Development/Libraries/C and C++ Requires: libxerces-c-3_1 = %{version} Provides: Xerces-c-devel = %{version} -Obsoletes: Xerces-c-devel <= %{version} +Obsoletes: Xerces-c-devel < %{version} Provides: libXerces-c-devel = %{version} -Obsoletes: libXerces-c-devel <= %{version} +Obsoletes: libXerces-c-devel < %{version} %description -n libxerces-c-devel Xerces-C is a validating XML parser written in a portable subset of @@ -93,7 +93,7 @@ This package includes files needed for development with Xerces-c %prep %setup -q -n xerces-c-%{version} -%patch3 -p0 +%patch3 %build find . -type d -name .svn -exec rm -Rf "{}" "+" @@ -102,16 +102,16 @@ find . -type d -name .svn -exec rm -Rf "{}" "+" --disable-sse2 \ %endif --enable-netaccessor-curl \ - --disable-static + --disable-static \ + --disable-pretty-make make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +make %{?_smp_mflags} DESTDIR=%{buildroot} install find %{buildroot} -type f -name "*.la" -delete -print %fdupes -s doc %post -n libxerces-c-3_1 -p /sbin/ldconfig - %postun -n libxerces-c-3_1 -p /sbin/ldconfig %files