X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=opensaml.spec.in;h=f8cbefbd64ac8347c2a537d9f65ab87273141ff4;hp=0adc3d0284c3f2c6cb9b67e35ee3470394af6d62;hb=b64ce0fbcf21c322d9d4f1cc282b29e81ff4ead7;hpb=5262f59d5b476683a193fb19fed29144e0fcddc1

diff --git a/opensaml.spec.in b/opensaml.spec.in
index 0adc3d0..f8cbefb 100644
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -1,18 +1,18 @@
 Name:		opensaml
 Summary:	Open source SAML library
 Version:	@-VERSION-@
-Release:	1
+Release:	6
 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.6.1
-BuildRequires:	xml-security-c-devel >= 1.3.1
-BuildRequires:	log4cpp-devel >= 0.3.5
-BuildRequires:	xmltooling-devel, cxxtest
+BuildRequires:	xerces%{?xercesver}-c-devel >= 2.8.0
+BuildRequires:  xml-security-c-devel >= 1.4.0
+BuildRequires:	xmltooling-devel >= 1.1
+%{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0}
+%{!?_with_log4cpp:BuildRequires: log4shib-devel}
 
 %description
 OpenSAML is an open source implementation of the OASIS Security Assertion
@@ -47,33 +47,38 @@ OpenSAML Library API documentation generated by doxygen.
 
 %build
 %configure %{?saml_options}
-make
+%{__make}
 
 %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
+[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT/%{_bindir} -type f |
+  %{__sed} -e "s|$RPM_BUILD_ROOT||" | sort > rpm.binlist
 
 %check || :
-make check
+%{__make} check
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
+%ifnos solaris2.8 solaris2.9 solaris2.10 
+%post -p /sbin/ldconfig
+%endif
 
-%postun
-/sbin/ldconfig
+%ifnos solaris2.8 solaris2.9 solaris2.10 
+%postun -p /sbin/ldconfig
+%endif
 
-%files
+%files -f rpm.binlist
 %defattr(-,root,root,-)
-%doc _docs/LICENSE.txt _docs/NOTICE.txt
 %{_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,-)
@@ -82,8 +87,26 @@ make check
 
 %files docs
 %defattr(644,root,root,755)
-%doc _docs/api
+%doc %{_datadir}/doc/%{name}/api
 
 %changelog
-* Sun Apr 16 2006  Scott Cantor  <cantor.2@osu.edu>  - 2.0-1
-- First SPEC file for 2.0
+* 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.
+
+* Fri Jul 13 2007  Scott Cantor  <cantor.2@osu.edu>  - 2.0-2
+- Second alpha.
+
+* Sun Apr 16 2007  Scott Cantor  <cantor.2@osu.edu>  - 2.0-1
+- First SPEC file for 2.0.