From 72d2f7cf37708af867be9a7974700947018c713a Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Thu, 6 Aug 2009 20:06:51 +0000 Subject: [PATCH] Remove lib prefix macro, incompatible with SuSE build service. --- xmltooling.spec.in | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/xmltooling.spec.in b/xmltooling.spec.in index db333f8..6d0087d 100644 --- a/xmltooling.spec.in +++ b/xmltooling.spec.in @@ -9,16 +9,17 @@ URL: http://www.opensaml.org/ Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root %if 0%{?suse_version} > 1030 -%define libpkgprefix lib BuildRequires: libXerces-c-devel >= 2.8.0 +BuildRequires: libxml-security-c-devel >= 1.4.0 +%{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0} +%{!?_with_log4cpp:BuildRequires: liblog4shib-devel} %else -%define libpkgprefix BuildRequires: xerces%{?xercesver}-c-devel >= 2.8.0 +BuildRequires: xml-security-c-devel >= 1.4.0 +%{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0} +%{!?_with_log4cpp:BuildRequires: log4shib-devel} %endif -BuildRequires: %{libpkgprefix}xml-security-c-devel >= 1.4.0 BuildRequires: gcc-c++, openssl-devel, curl-devel >= 7.10.6 -%{?_with_log4cpp:BuildRequires: %{libpkgprefix}log4cpp-devel >= 1.0} -%{!?_with_log4cpp:BuildRequires: %{libpkgprefix}log4shib-devel} %if "%{_vendor}" == "suse" %define pkgdocdir %{_docdir}/%{name} @@ -60,13 +61,16 @@ Summary: XMLTooling development Headers Group: Development/Libraries %if 0%{?suse_version} > 1030 Requires: libXerces-c-devel >= 2.8.0 +Requires: libxml-security-c-devel >= 1.4.0 +%{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0} +%{!?_with_log4cpp:Requires: liblog4shib-devel} %else Requires: xerces%{?xercesver}-c-devel >= 2.8.0 +Requires: xml-security-c-devel >= 1.4.0 +%{?_with_log4cpp:Requires: log4cpp-devel >= 1.0} +%{!?_with_log4cpp:Requires: log4shib-devel} %endif -Requires: %{libpkgprefix}xml-security-c-devel >= 1.4.0 Requires: openssl-devel, curl-devel >= 7.10.6 -%{?_with_log4cpp:Requires: %{libpkgprefix}log4cpp-devel >= 1.0} -%{!?_with_log4cpp:Requires: %{libpkgprefix}log4shib-devel} %if 0%{?suse_version} > 1030 %description -n libxmltooling-devel -- 2.1.4