Re: [Freeipa-devel] [PATCH] 334 Add requires for new dogtag10 and its server theme
On 11/15/2012 01:09 PM, Petr Viktorin wrote: On 11/15/2012 12:04 PM, Martin Kosek wrote: On 11/15/2012 11:01 AM, Petr Viktorin wrote: On 11/14/2012 05:16 PM, Martin Kosek wrote: On 11/14/2012 05:05 PM, Martin Kosek wrote: On 11/14/2012 02:41 PM, Rob Crittenden wrote: Martin Kosek wrote: Remove redundant pki-* package Requires and change PKI server theme Requires to correct package name. https://fedorahosted.org/freeipa/ticket/3213 --- The patch fixes broken Requires with the new server theme package name (thanks Ade for help): # rpm -q pki-ca pki-ca-10.0.0-0.52.b3.fc18.noarch # rpm -qa *pki-*-theme dogtag-pki-server-theme-10.0.0-0.7.b3.fc18.noarch [root@vm-104 freeipa-3.0.1-1.fc18]# rpm -Uvh --force freeipa-* error: Failed dependencies: dogtag-pki-common-theme is needed by freeipa-server-3.0.1-1.fc18.x86_64 This patch is intended for Fedora 18 only, of course. Martin ACK As discussed on IRC, I made the Requires conditional for Fedora 18 only so that we do not break environment for people still developing on Fedora 17 (like me). I also took the opportunity to do some clean ups of compatibility code for old Fedora 16 and older. Details are in the patch description. When/if this patch is accepted, Petr Viktorin's patch 0098 should go in too as we now require the affected pki-ca version on Fedora 18. Martin Since we are now touching tar, I also added it to BuildRequires. I think it bit me once when I built FreeIPA on some super-minimal Fedora compose. That should not be necessary, see https://fedoraproject.org/wiki/Packaging:Guidelines#Exceptions_2 I assume the thing that bit you was grepping the .spec.in for the BuildRequires, but that shouldn't be a reason to change our spec. You are right, this is exactly what I did. Attaching a previous version of the patch, without BuildRequires tar. Martin Please also mention removing tomcat6 for F18+ in the %changelog and commit message. Then, it's an ACK. Fixed. Pushed to master, ipa-3-0 (with a small rebase). Martin ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
[Freeipa-devel] [PATCH] 334 Add requires for new dogtag10 and its server theme
Remove redundant pki-* package Requires and change PKI server theme
Requires to correct package name.
https://fedorahosted.org/freeipa/ticket/3213
---
The patch fixes broken Requires with the new server theme package name (thanks
Ade for help):
# rpm -q pki-ca
pki-ca-10.0.0-0.52.b3.fc18.noarch
# rpm -qa *pki-*-theme
dogtag-pki-server-theme-10.0.0-0.7.b3.fc18.noarch
[root@vm-104 freeipa-3.0.1-1.fc18]# rpm -Uvh --force freeipa-*
error: Failed dependencies:
dogtag-pki-common-theme is needed by freeipa-server-3.0.1-1.fc18.x86_64
This patch is intended for Fedora 18 only, of course.
Martin
From c8741e8b37ccd3c5954176aa06ac46a9045e1a70 Mon Sep 17 00:00:00 2001
From: Martin Kosek mko...@redhat.com
Date: Wed, 14 Nov 2012 09:23:53 +0100
Subject: [PATCH] Add requires for new dogtag10 and its server theme
Remove redundant pki-* package Requires and change PKI server theme
Requires to correct package name.
https://fedorahosted.org/freeipa/ticket/3213
---
freeipa.spec.in | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 3f446032360a37d6aeb55c287eea2c0cd088bf31..e7f32ced351d042d478e841ac514a5e71cd3aa4f 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -149,11 +149,8 @@ Requires: selinux-policy = 3.9.7-27
%endif
Requires(post): selinux-policy-base
Requires: slapi-nis = 0.40
-Requires: pki-ca = 9.0.18
-Requires: pki-silent = 9.0.18
-Requires: pki-setup = 9.0.18
-Requires: dogtag-pki-common-theme
-Requires: dogtag-pki-ca-theme
+Requires: pki-ca = 10.0.0-0.52.b3
+Requires: dogtag-pki-server-theme
%if 0%{?fedora} = 18
Requires: tomcat6 = 6.0.35-4
%else
@@ -829,6 +826,9 @@ fi
%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
%changelog
+* Wed Nov 14 2012 Martin Kosek mko...@redhat.com - 3.0.99-4
+- Add Requires for the new Dogtag 10 and dogtag-pki-server-theme
+
* Fri Nov 09 2012 Martin Kosek mko...@redhat.com - 3.0.99-3
- Set min for bind-dyndb-ldap to 2.3-2 to pick up disabling global
forwarder per-zone
--
1.7.11.7
___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] 334 Add requires for new dogtag10 and its server theme
Martin Kosek wrote: Remove redundant pki-* package Requires and change PKI server theme Requires to correct package name. https://fedorahosted.org/freeipa/ticket/3213 --- The patch fixes broken Requires with the new server theme package name (thanks Ade for help): # rpm -q pki-ca pki-ca-10.0.0-0.52.b3.fc18.noarch # rpm -qa *pki-*-theme dogtag-pki-server-theme-10.0.0-0.7.b3.fc18.noarch [root@vm-104 freeipa-3.0.1-1.fc18]# rpm -Uvh --force freeipa-* error: Failed dependencies: dogtag-pki-common-theme is needed by freeipa-server-3.0.1-1.fc18.x86_64 This patch is intended for Fedora 18 only, of course. Martin ACK ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] 334 Add requires for new dogtag10 and its server theme
On 11/14/2012 02:41 PM, Rob Crittenden wrote:
Martin Kosek wrote:
Remove redundant pki-* package Requires and change PKI server theme
Requires to correct package name.
https://fedorahosted.org/freeipa/ticket/3213
---
The patch fixes broken Requires with the new server theme package name
(thanks
Ade for help):
# rpm -q pki-ca
pki-ca-10.0.0-0.52.b3.fc18.noarch
# rpm -qa *pki-*-theme
dogtag-pki-server-theme-10.0.0-0.7.b3.fc18.noarch
[root@vm-104 freeipa-3.0.1-1.fc18]# rpm -Uvh --force freeipa-*
error: Failed dependencies:
dogtag-pki-common-theme is needed by freeipa-server-3.0.1-1.fc18.x86_64
This patch is intended for Fedora 18 only, of course.
Martin
ACK
As discussed on IRC, I made the Requires conditional for Fedora 18 only so that
we do not break environment for people still developing on Fedora 17 (like me).
I also took the opportunity to do some clean ups of compatibility code for old
Fedora 16 and older. Details are in the patch description.
When/if this patch is accepted, Petr Viktorin's patch 0098 should go in too as
we now require the affected pki-ca version on Fedora 18.
Martin
From fde10189528ec108a85c4df283fb687abaeca6cb Mon Sep 17 00:00:00 2001
From: Martin Kosek mko...@redhat.com
Date: Wed, 14 Nov 2012 16:45:41 +0100
Subject: [PATCH] Prepare spec file for Fedora 18
FreeIPA 3.0 is being released to Fedora 18 only. Since we only support
Fedora 17 and Fedora 18 in FreeIPA 3.0+, compatibility code for older
Fedoras can be dropped. This should clean up the spec file and make it
more readable.
Dogtag10 Requires were fixed. Without this patch, there is a conflict
on dogtag-pki-common-theme.
Tar requirement was added to avoid crashes in ipa-replica-prepare on
some minimal Fedora composes.
https://fedorahosted.org/freeipa/ticket/2748
https://fedorahosted.org/freeipa/ticket/3237
---
freeipa.spec.in | 185 +++-
1 file changed, 48 insertions(+), 137 deletions(-)
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 3f446032360a37d6aeb55c287eea2c0cd088bf31..fc00245b77ac56fc2d220e01a56cdbcbfdcbcec2 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -3,12 +3,7 @@
%global httpd_conf /etc/httpd/conf.d
%global plugin_dir %{_libdir}/dirsrv/plugins
-%if ! (0%{?fedora} 12 || 0%{?rhel} 5)
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c from
-distutils.sysconfig import get_python_lib; print(get_python_lib()))}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c from
-distutils.sysconfig import get_python_lib; print(get_python_lib(1)))}
-%endif
+
%global POLICYCOREUTILSVER 1.33.12-1
%global gettext_domain ipa
@@ -28,9 +23,7 @@ BuildRequires: 389-ds-base-devel = 1.2.11.14
BuildRequires: svrcore-devel
BuildRequires: /usr/share/selinux/devel/Makefile
BuildRequires: policycoreutils = %{POLICYCOREUTILSVER}
-%if 0%{?fedora} = 16
BuildRequires: systemd-units
-%endif
%if 0%{?fedora} = 18
BuildRequires: samba-devel = 4.0.0-150
BuildRequires: samba-python
@@ -41,7 +34,7 @@ BuildRequires: samba4-python
%endif
BuildRequires: libtalloc-devel
BuildRequires: libtevent-devel
-%endif
+%endif # ! %{ONLY_CLIENT}
BuildRequires: nspr-devel
BuildRequires: nss-devel
BuildRequires: openssl-devel
@@ -49,18 +42,8 @@ BuildRequires: openldap-devel
BuildRequires: krb5-devel = 1.10
BuildRequires: krb5-workstation
BuildRequires: libuuid-devel
-%if 0%{?fedora} = 16
BuildRequires: libcurl-devel = 7.21.7-2
BuildRequires: xmlrpc-c-devel = 1.27.4
-%else
-%if 0%{?fedora} == 15
-BuildRequires: libcurl-devel = 7.21.3-9
-BuildRequires: xmlrpc-c-devel = 1.25.4
-%else
-BuildRequires: libcurl-devel
-BuildRequires: xmlrpc-c-devel
-%endif
-%endif
BuildRequires: popt-devel
BuildRequires: autoconf
BuildRequires: automake
@@ -72,11 +55,7 @@ BuildRequires: python-ldap
BuildRequires: python-setuptools
BuildRequires: python-krbV
BuildRequires: python-nss
-%if 0%{?fedora} = 15
-BuildRequires: python-netaddr = 0.7.5-3
-%else
BuildRequires: python-netaddr
-%endif
BuildRequires: python-kerberos
BuildRequires: python-rhsm
BuildRequires: pyOpenSSL
@@ -89,7 +68,7 @@ BuildRequires: python-lxml
BuildRequires: python-pyasn1 = 0.0.9a
BuildRequires: python-dns
BuildRequires: python-crypto
-BuildRequires: check = 0.9.5
+BuildRequires: check
BuildRequires: libsss_idmap-devel
%description
@@ -122,60 +101,40 @@ Requires: mod_auth_kerb = 5.4-16
%else
Requires: mod_auth_kerb = 5.4-8
%endif
-Requires: mod_nss = 1.0.8-10
+Requires: mod_nss
Requires: python-ldap
Requires: python-krbV
Requires: acl
-Requires: python-pyasn1 = 0.0.9a
+Requires: python-pyasn1
Requires: memcached
Requires: python-memcached
-%if 0%{?fedora} = 16
Requires: systemd-units = 36-3
Requires(pre): systemd-units
Requires(post): systemd-units
-%endif
-%if 0%{?fedora} = 17
Requires: selinux-policy = 3.10.0-110
-%else
-%if 0%{?fedora} == 16
-Requires: selinux-policy = 3.10.0-78
-%else
-%if 0%{?fedora} ==
