From 0e5758d02ea9e70c498f48d287e8a26c48150711 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Wed, 4 Sep 2013 11:12:30 -0400
Subject: RPM: Add new subpackage for PAC responder

It was discovered that duplicating files in two subpackages is not
permitted by Fedora packaging guidelines[1]. This patch moves the PAC
responder to a new sssd-common-pac subpackage that both the sssd-ipa
and sssd-ad subpackages will require.

[1] https://fedoraproject.org/wiki/Packaging:Guidelines?rd=Packaging/Guidelines#DuplicateFiles
---
 contrib/sssd.spec.in | 39 +++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 217625a3a..3b6c2596f 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -59,6 +59,7 @@ Requires: sssd-common = %{version}-%{release}
 Requires: sssd-ldap = %{version}-%{release}
 Requires: sssd-krb5 = %{version}-%{release}
 Requires: sssd-ipa = %{version}-%{release}
+Requires: sssd-common-pac = %{version}-%{release}
 Requires: sssd-ad = %{version}-%{release}
 Requires: sssd-proxy = %{version}-%{release}
 Requires: python-sssdconfig = %{version}-%{release}
@@ -243,6 +244,19 @@ Requires: sssd-krb5-common = %{version}-%{release}
 Provides the Kerberos back end that the SSSD can utilize authenticate
 against a Kerberos server.
 
+# RHEL 5 is too old to support the PAC responder
+%if !0%{?is_rhel5}
+%package common-pac
+Summary: Common files needed for supporting PAC processing
+Group: Applications/System
+License: GPLv3+
+Requires: sssd-common = %{version}-%{release}
+
+%description common-pac
+Provides common files needed by SSSD providers such as IPA and Active Directory
+for handling Kerberos PACs.
+%endif #is_rhel5
+
 %package ipa
 Summary: The IPA back end of the SSSD
 Group: Applications/System
@@ -252,6 +266,10 @@ Requires: sssd-common = %{version}-%{release}
 Requires: sssd-krb5-common = %{version}-%{release}
 Requires: libipa_hbac = %{version}-%{release}
 Requires: bind-utils
+# RHEL 5 is too old to support the PAC responder
+%if !0%{?is_rhel5}
+Requires: sssd-common-pac = %{version}-%{release}
+%endif
 
 %description ipa
 Provides the IPA back end that the SSSD can utilize to fetch identity data
@@ -265,6 +283,10 @@ Conflicts: sssd < %{version}-%{release}
 Requires: sssd-common = %{version}-%{release}
 Requires: sssd-krb5-common = %{version}-%{release}
 Requires: bind-utils
+# RHEL 5 is too old to support the PAC responder
+%if !0%{?is_rhel5}
+Requires: sssd-common-pac = %{version}-%{release}
+%endif
 
 %description ad
 Provides the Active Directory back end that the SSSD can utilize to fetch
@@ -582,26 +604,27 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/libsss_krb5.so
 %{_mandir}/man5/sssd-krb5.5*
 
+# RHEL 5 is too old to support the PAC responder
+%if !0%{?is_rhel5}
+%files common-pac
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libexecdir}/%{servicename}/sssd_pac
+%endif
+
+
 %files ipa -f sssd_ipa.lang
 %defattr(-,root,root,-)
 %doc COPYING
 %attr(755,root,root) %dir %{pubconfpath}/krb5.include.d
 %{_libdir}/%{name}/libsss_ipa.so
 %{_mandir}/man5/sssd-ipa.5*
-# RHEL 5 is too old to support the PAC responder
-%if !0%{?is_rhel5}
-%{_libexecdir}/%{servicename}/sssd_pac
-%endif
 
 %files ad -f sssd_ad.lang
 %defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/%{name}/libsss_ad.so
 %{_mandir}/man5/sssd-ad.5*
-# RHEL 5 is too old to support the PAC responder
-%if !0%{?is_rhel5}
-%{_libexecdir}/%{servicename}/sssd_pac
-%endif
 
 %files proxy
 %defattr(-,root,root,-)
-- 
cgit