X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=opensaml.spec.in;h=845210ad13e067a3d3ab85f3e36ca6dce44355dc;hb=f7f9d18169254074945d0886bf23fe3d57a97fe5;hp=d590e8f08dfd5fc5bca2978ecdc88f477f723608;hpb=9ed6a1981ce22b52d39e9c1e020122619b573e30;p=shibboleth%2Fcpp-opensaml.git

diff --git a/opensaml.spec.in b/opensaml.spec.in
index d590e8f..845210a 100644
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -1,5 +1,5 @@
-Name:		opensaml
-Version:	@-VERSION-@
+Name:		@PACKAGE@
+Version:	@PACKAGE_VERSION@
 Release:	1
 Summary:    OpenSAML SAML library
 Group:		System Environment/Libraries
@@ -11,18 +11,21 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 %if 0%{?suse_version} > 1030
 BuildRequires:  libXerces-c-devel >= 2.8.0
 BuildRequires:  libxml-security-c-devel >= 1.4.0
-BuildRequires:  libxmltooling-devel >= 1.2
+BuildRequires:  libxmltooling-devel >= 1.3
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel}
 %else
 BuildRequires:  xerces%{?xercesver}-c-devel >= 2.8.0
 BuildRequires:  xml-security-c-devel >= 1.4.0
-BuildRequires:  xmltooling-devel >= 1.2
+BuildRequires:  xmltooling-devel >= 1.3
 %{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}
 %endif
 BuildRequires:  gcc-c++
 %{!?_without_doxygen:BuildRequires: doxygen}
+%if "%{_vendor}" == "redhat"
+BuildRequires: redhat-rpm-config
+%endif
 
 %if "%{_vendor}" == "suse"
 %define pkgdocdir %{_docdir}/%{name}
@@ -36,12 +39,12 @@ Markup Language Specification. It contains a set of open source C++ classes
 that support the SAML 1.0, 1.1, and 2.0 specifications.
 
 %if 0%{?suse_version} > 1030
-%package -n libsaml22
+%package -n libsaml6
 Summary:    OpenSAML SAML library
 Group:      Development/Libraries
-Provides:   opensaml = %{version}
+Provides:   @PACKAGE@ = %{version}
 
-%description -n libsaml22
+%description -n libsaml6
 OpenSAML is an open source implementation of the OASIS Security Assertion
 Markup Language Specification. It contains a set of open source C++ classes
 that support the SAML 1.0, 1.1, and 2.0 specifications.
@@ -51,7 +54,7 @@ This package contains just the shared library.
 
 %if 0%{?suse_version} > 1030
 %package -n libsaml-devel
-Requires: libsaml22 = %version
+Requires: libsaml6 = %version
 %else
 %package devel
 Requires: %name = %version
@@ -61,13 +64,13 @@ Group: Development/Libraries
 %if 0%{?suse_version} > 1030
 Requires: libXerces-c-devel >= 2.8.0
 Requires: libxml-security-c-devel >= 1.4.0
-Requires: libxmltooling-devel >= 1.2
+Requires: libxmltooling-devel >= 1.3
 %{?_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
-Requires: xmltooling-devel >= 1.2
+Requires: xmltooling-devel >= 1.3
 %{?_with_log4cpp:Requires: log4cpp-devel >= 1.0}
 %{!?_with_log4cpp:Requires: log4shib-devel}
 %endif
@@ -81,7 +84,7 @@ OpenSAML is an open source implementation of the OASIS Security Assertion
 Markup Language Specification. It contains a set of open source C++ classes
 that support the SAML 1.0, 1.1, and 2.0 specifications.
 
-This package includes files needed for development with opensaml.
+This package includes files needed for development with OpenSAML.
 
 
 %prep
@@ -104,7 +107,7 @@ This package includes files needed for development with opensaml.
 
 %ifnos solaris2.8 solaris2.9 solaris2.10
 %if 0%{?suse_version} > 1030
-%post -n libsaml22 -p /sbin/ldconfig
+%post -n libsaml6 -p /sbin/ldconfig
 %else
 %post -p /sbin/ldconfig
 %endif
@@ -112,7 +115,7 @@ This package includes files needed for development with opensaml.
 
 %ifnos solaris2.8 solaris2.9 solaris2.10
 %if 0%{?suse_version} > 1030
-%postun -n libsaml22 -p /sbin/ldconfig
+%postun -n libsaml6 -p /sbin/ldconfig
 %else
 %postun -p /sbin/ldconfig
 %endif
@@ -122,12 +125,12 @@ This package includes files needed for development with opensaml.
 %defattr(-,root,root,-)
 %{_bindir}/samlsign
 %if 0%{?suse_version} > 1030
-%files -n libsaml22
+%files -n libsaml6
 %defattr(-,root,root,-)
 %endif
 %{_libdir}/libsaml.so.*
-%dir %{_datadir}/xml/%{name}
-%{_datadir}/xml/%{name}
+%dir %{_datadir}/xml/@PACKAGE@
+%{_datadir}/xml/@PACKAGE@/*
 
 %if 0%{?suse_version} > 1030
 %files -n libsaml-devel
@@ -140,6 +143,9 @@ This package includes files needed for development with opensaml.
 %doc %{pkgdocdir}
 
 %changelog
+* Mon Aug 31 2009   Scott Cantor  <cantor.2@osu.edu>  - 2.3-1
+- Bump soname for SUSE packaging.
+
 * Sat Aug 8 2009  Scott Cantor  <cantor.2@osu.edu>  - 2.2.1-1
 - SuSE conventions
 - Stop packaging unit tester