X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=opensaml.spec.in;h=9d0df516fe7f110f4eb69dc8ce7436a79f8b01d5;hp=e4f7554f09cd184c7634391e936a2d76d97c1c61;hb=07dbbcf3a8fc0aba6fefe741f1760442a0a6ea65;hpb=9feb31702e26a76de7030d712d61c2312aa168a8

diff --git a/opensaml.spec.in b/opensaml.spec.in
index e4f7554..9d0df51 100644
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -1,16 +1,20 @@
 Name:		opensaml
 Summary:	Open source SAML library
 Version:	@-VERSION-@
-Release:	6
+Release:	1
 Group:		System Environment/Libraries
 Vendor:		Internet2
 License:	Apache 2.0
 URL:		http://www.opensaml.org/
 Source0:	%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	xerces%{?xercesver}-c-devel >= 2.8.0
+%if 0%{?suse_version} > 1030
+BuildRequires:  libXerces-c-devel >= 2.8.0
+%else
+BuildRequires:  xerces%{?xercesver}-c-devel >= 2.8.0
+%endif
 BuildRequires:  xml-security-c-devel >= 1.4.0
-BuildRequires:	xmltooling-devel
+BuildRequires:	xmltooling-devel >= 1.2
 %{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}
 
@@ -55,7 +59,7 @@ OpenSAML Library API documentation generated by doxygen.
 find $RPM_BUILD_ROOT/%{_bindir} -type f |
   %{__sed} -e "s|$RPM_BUILD_ROOT||" | sort > rpm.binlist
 
-%check || :
+%check
 %{__make} check
 
 %clean
@@ -75,6 +79,7 @@ find $RPM_BUILD_ROOT/%{_bindir} -type f |
 %dir %{_datadir}/xml/%{name}
 %{_datadir}/xml/%{name}
 %docdir %{_datadir}/doc/%{name}
+%{_datadir}/doc/%{name}/README.txt
 %{_datadir}/doc/%{name}/LICENSE.txt
 %{_datadir}/doc/%{name}/NOTICE.txt
 %{_datadir}/doc/%{name}/LOG4CPP.LICENSE
@@ -89,6 +94,16 @@ find $RPM_BUILD_ROOT/%{_bindir} -type f |
 %doc %{_datadir}/doc/%{name}/api
 
 %changelog
+* Wed Dec 3 2008  Scott Cantor  <cantor.2@osu.edu>  - 2.2-1
+- Bumping for minor update.
+- Fixing SUSE Xerces dependency name.
+
+* Tue Jul 1 2008  Scott Cantor  <cantor.2@osu.edu>  - 2.1-1
+- Bumping for minor update.
+
+* Mon Mar 17 2008  Scott Cantor  <cantor.2@osu.edu>  - 2.0-6
+- Official release.
+
 * Fri Jan 18 2008  Scott Cantor  <cantor.2@osu.edu>  - 2.0-5
 - Release candidate 1.