rpms/viewvc/FC-6 viewvc.spec,1.1,1.2

[Bojan Smojver (bojan)]

Author: bojan

Update of /cvs/extras/rpms/viewvc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20598

Modified Files:
	viewvc.spec 
Log Message:
Drop selinux package, required context now in official policy.



Index: viewvc.spec
===================================================================
RCS file: /cvs/extras/rpms/viewvc/FC-6/viewvc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- viewvc.spec	9 Mar 2007 03:48:43 -0000	1.1
+++ viewvc.spec	28 Mar 2007 07:51:14 -0000	1.2
@@ -17,7 +17,7 @@
 
 Name:           viewvc
 Version:        1.0.3
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -28,6 +28,9 @@
 Patch0:         viewvc-temp-location.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Obsoletes:      %{name}-selinux < 1.0.3-11
+Conflicts:      selinux-policy < 2.4.6-46
+
 BuildArch:      noarch
 BuildRequires:  python-devel >= 2.0
 Requires:       mod_python, rcs, diffutils
@@ -50,16 +53,6 @@
 This version only supports CVS repositories.
 %endif
 
-%package selinux
-Summary:          SElinux file contexts for ViewVC
-Group:            Development/Tools
-Requires:         %{name} = %{version}-%{release}
-Requires(post):   policycoreutils
-Requires(postun): policycoreutils
-
-%description selinux
-SELinux file contexts for ViewVC
-
 %prep
 %setup -q
 %patch0 -p0 -b .temp-location
@@ -124,18 +117,6 @@
 %clean
 %{__rm} -rf %{buildroot}
 
-%post selinux
-# Set SELinux file context in the policy
-/usr/sbin/semanage fcontext -a -t httpd_sys_script_rw_t '%{_localstatedir}/spool/viewvc(/.*)?' 2>/dev/null || :
-# Actually change the context
-/sbin/restorecon -R %{_localstatedir}/spool/viewvc || :
-
-%postun selinux
-# SELinux support
-if [ $1 -eq 0 ]; then  # final removal
-  /usr/sbin/semanage fcontext -d -t httpd_sys_script_rw_t '%{_localstatedir}/spool/viewvc(/.*)?' 2>/dev/null || :
-fi
-
 %files
 %defattr(-, root, root, -)
 %doc CHANGES README INSTALL TODO COMMITTERS viewvc.org www
@@ -145,9 +126,12 @@
 %{_datadir}/*
 %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
 
-%files selinux
-
 %changelog
+* Wed Mar 28 2007 Bojan Smojver <bojan at rexursive.com> - 1.0.3-11
+- Drop selinux package, required context now in official policy
+- Supply obsoletes/conflicts
+  (suggestions by Peter Gordon, Bernard Johnson and Ville Skyttä)
+
 * Tue Mar 06 2007 Bojan Smojver <bojan at rexursive.com> - 1.0.3-10
 - Enable enscript only when available