Name: xmltooling
Summary: Open source XMLTooling library
Version: @-VERSION-@
-Release: 2
+Release: 3
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: openssl-devel log4cpp-devel >= 0.3.5, cxxtest
+BuildRequires: xml-security-c-devel >= 1.4.0
+BuildRequires: openssl-devel, cxxtest
+%{?_with_log4cpp:BuildRequires: log4cpp-devel >= 0.3.5}
+%{!?_with_log4cpp:BuildRequires: log4shib-devel}
%description
The XMLTooling library contains generic XML parsing and processing
%build
%configure %{?xmltooling_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/xmltooling _docs
+[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
%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
%defattr(-,root,root,-)
-%doc _docs/LICENSE.txt _docs/NOTICE.txt
%{_libdir}/libxmltooling.so.*
%{_libdir}/libxmltooling-lite.so.*
%dir %{_datadir}/xml/xmltooling
%{_datadir}/xml/xmltooling
%exclude %{_bindir}/xmltoolingtest
+%docdir %{_datadir}/doc/xmltooling
+%{_datadir}/doc/xmltooling/LICENSE.txt
+%{_datadir}/doc/xmltooling/NOTICE.txt
+%{_datadir}/doc/xmltooling/CURL.LICENSE
+%{_datadir}/doc/xmltooling/LOG4CPP.LICENSE
+%{_datadir}/doc/xmltooling/OPENSSL.LICENSE
%files devel
%defattr(-,root,root,-)
%files docs
%defattr(644,root,root,755)
-%doc _docs/api
+%doc %{_datadir}/doc/xmltooling/api
%changelog
+* Thu Aug 16 2007 Scott Cantor <cantor.2@osu.edu> - 1.0-3
+- First public beta.
+
* Fri Jul 13 2007 Scott Cantor <cantor.2@osu.edu> - 1.0-2
- Second alpha.