rpms/selinux-policy/devel selinux-policy.spec,1.663,1.664

[Daniel J Walsh (dwalsh)]

Author: dwalsh

Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20191

Modified Files:
	selinux-policy.spec 
Log Message:
* Fri May 9 2008 Dan Walsh <dwalsh at redhat.com> 3.4.1-1
- Merge Upstream



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.663
retrieving revision 1.664
diff -u -r1.663 -r1.664
--- selinux-policy.spec	2 Jun 2008 17:10:33 -0000	1.663
+++ selinux-policy.spec	2 Jun 2008 18:56:05 -0000	1.664
@@ -42,6 +42,9 @@
 BuildArch: noarch
 BuildRequires: python gawk checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER}
 Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER} libsemanage >= 2.0.14-3
+Requires: checkpolicy >= %{CHECKPOLICYVER} m4 
+Obsoletes: selinux-policy-devel
+Provides: selinux-policy-devel
 
 %description 
 SELinux Base package
@@ -50,22 +53,11 @@
 %{_mandir}/*
 %doc %{_usr}/share/doc/%{name}-%{version}
 %dir %{_usr}/share/selinux
+%dir %{_usr}/share/selinux/devel
+%dir %{_usr}/share/selinux/devel/include
 %dir %{_sysconfdir}/selinux
 %ghost %config(noreplace) %{_sysconfdir}/selinux/config
 %ghost %{_sysconfdir}/sysconfig/selinux
-
-%package devel
-Summary: SELinux policy development
-Group: System Environment/Base
-Requires: checkpolicy >= %{CHECKPOLICYVER} m4 
-Requires: selinux-policy = %{version}-%{release} policycoreutils >= %{POLICYCOREUTILSVER}
-
-%description devel
-SELinux Policy development package
-
-%files devel
-%dir %{_usr}/share/selinux/devel
-%dir %{_usr}/share/selinux/devel/include
 %{_usr}/share/selinux/devel/include/*
 %{_usr}/share/selinux/devel/Makefile
 %{_usr}/share/selinux/devel/policygentool
@@ -73,13 +65,9 @@
 %{_usr}/share/selinux/devel/policy.*
 %attr(755,root,root) %{_usr}/share/selinux/devel/policyhelp
 
-%check devel
+%check
 /usr/bin/sepolgen-ifgen -i %{buildroot}%{_usr}/share/selinux/devel/include -o /dev/null
 
-%post devel
-[ -x /usr/bin/sepolgen-ifgen ] && /usr/bin/sepolgen-ifgen 
-exit 0
-
 %define setupCmds() \
 make UNK_PERMS=%5 NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 MLS_CATS=1024 MCS_CATS=1024 bare \
 make UNK_PERMS=%5 NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 MLS_CATS=1024 MCS_CATS=1024  conf \
@@ -257,6 +245,8 @@
 	grep -q "^SETLOCALDEFS" /etc/selinux/config || echo -n "
 ">> /etc/selinux/config
 fi
+[ -x /usr/bin/sepolgen-ifgen ] && /usr/bin/sepolgen-ifgen 
+exit 0
 
 %postun
 if [ $1 = 0 ]; then