https://issues.shibboleth.net/jira/browse/SSPCPP-187

[shibboleth/cpp-opensaml.git] / opensaml.spec.in

diff --git a/opensaml.spec.in b/opensaml.spec.in
index 8474894..9d0df51 100644 (file)
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -1,17 +1,21 @@
 Name:          opensaml
 Summary:       Open source SAML library
 Version:       @-VERSION-@
-Release:       3
+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
-BuildRequires: xml-security-c-devel >= 1.4.0
-BuildRequires: xmltooling-devel, cxxtest
-%{?_with_log4cpp:BuildRequires: log4cpp-devel >= 0.3.5}
+%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 >= 1.2
+%{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}
 
 %description
@@ -51,11 +55,11 @@ OpenSAML Library API documentation generated by doxygen.
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
-%{__rm} -rf _docs
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
-%{__mv} $RPM_BUILD_ROOT/usr/doc/%{name} _docs
+find $RPM_BUILD_ROOT/%{_bindir} -type f |
+  %{__sed} -e "s|$RPM_BUILD_ROOT||" | sort > rpm.binlist
 
-%check || :
+%check
 %{__make} check
 
 %clean
@@ -69,14 +73,16 @@ OpenSAML Library API documentation generated by doxygen.
 %postun -p /sbin/ldconfig
 %endif
 
-%files
+%files -f rpm.binlist
 %defattr(-,root,root,-)
-%doc _docs/LICENSE.txt _docs/NOTICE.txt
-%{_bindir}/samlsign
 %{_libdir}/libsaml.so.*
 %dir %{_datadir}/xml/%{name}
 %{_datadir}/xml/%{name}
-%exclude %{_bindir}/samltest
+%docdir %{_datadir}/doc/%{name}
+%{_datadir}/doc/%{name}/README.txt
+%{_datadir}/doc/%{name}/LICENSE.txt
+%{_datadir}/doc/%{name}/NOTICE.txt
+%{_datadir}/doc/%{name}/LOG4CPP.LICENSE
 
 %files devel
 %defattr(-,root,root,-)
@@ -85,9 +91,25 @@ OpenSAML Library API documentation generated by doxygen.
 
 %files docs
 %defattr(644,root,root,755)
-%doc _docs/api
+%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.
+
+* Thu Nov 08 2007 Scott Cantor  <cantor.2@osu.edu>  - 2.0-4
+- Second public beta.
+
 * Thu Aug 16 2007 Scott Cantor  <cantor.2@osu.edu>  - 2.0-3
 - First public beta.