[selinux-policy/f17] Add devel package back in separate from -doc

[Daniel J Walsh]

commit 27eb96c95c2c36bd8c1d30ab2036be723f7cee7d
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Fri Mar 30 15:42:12 2012 -0400

    Add devel package back in separate from -doc

 selinux-policy.spec |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 3a5b233..1c9d7ca 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -66,22 +66,16 @@ SELinux Base package
 %ghost %{_sysconfdir}/sysconfig/selinux
 %{_usr}/lib/tmpfiles.d/selinux-policy.conf
 
-%if %{BUILD_DOC}
-%package doc
-Summary: SELinux policy documentation
+%package devel
+Summary: SELinux policy devel
 Group: System Environment/Base
 Requires(pre): selinux-policy = %{version}-%{release}
-Requires: /usr/bin/xdg-open
-Obsoletes: selinux-policy-devel <= %{version}-%{release}
-Provides: selinux-policy-devel = %{version}-%{release}
 
-%description doc
-SELinux policy documentation and man page package
+%description devel
+SELinux policy development and man page package
 
-%files doc
+%files devel
 %defattr(-,root,root,-)
-%doc %{_usr}/share/doc/%{name}-%{version}
-%attr(755,root,root) %{_usr}/share/selinux/devel/policyhelp
 %{_mandir}/man*/*
 %{_mandir}/ru/*/*
 %dir %{_usr}/share/selinux/devel
@@ -89,8 +83,21 @@ SELinux policy documentation and man page package
 %{_usr}/share/selinux/devel/include/*
 %{_usr}/share/selinux/devel/Makefile
 %{_usr}/share/selinux/devel/example.*
+
+%package doc
+Summary: SELinux policy documentation
+Group: System Environment/Base
+Requires(pre): selinux-policy = %{version}-%{release}
+Requires: /usr/bin/xdg-open
+
+%description doc
+SELinux policy documentation package
+
+%files doc
+%defattr(-,root,root,-)
+%doc %{_usr}/share/doc/%{name}-%{version}
+%attr(755,root,root) %{_usr}/share/selinux/devel/policyhelp
 %{_usr}/share/selinux/devel/policy.*
-%endif
 
 %define makeCmds() \
 make UNK_PERMS=%4 NAME=%1 TYPE=%2 DISTRO=%{distro} UBAC=n DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} MLS_CATS=1024 MCS_CATS=1024 bare \
@@ -287,7 +294,6 @@ cp %{SOURCE28} %{buildroot}/%{_usr}/share/selinux/minimum
 %installCmds mls mls n deny
 %endif
 
-%if %{BUILD_DOC}
 mkdir -p %{buildroot}%{_mandir}
 cp -R  man/* %{buildroot}%{_mandir}
 make UNK_PERMS=allow NAME=targeted TYPE=mcs DISTRO=%{distro} UBAC=n DIRECT_INITRC=n MONOLITHIC=%{monolithic} DESTDIR=%{buildroot} PKGNAME=%{name}-%{version} MLS_CATS=1024 MCS_CATS=1024 install-docs
@@ -299,7 +305,6 @@ install -m 644 doc/example.* %{buildroot}%{_usr}/share/selinux/devel/
 install -m 644 doc/policy.* %{buildroot}%{_usr}/share/selinux/devel/
 echo  "xdg-open file:///usr/share/doc/selinux-policy-%{version}/html/index.html"> %{buildroot}%{_usr}/share/selinux/devel/policyhelp
 chmod +x %{buildroot}%{_usr}/share/selinux/devel/policyhelp
-%endif
 
 mkdir %{buildroot}%{_usr}/share/selinux/packages/