[freeipa/f17] Update to upstream 2.2.1 - Include new Firefox extension files - Add Requires in server to zip

[Martin Kosek]

commit 8536e7f8ec17cb8c91656a0433ef9249cd5096d6
Author: Martin Kosek <mkosek at redhat.com>
Date:   Tue Oct 23 11:08:22 2012 +0200

    Update to upstream 2.2.1
    - Include new Firefox extension files
    - Add Requires in server to zip

 .gitignore                                   |    1 +
 freeipa-3.0-Fixed-boot.ldif-permission.patch |   41 --------------------------
 freeipa.spec                                 |   37 ++++++++++++++++++++---
 sources                                      |    2 +-
 4 files changed, 34 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c4f326e..163b2d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /freeipa-2.1.90.pre1.tar.gz
 /freeipa-2.1.90.rc1.tar.gz
 /freeipa-2.2.0.tar.gz
+/freeipa-2.2.1.tar.gz
diff --git a/freeipa.spec b/freeipa.spec
index 9d4366a..955ad75 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -13,8 +13,8 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %global gettext_domain ipa
 
 Name:           freeipa
-Version:        2.2.0
-Release:        2%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
@@ -23,8 +23,6 @@ URL:            http://www.freeipa.org/
 Source0:        http://www.freeipa.org/downloads/src/freeipa-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch01:        freeipa-3.0-Fixed-boot.ldif-permission.patch
-
 %if ! %{ONLY_CLIENT}
 BuildRequires:  389-ds-base-devel >= 1.2.10.4
 BuildRequires:  svrcore-devel
@@ -112,6 +110,8 @@ Requires: subscription-manager
 %endif
 Requires(preun): python systemd-units
 Requires(postun): python systemd-units
+Requires: zip
+
 
 # We have a soft-requires on bind. It is an optional part of
 # IPA but if it is configured we need a way to require versions
@@ -226,7 +226,6 @@ package.
 
 %prep
 %setup -n freeipa-%{version} -q
-%patch01 -p1
 
 %build
 export CFLAGS="$CFLAGS %{optflags}"
@@ -283,6 +282,10 @@ rm %{buildroot}/%{_libdir}/krb5/plugins/kdb/ipadb.la
 mkdir -p %{buildroot}/%{_sysconfdir}/ipa/html
 mkdir -p %{buildroot}/%{_localstatedir}/cache/ipa/sysrestore
 mkdir %{buildroot}%{_usr}/share/ipa/html/
+ln -s ../../../..%{_sysconfdir}/ipa/html/ffconfig.js \
+    %{buildroot}%{_usr}/share/ipa/html/ffconfig.js
+ln -s ../../../..%{_sysconfdir}/ipa/html/ffconfig_page.js \
+    %{buildroot}%{_usr}/share/ipa/html/ffconfig_page.js
 ln -s ../../../..%{_sysconfdir}/ipa/html/ssbrowser.html \
     %{buildroot}%{_usr}/share/ipa/html/ssbrowser.html
 ln -s ../../../..%{_sysconfdir}/ipa/html/unauthorized.html \
@@ -300,7 +303,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
 mkdir -p %{buildroot}%{_usr}/share/ipa/html/
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/ca.crt
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/configure.jar
+/bin/touch %{buildroot}%{_usr}/share/ipa/html/kerberosauth.xpi
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.con
+/bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.js
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con
 /bin/touch %{buildroot}%{_usr}/share/ipa/html/preferences.html
@@ -451,7 +456,20 @@ fi
 %{_usr}/share/ipa/*.ldif
 %{_usr}/share/ipa/*.uldif
 %{_usr}/share/ipa/*.template
+%dir %{_usr}/share/ipa/ffextension
+%{_usr}/share/ipa/ffextension/bootstrap.js
+%{_usr}/share/ipa/ffextension/install.rdf
+%{_usr}/share/ipa/ffextension/chrome.manifest
+%dir %{_usr}/share/ipa/ffextension/chrome
+%dir %{_usr}/share/ipa/ffextension/chrome/content
+%{_usr}/share/ipa/ffextension/chrome/content/kerberosauth.js
+%{_usr}/share/ipa/ffextension/chrome/content/kerberosauth_overlay.xul
+%dir %{_usr}/share/ipa/ffextension/locale
+%dir %{_usr}/share/ipa/ffextension/locale/en-US
+%{_usr}/share/ipa/ffextension/locale/en-US/kerberosauth.properties
 %dir %{_usr}/share/ipa/html
+%{_usr}/share/ipa/html/ffconfig.js
+%{_usr}/share/ipa/html/ffconfig_page.js
 %{_usr}/share/ipa/html/ssbrowser.html
 %{_usr}/share/ipa/html/browserconfig.html
 %{_usr}/share/ipa/html/unauthorized.html
@@ -479,6 +497,8 @@ fi
 %{_usr}/share/ipa/ui/images/*.gif
 %dir %{_sysconfdir}/ipa
 %dir %{_sysconfdir}/ipa/html
+%config(noreplace) %{_sysconfdir}/ipa/html/ffconfig.js
+%config(noreplace) %{_sysconfdir}/ipa/html/ffconfig_page.js
 %config(noreplace) %{_sysconfdir}/ipa/html/ssbrowser.html
 %config(noreplace) %{_sysconfdir}/ipa/html/ipa_error.css
 %config(noreplace) %{_sysconfdir}/ipa/html/unauthorized.html
@@ -491,7 +511,9 @@ fi
 %{_usr}/share/ipa/ipa-pki-proxy.conf
 %ghost %attr(0644,root,apache) %config(noreplace) %{_usr}/share/ipa/html/ca.crt
 %ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/configure.jar
+%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/kerberosauth.xpi
 %ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb.con
+%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb.js
 %ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb5.ini
 %ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krbrealm.con
 %ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/preferences.html
@@ -580,6 +602,11 @@ fi
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
 
 %changelog
+* Tue Oct 23 2012 Martin Kosek <mkosek at redhat.com> - 2.2.1-1
+- Updated to upstream 2.2.1 GA
+- Include new Firefox extension files
+- Add Requires in server to zip
+
 * Wed Oct 10 2012 Simo Sorce <simo at redhat.com> - 2.2.0-2
 - Add patch to fix permission issue on re-install
 
diff --git a/sources b/sources
index c9aae2f..f29439c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c4195a6af15ade58e6d3add054dd8004  freeipa-2.2.0.tar.gz
+64e96c29d81ca67bd3c28112d37bd690  freeipa-2.2.1.tar.gz