From 6f268a185c86e44d0ffa06160b422a07a396c5d1 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 15 Nov 2007 10:57:26 -0500 Subject: [PATCH] Broke invididual Requires and BuildRequires onto separate lines and reordered them Added python-tgexpandingformwidget as a dependency Require at least fedora-ds-base 1.1 --- ipa-server/freeipa-server.spec | 39 ++++++++++++++++++++++++++----- ipa-server/freeipa-server.spec.in | 39 ++++++++++++++++++++++++++----- 2 files changed, 66 insertions(+), 12 deletions(-) diff --git a/ipa-server/freeipa-server.spec b/ipa-server/freeipa-server.spec index 918e17c3b..847daa005 100755 --- a/ipa-server/freeipa-server.spec +++ b/ipa-server/freeipa-server.spec @@ -1,6 +1,6 @@ Name: freeipa-server Version: 0.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FreeIPA authentication server Group: System Environment/Base @@ -9,10 +9,33 @@ URL: http://www.freeipa.org Source0: %{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: fedora-ds-base-devel openldap-devel krb5-devel nss-devel mozldap-devel openssl-devel +BuildRequires: fedora-ds-base-devel >= 1.1 +BuildRequires: mozldap-devel +BuildRequires: openssl-devel +BuildRequires: openldap-devel +BuildRequires: krb5-devel +BuildRequires: nss-devel -Requires: python fedora-ds-base krb5-server krb5-server-ldap nss-tools openldap-clients httpd mod_python mod_auth_kerb python-ldap freeipa-python ntp cyrus-sasl-gssapi nss TurboGears python-krbV acl freeipa-admintools +Requires: freeipa-python +Requires: freeipa-admintools +Requires: fedora-ds-base >= 1.1 +Requires: openldap-clients +Requires: nss +Requires: nss-tools +Requires: krb5-server +Requires: krb5-server-ldap +Requires: cyrus-sasl-gssapi +Requires: ntp +Requires: httpd +Requires: mod_python +Requires: mod_auth_kerb Requires: mod_nss >= 1.0.7-2 +Requires: python-ldap +Requires: python +Requires: python-krbV +Requires: TurboGears +Requires: python-tgexpandingformwidget +Requires: acl Requires: freeradius >= 1.1.7 %define httpd_conf /etc/httpd/conf.d @@ -61,7 +84,13 @@ rm -rf %{buildroot} %changelog -* Thu Nov 1 2007 Karl MacMillan - 0.4.1-1 +* Thu Nov 15 2007 Rob Crittenden - 0.4.1-2 +- Broke invididual Requires and BuildRequires onto separate lines and + reordered them +- Added python-tgexpandingformwidget as a dependency +- Require at least fedora-ds-base 1.1 + +* Thu Nov 1 2007 Karl MacMillan - 0.4.1-1 - Version bump for release * Wed Oct 31 2007 Karl MacMillan - 0.4.0-6 @@ -98,5 +127,3 @@ rm -rf %{buildroot} * Fri Jul 27 2007 Karl MacMillan - 0.1.0-1 - Initial rpm version - - diff --git a/ipa-server/freeipa-server.spec.in b/ipa-server/freeipa-server.spec.in index d40aaf32a..6c8afcb67 100644 --- a/ipa-server/freeipa-server.spec.in +++ b/ipa-server/freeipa-server.spec.in @@ -1,6 +1,6 @@ Name: freeipa-server Version: VERSION -Release: 1%{?dist} +Release: 2%{?dist} Summary: FreeIPA authentication server Group: System Environment/Base @@ -9,10 +9,33 @@ URL: http://www.freeipa.org Source0: %{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: fedora-ds-base-devel openldap-devel krb5-devel nss-devel mozldap-devel openssl-devel +BuildRequires: fedora-ds-base-devel >= 1.1 +BuildRequires: mozldap-devel +BuildRequires: openssl-devel +BuildRequires: openldap-devel +BuildRequires: krb5-devel +BuildRequires: nss-devel -Requires: python fedora-ds-base krb5-server krb5-server-ldap nss-tools openldap-clients httpd mod_python mod_auth_kerb python-ldap freeipa-python ntp cyrus-sasl-gssapi nss TurboGears python-krbV acl freeipa-admintools rpm +Requires: freeipa-python +Requires: freeipa-admintools +Requires: fedora-ds-base >= 1.1 +Requires: openldap-clients +Requires: nss +Requires: nss-tools +Requires: krb5-server +Requires: krb5-server-ldap +Requires: cyrus-sasl-gssapi +Requires: ntp +Requires: httpd +Requires: mod_python +Requires: mod_auth_kerb Requires: mod_nss >= 1.0.7-2 +Requires: python-ldap +Requires: python +Requires: python-krbV +Requires: TurboGears +Requires: python-tgexpandingformwidget +Requires: acl Requires: freeradius >= 1.1.7 %define httpd_conf /etc/httpd/conf.d @@ -61,7 +84,13 @@ rm -rf %{buildroot} %changelog -* Thu Nov 1 2007 Karl MacMillan - 0.4.1-1 +* Thu Nov 15 2007 Rob Crittenden - 0.4.1-2 +- Broke invididual Requires and BuildRequires onto separate lines and + reordered them +- Added python-tgexpandingformwidget as a dependency +- Require at least fedora-ds-base 1.1 + +* Thu Nov 1 2007 Karl MacMillan - 0.4.1-1 - Version bump for release * Wed Oct 31 2007 Karl MacMillan - 0.4.0-6 @@ -98,5 +127,3 @@ rm -rf %{buildroot} * Fri Jul 27 2007 Karl MacMillan - 0.1.0-1 - Initial rpm version - -