mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
committed by
Rob Crittenden
parent
1229fd5654
commit
24a582304f
2
.gitignore
vendored
2
.gitignore
vendored
@@ -68,7 +68,7 @@ ipa-client/missing
|
|||||||
ipa-client/py-compile
|
ipa-client/py-compile
|
||||||
ipa-client/stamp-h1
|
ipa-client/stamp-h1
|
||||||
ipa-client/version.m4
|
ipa-client/version.m4
|
||||||
ipa.spec
|
freeipa.spec
|
||||||
ipapython/setup.py
|
ipapython/setup.py
|
||||||
ipapython/version.py
|
ipapython/version.py
|
||||||
version.m4
|
version.m4
|
||||||
|
|||||||
12
Makefile
12
Makefile
@@ -3,7 +3,7 @@ include VERSION
|
|||||||
SUBDIRS=daemons install ipapython ipa-client
|
SUBDIRS=daemons install ipapython ipa-client
|
||||||
CLIENTDIRS=ipapython ipa-client
|
CLIENTDIRS=ipapython ipa-client
|
||||||
|
|
||||||
PRJ_PREFIX=ipa
|
PRJ_PREFIX=freeipa
|
||||||
|
|
||||||
RPMBUILD ?= $(PWD)/rpmbuild
|
RPMBUILD ?= $(PWD)/rpmbuild
|
||||||
TARGET ?= master
|
TARGET ?= master
|
||||||
@@ -81,7 +81,7 @@ release-update:
|
|||||||
|
|
||||||
version-update: release-update
|
version-update: release-update
|
||||||
sed -e s/__VERSION__/$(IPA_VERSION)/ -e s/__RELEASE__/$(IPA_RPM_RELEASE)/ \
|
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 \
|
sed -e s/__VERSION__/$(IPA_VERSION)/ version.m4.in \
|
||||||
> version.m4
|
> version.m4
|
||||||
|
|
||||||
@@ -147,21 +147,21 @@ rpmdistdir:
|
|||||||
|
|
||||||
rpms: rpmroot rpmdistdir version-update tarballs
|
rpms: rpmroot rpmdistdir version-update tarballs
|
||||||
cp dist/sources/$(TARBALL) $(RPMBUILD)/SOURCES/.
|
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/RPMS/*/$(PRJ_PREFIX)-*-$(IPA_VERSION)-*.rpm dist/rpms/
|
||||||
cp rpmbuild/SRPMS/$(PRJ_PREFIX)-$(IPA_VERSION)-*.src.rpm dist/srpms/
|
cp rpmbuild/SRPMS/$(PRJ_PREFIX)-$(IPA_VERSION)-*.src.rpm dist/srpms/
|
||||||
rm -rf rpmbuild
|
rm -rf rpmbuild
|
||||||
|
|
||||||
client-rpms: rpmroot rpmdistdir version-update tarballs
|
client-rpms: rpmroot rpmdistdir version-update tarballs
|
||||||
cp dist/sources/$(TARBALL) $(RPMBUILD)/SOURCES/.
|
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/RPMS/*/$(PRJ_PREFIX)-*-$(IPA_VERSION)-*.rpm dist/rpms/
|
||||||
cp rpmbuild/SRPMS/$(PRJ_PREFIX)-$(IPA_VERSION)-*.src.rpm dist/srpms/
|
cp rpmbuild/SRPMS/$(PRJ_PREFIX)-$(IPA_VERSION)-*.src.rpm dist/srpms/
|
||||||
rm -rf rpmbuild
|
rm -rf rpmbuild
|
||||||
|
|
||||||
srpms: rpmroot rpmdistdir version-update tarballs
|
srpms: rpmroot rpmdistdir version-update tarballs
|
||||||
cp dist/sources/$(TARBALL) $(RPMBUILD)/SOURCES/.
|
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/
|
cp rpmbuild/SRPMS/$(PRJ_PREFIX)-$(IPA_VERSION)-*.src.rpm dist/srpms/
|
||||||
rm -rf rpmbuild
|
rm -rf rpmbuild
|
||||||
|
|
||||||
@@ -198,4 +198,4 @@ maintainer-clean: clean
|
|||||||
cd ipa-client && $(MAKE) maintainer-clean
|
cd ipa-client && $(MAKE) maintainer-clean
|
||||||
cd ipapython && $(MAKE) maintainer-clean
|
cd ipapython && $(MAKE) maintainer-clean
|
||||||
rm -f version.m4
|
rm -f version.m4
|
||||||
rm -f ipa.spec
|
rm -f freeipa.spec
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
%global POLICYCOREUTILSVER 1.33.12-1
|
%global POLICYCOREUTILSVER 1.33.12-1
|
||||||
%global gettext_domain ipa
|
%global gettext_domain ipa
|
||||||
|
|
||||||
Name: ipa
|
Name: freeipa
|
||||||
Version: __VERSION__
|
Version: __VERSION__
|
||||||
Release: __RELEASE__%{?dist}
|
Release: __RELEASE__%{?dist}
|
||||||
Summary: The Identity, Policy and Audit system
|
Summary: The Identity, Policy and Audit system
|
||||||
@@ -91,6 +91,8 @@ Requires: pki-silent >= 9.0.0
|
|||||||
Requires(preun): python initscripts chkconfig
|
Requires(preun): python initscripts chkconfig
|
||||||
Requires(postun): python initscripts chkconfig
|
Requires(postun): python initscripts chkconfig
|
||||||
|
|
||||||
|
Obsoletes: ipa-server
|
||||||
|
|
||||||
%description server
|
%description server
|
||||||
IPA is an integrated solution to provide centrally managed Identity (machine,
|
IPA is an integrated solution to provide centrally managed Identity (machine,
|
||||||
user, virtual machines, groups, authentication credentials), Policy
|
user, virtual machines, groups, authentication credentials), Policy
|
||||||
@@ -101,7 +103,7 @@ this package).
|
|||||||
|
|
||||||
|
|
||||||
%package server-selinux
|
%package server-selinux
|
||||||
Summary: SELinux rules for ipa-server daemons
|
Summary: SELinux rules for freeipa-server daemons
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Requires: %{name}-server = %{version}-%{release}
|
Requires: %{name}-server = %{version}-%{release}
|
||||||
Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER} libsemanage
|
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
|
user, virtual machines, groups, authentication credentials), Policy
|
||||||
(configuration settings, access control information) and Audit (events,
|
(configuration settings, access control information) and Audit (events,
|
||||||
logs, analysis thereof). This package provides SELinux rules for the
|
logs, analysis thereof). This package provides SELinux rules for the
|
||||||
daemons included in ipa-server
|
daemons included in freeipa-server
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
@@ -131,6 +133,8 @@ Requires: sssd >= 1.2.1
|
|||||||
Requires: certmonger >= 0.26
|
Requires: certmonger >= 0.26
|
||||||
Requires: nss-tools
|
Requires: nss-tools
|
||||||
|
|
||||||
|
Obsoletes: ipa-client
|
||||||
|
|
||||||
%description client
|
%description client
|
||||||
IPA is an integrated solution to provide centrally managed Identity (machine,
|
IPA is an integrated solution to provide centrally managed Identity (machine,
|
||||||
user, virtual machines, groups, authentication credentials), Policy
|
user, virtual machines, groups, authentication credentials), Policy
|
||||||
@@ -148,6 +152,8 @@ Requires: %{name}-client = %{version}-%{release}
|
|||||||
Requires: python-krbV
|
Requires: python-krbV
|
||||||
Requires: python-ldap
|
Requires: python-ldap
|
||||||
|
|
||||||
|
Obsoletes: ipa-admintools
|
||||||
|
|
||||||
%description admintools
|
%description admintools
|
||||||
IPA is an integrated solution to provide centrally managed Identity (machine,
|
IPA is an integrated solution to provide centrally managed Identity (machine,
|
||||||
user, virtual machines, groups, authentication credentials), Policy
|
user, virtual machines, groups, authentication credentials), Policy
|
||||||
@@ -169,6 +175,8 @@ Requires: python-nss >= 0.9-8
|
|||||||
Requires: python-lxml
|
Requires: python-lxml
|
||||||
Requires: python-netaddr
|
Requires: python-netaddr
|
||||||
|
|
||||||
|
Obsoletes: ipa-python
|
||||||
|
|
||||||
%description python
|
%description python
|
||||||
IPA is an integrated solution to provide centrally managed Identity (machine,
|
IPA is an integrated solution to provide centrally managed Identity (machine,
|
||||||
user, virtual machines, groups, authentication credentials), Policy
|
user, virtual machines, groups, authentication credentials), Policy
|
||||||
Reference in New Issue
Block a user