diff options
-rw-r--r-- | Makefile | 42 | ||||
-rwxr-xr-x | ipa-admintools/ipa-admintools.spec (renamed from ipa-admintools/freeipa-admintools.spec) | 11 | ||||
-rwxr-xr-x | ipa-admintools/ipa-admintools.spec.in (renamed from ipa-admintools/freeipa-admintools.spec.in) | 11 | ||||
-rwxr-xr-x | ipa-client/ipa-client.spec (renamed from ipa-client/freeipa-client.spec) | 11 | ||||
-rw-r--r-- | ipa-client/ipa-client.spec.in (renamed from ipa-client/freeipa-client.spec.in) | 11 | ||||
-rwxr-xr-x | ipa-python/ipa-python.spec (renamed from ipa-python/freeipa-python.spec) | 9 | ||||
-rwxr-xr-x | ipa-python/ipa-python.spec.in (renamed from ipa-python/freeipa-python.spec.in) | 9 | ||||
-rwxr-xr-x | ipa-server/ipa-server.spec (renamed from ipa-server/freeipa-server.spec) | 13 | ||||
-rw-r--r-- | ipa-server/ipa-server.spec.in (renamed from ipa-server/freeipa-server.spec.in) | 13 |
9 files changed, 77 insertions, 53 deletions
@@ -1,6 +1,6 @@ SUBDIRS=ipa-server ipa-admintools ipa-python ipa-client -PRJ_PREFIX=freeipa +PRJ_PREFIX=ipa RPMBUILD ?= $(PWD)/rpmbuild @@ -65,56 +65,56 @@ test: done version-update: - sed s/VERSION/$(SERV_VERSION)/ ipa-server/freeipa-server.spec.in \ - > ipa-server/freeipa-server.spec + sed s/VERSION/$(SERV_VERSION)/ ipa-server/ipa-server.spec.in \ + > ipa-server/ipa-server.spec - sed s/VERSION/$(ADMIN_VERSION)/ ipa-admintools/freeipa-admintools.spec.in \ - > ipa-admintools/freeipa-admintools.spec + sed s/VERSION/$(ADMIN_VERSION)/ ipa-admintools/ipa-admintools.spec.in \ + > ipa-admintools/ipa-admintools.spec - sed s/VERSION/$(PYTHON_VERSION)/ ipa-python/freeipa-python.spec.in \ - > ipa-python/freeipa-python.spec + sed s/VERSION/$(PYTHON_VERSION)/ ipa-python/ipa-python.spec.in \ + > ipa-python/ipa-python.spec - sed s/VERSION/$(CLI_VERSION)/ ipa-client/freeipa-client.spec.in \ - > ipa-client/freeipa-client.spec + sed s/VERSION/$(CLI_VERSION)/ ipa-client/ipa-client.spec.in \ + > ipa-client/ipa-client.spec archive: -mkdir -p dist - hg archive -t files dist/freeipa + hg archive -t files dist/ipa local-archive: - -mkdir -p dist/freeipa + -mkdir -p dist/ipa @for subdir in $(SUBDIRS); do \ - cp -pr $$subdir dist/freeipa/.; \ + cp -pr $$subdir dist/ipa/.; \ done archive-cleanup: - rm -fr dist/freeipa + rm -fr dist/ipa tarballs: -mkdir -p dist/sources # ipa-server - mv dist/freeipa/ipa-server dist/$(SERV_TARBALL_PREFIX) + mv dist/ipa/ipa-server dist/$(SERV_TARBALL_PREFIX) rm -f dist/sources/$(SERV_TARBALL) cd dist/$(SERV_TARBALL_PREFIX); ./autogen.sh; make distclean cd dist; tar cfz sources/$(SERV_TARBALL) $(SERV_TARBALL_PREFIX) rm -fr dist/$(SERV_TARBALL_PREFIX) # ipa-admintools - mv dist/freeipa/ipa-admintools dist/$(ADMIN_TARBALL_PREFIX) + mv dist/ipa/ipa-admintools dist/$(ADMIN_TARBALL_PREFIX) rm -f dist/sources/$(ADMIN_TARBALL) cd dist; tar cfz sources/$(ADMIN_TARBALL) $(ADMIN_TARBALL_PREFIX) rm -fr dist/$(ADMIN_TARBALL_PREFIX) # ipa-python - mv dist/freeipa/ipa-python dist/$(PYTHON_TARBALL_PREFIX) + mv dist/ipa/ipa-python dist/$(PYTHON_TARBALL_PREFIX) rm -f dist/sources/$(PYTHON_TARBALL) cd dist; tar cfz sources/$(PYTHON_TARBALL) $(PYTHON_TARBALL_PREFIX) rm -fr dist/$(PYTHON_TARBALL_PREFIX) # ipa-client - mv dist/freeipa/ipa-client dist/$(CLI_TARBALL_PREFIX) + mv dist/ipa/ipa-client dist/$(CLI_TARBALL_PREFIX) rm -f dist/sources/$(CLI_TARBALL) cd dist/$(CLI_TARBALL_PREFIX); ./autogen.sh; make distclean cd dist; tar cfz sources/$(CLI_TARBALL) $(CLI_TARBALL_PREFIX) @@ -133,25 +133,25 @@ rpmdistdir: rpm-ipa-server: cp dist/sources/$(SERV_TARBALL) $(RPMBUILD)/SOURCES/. - rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa-server/freeipa-server.spec + rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa-server/ipa-server.spec cp rpmbuild/RPMS/*/$(PRJ_PREFIX)-server-$(SERV_VERSION)-*.rpm dist/rpms/ cp rpmbuild/SRPMS/$(PRJ_PREFIX)-server-$(SERV_VERSION)-*.src.rpm dist/srpms/ rpm-ipa-admin: cp dist/sources/$(ADMIN_TARBALL) $(RPMBUILD)/SOURCES/. - rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa-admintools/freeipa-admintools.spec + rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa-admintools/ipa-admintools.spec cp rpmbuild/RPMS/noarch/$(PRJ_PREFIX)-admintools-$(ADMIN_VERSION)-*.rpm dist/rpms/ cp rpmbuild/SRPMS/$(PRJ_PREFIX)-admintools-$(ADMIN_VERSION)-*.src.rpm dist/srpms/ rpm-ipa-python: cp dist/sources/$(PYTHON_TARBALL) $(RPMBUILD)/SOURCES/. - rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa-python/freeipa-python.spec + rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa-python/ipa-python.spec cp rpmbuild/RPMS/noarch/$(PRJ_PREFIX)-python-$(PYTHON_VERSION)-*.rpm dist/rpms/ cp rpmbuild/SRPMS/$(PRJ_PREFIX)-python-$(PYTHON_VERSION)-*.src.rpm dist/srpms/ rpm-ipa-client: cp dist/sources/$(CLI_TARBALL) $(RPMBUILD)/SOURCES/. - rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa-client/freeipa-client.spec + rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa-client/ipa-client.spec cp rpmbuild/RPMS/*/$(PRJ_PREFIX)-client-$(CLI_VERSION)-*.rpm dist/rpms/ cp rpmbuild/SRPMS/$(PRJ_PREFIX)-client-$(CLI_VERSION)-*.src.rpm dist/srpms/ diff --git a/ipa-admintools/freeipa-admintools.spec b/ipa-admintools/ipa-admintools.spec index ad7e20194..24c83e6cd 100755 --- a/ipa-admintools/freeipa-admintools.spec +++ b/ipa-admintools/ipa-admintools.spec @@ -1,7 +1,7 @@ -Name: freeipa-admintools +Name: ipa-admintools Version: 0.5.0 Release: 1%{?dist} -Summary: FreeIPA authentication server +Summary: IPA authentication server Group: System Environment/Base License: GPL @@ -10,10 +10,10 @@ Source0: %{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python python-krbV freeipa-python +Requires: python python-krbV ipa-python %description -FreeIPA is a server for identity, policy, and audit. +IPA is a server for identity, policy, and audit. %prep %setup -q @@ -35,6 +35,9 @@ rm -rf %{buildroot} %{_mandir}/man1/* %changelog +* Wed Nov 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1 +- Version bump for release and rpm name change + * Thu Nov 1 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.1-1 - Version bump for release diff --git a/ipa-admintools/freeipa-admintools.spec.in b/ipa-admintools/ipa-admintools.spec.in index ec731a645..4b444882e 100755 --- a/ipa-admintools/freeipa-admintools.spec.in +++ b/ipa-admintools/ipa-admintools.spec.in @@ -1,7 +1,7 @@ -Name: freeipa-admintools +Name: ipa-admintools Version: VERSION Release: 1%{?dist} -Summary: FreeIPA authentication server +Summary: IPA authentication server Group: System Environment/Base License: GPL @@ -10,10 +10,10 @@ Source0: %{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: python python-krbV freeipa-python +Requires: python python-krbV ipa-python %description -FreeIPA is a server for identity, policy, and audit. +IPA is a server for identity, policy, and audit. %prep %setup -q @@ -35,6 +35,9 @@ rm -rf %{buildroot} %{_mandir}/man1/* %changelog +* Wed Nov 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1 +- Version bump for release and rpm name change + * Thu Nov 1 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.1-1 - Version bump for release diff --git a/ipa-client/freeipa-client.spec b/ipa-client/ipa-client.spec index c972d967a..c184600bb 100755 --- a/ipa-client/freeipa-client.spec +++ b/ipa-client/ipa-client.spec @@ -1,7 +1,7 @@ -Name: freeipa-client +Name: ipa-client Version: 0.5.0 Release: 1%{?dist} -Summary: FreeIPA client +Summary: IPA client Group: System Environment/Base License: GPL @@ -9,10 +9,10 @@ URL: http://www.freeipa.org Source0: %{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python python-ldap python-krbV freeipa-python +Requires: python python-ldap python-krbV ipa-python %description -FreeIPA is a server for identity, policy, and audit. +IPA is a server for identity, policy, and audit. The client package provide install and configuration scripts for clients. %prep @@ -41,6 +41,9 @@ rm -rf %{buildroot} %{_usr}/share/ipa/* %changelog +* Wed Nov 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1 +- Version bump for release and rpm name change + * Thu Nov 1 2007 Karl MacMillan <kmacmill@redhat.com> - 0.3.1-1 - Version bump for release diff --git a/ipa-client/freeipa-client.spec.in b/ipa-client/ipa-client.spec.in index f4a7997f8..5dbd90f3f 100644 --- a/ipa-client/freeipa-client.spec.in +++ b/ipa-client/ipa-client.spec.in @@ -1,7 +1,7 @@ -Name: freeipa-client +Name: ipa-client Version: VERSION Release: 1%{?dist} -Summary: FreeIPA client +Summary: IPA client Group: System Environment/Base License: GPL @@ -9,10 +9,10 @@ URL: http://www.freeipa.org Source0: %{name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python python-ldap python-krbV freeipa-python +Requires: python python-ldap python-krbV ipa-python %description -FreeIPA is a server for identity, policy, and audit. +IPA is a server for identity, policy, and audit. The client package provide install and configuration scripts for clients. %prep @@ -41,6 +41,9 @@ rm -rf %{buildroot} %{_usr}/share/ipa/* %changelog +* Wed Nov 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1 +- Version bump for release and rpm name change + * Thu Nov 1 2007 Karl MacMillan <kmacmill@redhat.com> - 0.3.1-1 - Version bump for release diff --git a/ipa-python/freeipa-python.spec b/ipa-python/ipa-python.spec index 2c1420f91..2837a2832 100755 --- a/ipa-python/freeipa-python.spec +++ b/ipa-python/ipa-python.spec @@ -1,7 +1,7 @@ -Name: freeipa-python +Name: ipa-python Version: 0.5.0 Release: 1%{?dist} -Summary: FreeIPA authentication server +Summary: Ipa authentication server Group: System Environment/Base License: GPL @@ -17,7 +17,7 @@ Requires: PyKerberos %define pkgpythondir %{python_sitelib}/ipa %description -FreeIPA is a server for identity, policy, and audit. +Ipa is a server for identity, policy, and audit. %prep %setup -q @@ -38,6 +38,9 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/ipa/ipa.conf %changelog +* Wed Nov 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1 +- Version bump for release and rename of rpm + * Thu Nov 1 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.1-1 - Version bump for release diff --git a/ipa-python/freeipa-python.spec.in b/ipa-python/ipa-python.spec.in index 0c46098ce..bd8ac0da6 100755 --- a/ipa-python/freeipa-python.spec.in +++ b/ipa-python/ipa-python.spec.in @@ -1,7 +1,7 @@ -Name: freeipa-python +Name: ipa-python Version: VERSION Release: 1%{?dist} -Summary: FreeIPA authentication server +Summary: Ipa authentication server Group: System Environment/Base License: GPL @@ -17,7 +17,7 @@ Requires: PyKerberos %define pkgpythondir %{python_sitelib}/ipa %description -FreeIPA is a server for identity, policy, and audit. +Ipa is a server for identity, policy, and audit. %prep %setup -q @@ -38,6 +38,9 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/ipa/ipa.conf %changelog +* Wed Nov 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1 +- Version bump for release and rename of rpm + * Thu Nov 1 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.1-1 - Version bump for release diff --git a/ipa-server/freeipa-server.spec b/ipa-server/ipa-server.spec index 07ef1447a..7b78e06ab 100755 --- a/ipa-server/freeipa-server.spec +++ b/ipa-server/ipa-server.spec @@ -1,7 +1,7 @@ -Name: freeipa-server +Name: ipa-server Version: 0.5.0 Release: 1%{?dist} -Summary: FreeIPA authentication server +Summary: Ipa authentication server Group: System Environment/Base License: GPL @@ -16,8 +16,8 @@ BuildRequires: openldap-devel BuildRequires: krb5-devel BuildRequires: nss-devel -Requires: freeipa-python -Requires: freeipa-admintools +Requires: ipa-python +Requires: ipa-admintools Requires: fedora-ds-base >= 1.1 Requires: openldap-clients Requires: nss @@ -43,7 +43,7 @@ Requires: pyasn1 %define plugin_dir %{_libdir}/dirsrv/plugins %description -FreeIPA is a server for identity, policy, and audit. +Ipa is a server for identity, policy, and audit. %prep %setup -q @@ -87,6 +87,9 @@ rm -rf %{buildroot} %changelog +* Wed Nov 21 2007 Karl MacMillan <kmacmill@mentalrootkit.com> - 0.5.0-1 +- Version bump for relase and rpm name change + * Thu Nov 15 2007 Rob Crittenden <rcritten@redhat.com> - 0.4.1-2 - Broke invididual Requires and BuildRequires onto separate lines and reordered them diff --git a/ipa-server/freeipa-server.spec.in b/ipa-server/ipa-server.spec.in index 62a4a3fc4..d28ffa70e 100644 --- a/ipa-server/freeipa-server.spec.in +++ b/ipa-server/ipa-server.spec.in @@ -1,7 +1,7 @@ -Name: freeipa-server +Name: ipa-server Version: VERSION Release: 1%{?dist} -Summary: FreeIPA authentication server +Summary: Ipa authentication server Group: System Environment/Base License: GPL @@ -16,8 +16,8 @@ BuildRequires: openldap-devel BuildRequires: krb5-devel BuildRequires: nss-devel -Requires: freeipa-python -Requires: freeipa-admintools +Requires: ipa-python +Requires: ipa-admintools Requires: fedora-ds-base >= 1.1 Requires: openldap-clients Requires: nss @@ -43,7 +43,7 @@ Requires: pyasn1 %define plugin_dir %{_libdir}/dirsrv/plugins %description -FreeIPA is a server for identity, policy, and audit. +Ipa is a server for identity, policy, and audit. %prep %setup -q @@ -87,6 +87,9 @@ rm -rf %{buildroot} %changelog +* Wed Nov 21 2007 Karl MacMillan <kmacmill@mentalrootkit.com> - 0.5.0-1 +- Version bump for relase and rpm name change + * Thu Nov 15 2007 Rob Crittenden <rcritten@redhat.com> - 0.4.1-2 - Broke invididual Requires and BuildRequires onto separate lines and reordered them |