summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl MacMillan <kmacmillan@mentalrootkit.com>2007-08-10 07:31:29 -0400
committerKarl MacMillan <kmacmillan@mentalrootkit.com>2007-08-10 07:31:29 -0400
commit0d981af82098f14e5b9e1677be80f6553f90417d (patch)
treef561823640934842b945d64adcd9ac11c95755d7
parentcdaee95230322744be0a254b57832c5a35be4ca2 (diff)
downloadfreeipa-0d981af82098f14e5b9e1677be80f6553f90417d.tar.gz
freeipa-0d981af82098f14e5b9e1677be80f6553f90417d.tar.xz
freeipa-0d981af82098f14e5b9e1677be80f6553f90417d.zip
Various build system fixes.
-rw-r--r--Makefile2
-rwxr-xr-xipa-admintools/freeipa-admintools.spec2
-rwxr-xr-xipa-admintools/freeipa-admintools.spec.in2
-rwxr-xr-xipa-server/freeipa-server.spec2
-rw-r--r--ipa-server/freeipa-server.spec.in2
5 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 7068ec1d0..8a7f79092 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ tarballs:
rpm-ipa-server:
cp dist/$(SERV_TARBALL) ~/rpmbuild/SOURCES/.
rpmbuild -ba ipa-server/freeipa-server.spec
- cp ~/rpmbuild/RPMS/noarch/$(PRJ_PREFIX)-server-$(SERV_VERSION)-*.rpm dist/.
+ cp ~/rpmbuild/RPMS/*/$(PRJ_PREFIX)-server-$(SERV_VERSION)-*.rpm dist/.
cp ~/rpmbuild/SRPMS/$(PRJ_PREFIX)-server-$(SERV_VERSION)-*.src.rpm dist/.
rpm-ipa-admin:
diff --git a/ipa-admintools/freeipa-admintools.spec b/ipa-admintools/freeipa-admintools.spec
index 904a3b693..b7a9a5044 100755
--- a/ipa-admintools/freeipa-admintools.spec
+++ b/ipa-admintools/freeipa-admintools.spec
@@ -1,5 +1,5 @@
Name: freeipa-admintools
-Version: 0.1.0
+Version: 0.2.0
Release: 3%{?dist}
Summary: FreeIPA authentication server
diff --git a/ipa-admintools/freeipa-admintools.spec.in b/ipa-admintools/freeipa-admintools.spec.in
index 904a3b693..71d68bc6e 100755
--- a/ipa-admintools/freeipa-admintools.spec.in
+++ b/ipa-admintools/freeipa-admintools.spec.in
@@ -1,5 +1,5 @@
Name: freeipa-admintools
-Version: 0.1.0
+Version: VERSION
Release: 3%{?dist}
Summary: FreeIPA authentication server
diff --git a/ipa-server/freeipa-server.spec b/ipa-server/freeipa-server.spec
index cfd11d5ab..2da36a96a 100755
--- a/ipa-server/freeipa-server.spec
+++ b/ipa-server/freeipa-server.spec
@@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: fedora-ds-base-devel openldap-devel krb5-devel nss-devel mozldap-devel openssl-devel mhash-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 ntpd cyrus-sasl-gssapi nss
+Requires: python fedora-ds-base krb5-server krb5-server-ldap nss-tools openldap-clients httpd mod_python mod_auth_kerb python-ldap freeipa-python ntpd cyrus-sasl-gssapi nss TurboGears
%define httpd_conf /etc/httpd/conf.d
%define plugin_dir /usr/lib/fedora-ds/plugins
diff --git a/ipa-server/freeipa-server.spec.in b/ipa-server/freeipa-server.spec.in
index 025c986b5..aa75917da 100644
--- a/ipa-server/freeipa-server.spec.in
+++ b/ipa-server/freeipa-server.spec.in
@@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: fedora-ds-base-devel openldap-devel krb5-devel nss-devel mozldap-devel openssl-devel mhash-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 ntpd cyrus-sasl-gssapi nss
+Requires: python fedora-ds-base krb5-server krb5-server-ldap nss-tools openldap-clients httpd mod_python mod_auth_kerb python-ldap freeipa-python ntpd cyrus-sasl-gssapi nss TurboGears
%define httpd_conf /etc/httpd/conf.d
%define plugin_dir /usr/lib/fedora-ds/plugins