Removing logdir reference.

[shibboleth/sp.git] / shibboleth.spec.in

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 3f46530..96e5392 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -12,7 +12,7 @@ BuildRoot:    %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: openssl-devel, curl-devel >= 7.10.6, xerces-c-devel >= 2.6.1
 BuildRequires: xml-security-c-devel >= 1.1.0, log4cpp-devel >= 0.3.5
-BuildRequires: zlib-devel, opensaml-devel >= 1.1.0, httpd-devel
+BuildRequires: zlib-devel, opensaml-devel >= 1.1, httpd-devel
 
 %description
 Shibboleth, a project of Internet2/MACE, is developing architectures,
@@ -40,12 +40,12 @@ education community.
 This package contains the headers and other necessary files to build
 applications that use the shibboleth library.
 
-%package selinux-targeted-policy
-Summary: SELinux targeted policy configuration for Shibboleth SP
+%package selinux-policy-targeted
+Summary: SELinux policy targeted configuration for Shibboleth SP
 Group: System Environment/Base
-Requires: selinux-targeted-policy-source
+Requires: selinux-policy-targeted-sources
 
-%description selinux-targeted-policy
+%description selinux-policy-targeted
 Shibboleth, a project of Internet2/MACE, is developing architectures,
 policy structures, practical technologies, and an open source
 implementation to support inter-institutional sharing of web resources
@@ -55,8 +55,9 @@ education community.
 
 This package contains the SELinux Policy (source) Configuration to
 enable the Shibboleth SP to integrate into Apache HTTPD in Red Hat /
-Fedora's Targeted Policy SELinux implementation.  It requires
-rebuilding your policy, so you must have the policy-source installed.
+Fedora's Policy Targeted SELinux implementation.  It requires
+rebuilding your policy, so you must have the policy-targeted-source
+installed.
 
 %prep
 %setup -q
@@ -100,12 +101,13 @@ cp -p %{_sysconfdir}/shibboleth/apache2.config \
 [ -f %{_sysconfdir}/httpd/conf.d/shib.conf ] && \
     rm -f %{_sysconfdir}/httpd/conf.d/shib.conf
 
-%triggerin selinux-targeted-policy -- %{name}
+%triggerin selinux-policy-targeted -- %{name}
 restorecon %{_sbindir}/shibd
 
-%triggerin selinux-targeted-policy -- selinux-targeted-policy-source
-cd %{_sysconfdir}/selinux/src/policy || exit 1
-make -W load
+%triggerin selinux-policy-targeted -- selinux-policy-targeted-sources
+cd %{_sysconfdir}/selinux/targeted/src/policy || exit 1
+make -W install
+make load
 
 %files -f rpm.filelist
 %defattr(-,root,root,-)
@@ -139,10 +141,10 @@ make -W load
 %{_libdir}/libshib.so
 %{_libdir}/libshib-target.so
 
-%files selinux-targeted-policy
+%files selinux-policy-targeted
 %defattr(-,root,root,-)
 %{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/*.fc
-%{_sysconfdir}/selinux/targeted/src/policy/domain/program/*.te
+%{_sysconfdir}/selinux/targeted/src/policy/domains/program/*.te
 
 %changelog
 * Sun Apr 24 2005  Scott Cantor  <cantor.2@osu.edu>  - 1.3-1