Macro-ize spec files.

diff --git a/opensaml.spec.in b/opensaml.spec.in
index 1dd9312..8474894 100644 (file)
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -8,8 +8,8 @@ License:        Apache 2.0
 URL:           http://www.opensaml.org/
 Source0:       %{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 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: 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}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}
 BuildRequires: xmltooling-devel, cxxtest
 %{?_with_log4cpp:BuildRequires: log4cpp-devel >= 0.3.5}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}


@@ -47,25 +47,27 @@ OpenSAML Library API documentation generated by doxygen.
 
 %build
 %configure %{?saml_options}
 
 %build
 %configure %{?saml_options}

-make
+%{__make}

 
 %install
 
 %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
+%{__rm} -rf _docs
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__mv} $RPM_BUILD_ROOT/usr/doc/%{name} _docs

 
 %check || :
 
 %check || :

-make check
+%{__make} check

 
 %clean
 
 %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,-)
 
 %files
 %defattr(-,root,root,-)