diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | freeipa.spec.in (renamed from ipa.spec.in) | 14 |
3 files changed, 18 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index de488b5e4..b4c315bea 100644 --- a/.gitignore +++ b/.gitignore @@ -68,7 +68,7 @@ ipa-client/missing ipa-client/py-compile ipa-client/stamp-h1 ipa-client/version.m4 -ipa.spec +freeipa.spec ipapython/setup.py ipapython/version.py version.m4 @@ -3,7 +3,7 @@ include VERSION SUBDIRS=daemons install ipapython ipa-client CLIENTDIRS=ipapython ipa-client -PRJ_PREFIX=ipa +PRJ_PREFIX=freeipa RPMBUILD ?= $(PWD)/rpmbuild TARGET ?= master @@ -81,7 +81,7 @@ release-update: version-update: release-update sed -e s/__VERSION__/$(IPA_VERSION)/ -e s/__RELEASE__/$(IPA_RPM_RELEASE)/ \ - ipa.spec.in > ipa.spec + freeipa.spec.in > freeipa.spec sed -e s/__VERSION__/$(IPA_VERSION)/ version.m4.in \ > version.m4 @@ -147,21 +147,21 @@ rpmdistdir: rpms: rpmroot rpmdistdir version-update tarballs cp dist/sources/$(TARBALL) $(RPMBUILD)/SOURCES/. - rpmbuild --define "_topdir $(RPMBUILD)" -ba ipa.spec + rpmbuild --define "_topdir $(RPMBUILD)" -ba freeipa.spec cp rpmbuild/RPMS/*/$(PRJ_PREFIX)-*-$(IPA_VERSION)-*.rpm dist/rpms/ cp rpmbuild/SRPMS/$(PRJ_PREFIX)-$(IPA_VERSION)-*.src.rpm dist/srpms/ rm -rf rpmbuild client-rpms: rpmroot rpmdistdir version-update tarballs cp dist/sources/$(TARBALL) $(RPMBUILD)/SOURCES/. - rpmbuild --define "_topdir $(RPMBUILD)" --define "ONLY_CLIENT 1" -ba ipa.spec + rpmbuild --define "_topdir $(RPMBUILD)" --define "ONLY_CLIENT 1" -ba freeipa.spec cp rpmbuild/RPMS/*/$(PRJ_PREFIX)-*-$(IPA_VERSION)-*.rpm dist/rpms/ cp rpmbuild/SRPMS/$(PRJ_PREFIX)-$(IPA_VERSION)-*.src.rpm dist/srpms/ rm -rf rpmbuild srpms: rpmroot rpmdistdir version-update tarballs cp dist/sources/$(TARBALL) $(RPMBUILD)/SOURCES/. - rpmbuild --define "_topdir $(RPMBUILD)" -bs ipa.spec + rpmbuild --define "_topdir $(RPMBUILD)" -bs freeipa.spec cp rpmbuild/SRPMS/$(PRJ_PREFIX)-$(IPA_VERSION)-*.src.rpm dist/srpms/ rm -rf rpmbuild @@ -198,4 +198,4 @@ maintainer-clean: clean cd ipa-client && $(MAKE) maintainer-clean cd ipapython && $(MAKE) maintainer-clean rm -f version.m4 - rm -f ipa.spec + rm -f freeipa.spec diff --git a/ipa.spec.in b/freeipa.spec.in index b53882048..ecbd2685e 100644 --- a/ipa.spec.in +++ b/freeipa.spec.in @@ -8,7 +8,7 @@ %global POLICYCOREUTILSVER 1.33.12-1 %global gettext_domain ipa -Name: ipa +Name: freeipa Version: __VERSION__ Release: __RELEASE__%{?dist} Summary: The Identity, Policy and Audit system @@ -91,6 +91,8 @@ Requires: pki-silent >= 9.0.0 Requires(preun): python initscripts chkconfig Requires(postun): python initscripts chkconfig +Obsoletes: ipa-server + %description server IPA is an integrated solution to provide centrally managed Identity (machine, user, virtual machines, groups, authentication credentials), Policy @@ -101,7 +103,7 @@ this package). %package server-selinux -Summary: SELinux rules for ipa-server daemons +Summary: SELinux rules for freeipa-server daemons Group: System Environment/Base Requires: %{name}-server = %{version}-%{release} Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER} libsemanage @@ -111,7 +113,7 @@ 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 package provides SELinux rules for the -daemons included in ipa-server +daemons included in freeipa-server %endif @@ -131,6 +133,8 @@ Requires: sssd >= 1.2.1 Requires: certmonger >= 0.26 Requires: nss-tools +Obsoletes: ipa-client + %description client IPA is an integrated solution to provide centrally managed Identity (machine, user, virtual machines, groups, authentication credentials), Policy @@ -148,6 +152,8 @@ Requires: %{name}-client = %{version}-%{release} Requires: python-krbV Requires: python-ldap +Obsoletes: ipa-admintools + %description admintools IPA is an integrated solution to provide centrally managed Identity (machine, user, virtual machines, groups, authentication credentials), Policy @@ -169,6 +175,8 @@ Requires: python-nss >= 0.9-8 Requires: python-lxml Requires: python-netaddr +Obsoletes: ipa-python + %description python IPA is an integrated solution to provide centrally managed Identity (machine, user, virtual machines, groups, authentication credentials), Policy |