From 1aec1ac2f53c102c592c1854bbccd63acfc5f211 Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pviktori@redhat.com>
Date: Aug 29 2013 15:41:58 +0000
Subject: Bring back Fedora-only changes


---

diff --git a/freeipa.spec b/freeipa.spec
index 4097107..cfc09c9 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -2,13 +2,13 @@
 %{!?ONLY_CLIENT:%global ONLY_CLIENT 0}
 
 %global plugin_dir %{_libdir}/dirsrv/plugins
-%global POLICYCOREUTILSVER 2.1.12-5
+%global POLICYCOREUTILSVER 2.1.14-37
 %global gettext_domain ipa
 %global VERSION 3.3.1
 
 Name:           freeipa
 Version:        3.3.1
-Release:        0%{?dist}
+Release:        1%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -214,6 +214,29 @@ Cross-realm trusts with Active Directory in IPA require working Samba 4
 installation. This package is provided for convenience to install all required
 dependencies at once.
 
+%if 0%{?fedora} == 19
+# Fedora spec file only: START
+%package server-strict
+Summary: Strict package dependencies
+Group: System Environment/Base
+Requires(post): %{name}-server = %{version}-%{release}
+Requires(postun): %{name}-server = %{version}-%{release}
+
+# Specific requires
+Requires(pre): 389-ds-base = 1.3.1.3
+Requires: krb5-server = 1.11.3
+Requires: pki-ca = 10.0.4
+
+%description server-strict
+IPA is an integrated solution to provide centrally managed Identity (machine,
+user, virtual machines, groups, authentication credentials), Policy
+(configuration settings, access control information) and Audit (events,
+logs, analysis thereof). This meta package adds strict version dependencies
+to known working versions. To upgrade to a non-approved version uninstall
+this package.
+# Fedora spec file only: END
+%endif
+
 %endif # ONLY_CLIENT
 
 
@@ -318,7 +341,27 @@ This package contains tests that verify IPA functionality.
 
 
 %prep
-%setup -n freeipa-%{version} -q
+# Fedora spec file only: START
+# Update timestamps on the files touched by a patch, to avoid non-equal
+# .pyc/.pyo files across the multilib peers within a build, where "Level"
+# is the patch prefix option (e.g. -p1)
+# Taken from specfile for sssd and python-simplejson
+UpdateTimestamps() {
+  Level=$1
+  PatchFile=$2
+
+  # Locate the affected files:
+  for f in $(diffstat $Level -l $PatchFile); do
+    # Set the files to have the same timestamp as that of the patch:
+    touch -r $PatchFile $f
+  done
+}
+
+for p in %patches ; do
+    %__patch -p1 -i $p
+    UpdateTimestamps -p1 $p
+done
+# Fedora spec file only: END
 
 %build
 export CFLAGS="$CFLAGS %{optflags}"
@@ -754,6 +797,14 @@ fi
 %{python_sitelib}/ipaserver/dcerpc*
 %{python_sitelib}/ipaserver/install/adtrustinstance*
 %ghost %{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
+
+%if 0%{?fedora} == 19
+# Fedora spec file only: START
+%files server-strict
+%defattr(-,root,root,-)
+%doc COPYING README Contributors.txt
+# Fedora spec file only: END
+%endif
 %endif # ONLY_CLIENT
 
 %files client
@@ -837,6 +888,9 @@ fi
 %endif # ONLY_CLIENT
 
 %changelog
+* Thu Aug 29 2013 Petr Viktorin <pviktori@redhat.com> - 3.3.1-1
+- Bring back Fedora-only changes
+
 * Thu Aug 29 2013 Petr Viktorin <pviktori@redhat.com> - 3.3.1-0
 - Update to upstream 3.3.1