diff --git a/.gitignore b/.gitignore index 46869e4..3eee980 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /freeipa-3.0.0.pre1.tar.gz /freeipa-3.0.0.pre2.tar.gz /freeipa-3.0.0.rc1.tar.gz +/freeipa-3.0.0.rc2.tar.gz diff --git a/freeipa.spec b/freeipa.spec index e4f3dd0..be0cf95 100644 --- a/freeipa.spec +++ b/freeipa.spec @@ -11,11 +11,11 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif %global POLICYCOREUTILSVER 2.1.12-5 %global gettext_domain ipa -%global VERSION 3.0.0.rc1 +%global VERSION 3.0.0.rc2 Name: freeipa Version: 3.0.0 -Release: 0.9%{?dist} +Release: 0.10%{?dist} Summary: The Identity, Policy and Audit system Group: System Environment/Base @@ -107,12 +107,12 @@ Requires: python-memcached Requires: systemd-units >= 36-3 Requires(pre): systemd-units Requires(post): systemd-units -Requires: selinux-policy >= 3.11.1-21 +Requires: selinux-policy >= 3.11.1-33 Requires(post): selinux-policy-base Requires: slapi-nis >= 0.40 -Requires: pki-ca >= 10.0.0-0.33.a1 -Requires: pki-silent >= 10.0.0-0.33.a1 -Requires: pki-setup >= 10.0.0-0.33.a1 +Requires: pki-ca >= pki-ca-10.0.0-0.43.b1 +Requires: pki-silent >= 10.0.0-0.43.b1 +Requires: pki-setup >= 10.0.0-0.43.b1 # Temporary until dogtag adds their own requires: 09/21/12 Requires: pki-symkey >= 10.0.0-0.33.a1 Requires: tomcat >= 7.0.29 @@ -177,6 +177,25 @@ Requires: libsss_idmap 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. +%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.2.11.15 +Requires: krb5-server = 1.10.3 +Requires: pki-ca = 10.0.0 + +%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. + %endif @@ -341,6 +360,10 @@ mkdir -p %{buildroot}/%{_sysconfdir}/ipa/html mkdir -p %{buildroot}/%{_localstatedir}/cache/ipa/sysrestore mkdir -p %{buildroot}/%{_localstatedir}/cache/ipa/sysupgrade 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 \ @@ -358,7 +381,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 @@ -517,7 +542,22 @@ 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 +%config(noreplace) %{_sysconfdir}/ipa/html/ffconfig.js +%config(noreplace) %{_sysconfdir}/ipa/html/ffconfig_page.js %{_usr}/share/ipa/html/ssbrowser.html %{_usr}/share/ipa/html/browserconfig.html %{_usr}/share/ipa/html/unauthorized.html @@ -559,7 +599,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 @@ -613,6 +655,10 @@ fi %{_mandir}/man1/ipa-adtrust-install.1.gz %{python_sitelib}/ipaserver/dcerpc* %{python_sitelib}/ipaserver/install/adtrustinstance* + +%files server-strict +%defattr(-,root,root,-) +%doc COPYING README Contributors.txt %endif %files client @@ -664,6 +710,14 @@ fi %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt %changelog +* Fri Oct 5 2012 Rob Crittenden - 3.0.0-0.10 +- Updated to upstream 3.0.0 rc 2 +- Include new FF configuration extension +- Set minimum Requires of selinux-policy to 3.11.1-33 +- Set minimum Requires dogtag to 10.0.0-0.43.b1 +- Add new optional strict sub-package to allow users to limit other + package upgrades. + * Tue Oct 2 2012 Martin Kosek - 3.0.0-0.9 - Require samba packages instead of obsoleted samba4 packages diff --git a/sources b/sources index c9b4a45..201f702 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -641a2db26aaccfbdd506b0e420c0a50e freeipa-3.0.0.rc1.tar.gz +59038fa8371d2a0163e52fdd0daaf73e freeipa-3.0.0.rc2.tar.gz