summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2008-04-30 17:49:52 -0400
committerRob Crittenden <rcritten@redhat.com>2008-05-05 13:53:57 -0400
commit5ad2af3429580bc45bdfb7de53601ddf615266bf (patch)
tree546013e9f126d8d4d186421d1cf7450dfb8dda3b
parent23fe67996cc05edf71d58bf52ef0aa8c7c0ecf7a (diff)
downloadfreeipa-5ad2af3429580bc45bdfb7de53601ddf615266bf.tar.gz
freeipa-5ad2af3429580bc45bdfb7de53601ddf615266bf.tar.xz
freeipa-5ad2af3429580bc45bdfb7de53601ddf615266bf.zip
Redo the way versioning works in freeIPA.
The file VERSION is now the sole-source of versioning. The generated .spec files will been removed in the maintainer-clean targets and have been removed from the repository. By default a GIT build is done. To do a non-GIT build do: $ make TARGET IPA_VERSION_IS_GIT_SNAPSHOT=no When updating the version you can run this to regenerate the version: $ make version-update The version can be determined in Python by using ipaserver.version.VERSION
-rw-r--r--VERSION55
-rwxr-xr-xipa-admintools/ipa-admintools.spec79
-rwxr-xr-xipa-client/ipa-client.spec86
-rwxr-xr-xipa-python/ipa-python.spec82
-rw-r--r--ipa-python/setup.py.in (renamed from ipa-python/setup.py)0
-rwxr-xr-xipa-radius-admintools/ipa-radius-admintools.spec53
-rwxr-xr-xipa-radius-server/ipa-radius-server.spec61
-rwxr-xr-xipa-server/ipa-server.spec264
-rw-r--r--ipa-server/selinux/ipa-server-selinux.spec86
9 files changed, 55 insertions, 711 deletions
diff --git a/VERSION b/VERSION
new file mode 100644
index 000000000..c512b6b64
--- /dev/null
+++ b/VERSION
@@ -0,0 +1,55 @@
+########################################################
+# freeIPA Version #
+# #
+# freeIPA versions are as follows #
+# 1.0.x New production series #
+# 1.0.x{pre,rc}y Preview/Testing & RC #
+# 1.0.0GITabcdefg Build from GIT #
+# #
+########################################################
+
+########################################################
+# This are the main version numbers #
+# #
+# <MAJOR>.<MINOR>.<RELEASE> #
+# #
+# e.g. IPA_VERSION_MAJOR=1 #
+# IPA_VERSION_MINOR=0 #
+# IPA_VERSION_RELEASE=0 #
+# -> "1.0.0" #
+########################################################
+IPA_VERSION_MAJOR=1
+IPA_VERSION_MINOR=0
+IPA_VERSION_RELEASE=0
+
+########################################################
+# For 'pre' releases the version will be #
+# #
+# <MAJOR>.<MINOR>.<RELEASE>pre<PRE_RELEASE> #
+# #
+# e.g. IPA_VERSION_PRE_RELEASE=1 #
+# -> "1.0.0pre1" #
+########################################################
+IPA_VERSION_PRE_RELEASE=
+
+########################################################
+# For 'rc' releases the version will be #
+# #
+# <MAJOR>.<MINOR>.<RELEASE>rc<RC_RELEASE> #
+# #
+# e.g. IPA_VERSION_RC_RELEASE=1 #
+# -> "1.0.0rc1" #
+########################################################
+IPA_VERSION_RC_RELEASE=
+
+########################################################
+# To mark GIT snapshots this should be set to 'yes' #
+# in the development BRANCH, and set to 'no' only in #
+# the IPA_X_X_RELEASE BRANCH #
+# #
+# <MAJOR>.<MINOR>.<RELEASE>GITxxx #
+# #
+# e.g. IPA_VERSION_IS_SVN_SNAPSHOT=yes #
+# -> "1.0.0GITabcdefg" #
+########################################################
+IPA_VERSION_IS_GIT_SNAPSHOT="yes"
diff --git a/ipa-admintools/ipa-admintools.spec b/ipa-admintools/ipa-admintools.spec
deleted file mode 100755
index 7b77e53b5..000000000
--- a/ipa-admintools/ipa-admintools.spec
+++ /dev/null
@@ -1,79 +0,0 @@
-Name: ipa-admintools
-Version: 1.0.0
-Release: 1%{?dist}
-Summary: IPA authentication server
-
-Group: System Environment/Base
-License: GPLv2
-URL: http://www.freeipa.org
-Source0: %{name}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-
-Requires: python python-krbV ipa-python
-
-%description
-IPA is a server for identity, policy, and audit.
-
-%prep
-%setup -q
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_sbindir}
-
-make install DESTDIR=%{buildroot}
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{_sbindir}/ipa*
-%{_mandir}/man1/*
-
-%changelog
-* Thu Apr 3 2008 Rob Crittenden <rcritten@redhat.com> - 1.0.0-1
-- Version bump for release
-
-* Thu Feb 21 2008 Rob Crittenden <rcritten@redhat.com> - 0.99.0-1
-- Version bump for release
-
-* Thu Jan 31 2008 Rob Crittenden <rcritten@redhat.com> - 0.6.0-3
-- Marked with wrong license. IPA is GPLv2.
-
-* Thu Jan 17 2008 Rob Crittenden <rcritten@redhat.com> - 0.6.0-2
-- Fixed License in specfile
-
-* Fri Dec 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.6.0-1
-- Version bump for release.
-
-* 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
-
-* Thu Oct 11 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.0-2
-- Package man files
-
-* Tue Oct 2 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.0-1
-- Milestone 4
-
-* Mon Sep 10 2007 Karl MacMillan <kmacmill@redhat.com> - 0.3.0-1
-- Milestone 3
-
-* Fri Aug 17 2007 Karl MacMillan <kmacmill@redhat.com> - 0.2.0-4
-- Package additional utilities.
-
-* Mon Aug 5 2007 Rob Crittenden <rcritten@redhat.com> - 0.1.0-3
-- Abstracted client class to work directly or over RPC
-
-* Wed Aug 1 2007 Rob Crittenden <rcritten@redhat.com> - 0.1.0-2
-- Update tools to do kerberos
-- Add User class
-
-* Fri Jul 27 2007 Karl MacMillan <kmacmill@localhost.localdomain> - 0.1.0-1
-- Initial rpm version
diff --git a/ipa-client/ipa-client.spec b/ipa-client/ipa-client.spec
deleted file mode 100755
index 775030f2a..000000000
--- a/ipa-client/ipa-client.spec
+++ /dev/null
@@ -1,86 +0,0 @@
-Name: ipa-client
-Version: 1.0.0
-Release: 1%{?dist}
-Summary: IPA client
-
-Group: System Environment/Base
-License: GPLv2
-URL: http://www.freeipa.org
-Source0: %{name}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires: python python-ldap python-krbV ipa-python cyrus-sasl-gssapi
-
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
-%description
-IPA is a server for identity, policy, and audit.
-The client package provide install and configuration scripts for clients.
-
-%prep
-%setup -q
-./configure --prefix=%{buildroot}/usr --libdir=%{buildroot}/%{_libdir} --sysconfdir=%{buildroot}/etc --mandir=%{buildroot}/%{_mandir}
-
-%build
-
-make
-
-%install
-rm -rf %{buildroot}
-
-make install
-
-mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa-client/sysrestore
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{_sbindir}/ipa-client-install
-%{_sbindir}/ipa-getkeytab
-
-%dir %{_usr}/share/ipa
-%{_usr}/share/ipa/*
-
-%dir %{python_sitelib}/ipaclient
-%{python_sitelib}/ipaclient/*.py*
-
-%dir %{_localstatedir}/lib/ipa-client
-%dir %{_localstatedir}/lib/ipa-client/sysrestore
-
-%{_mandir}/man1/*
-
-%changelog
-* Thu Apr 3 2008 Rob Crittenden <rcritten@redhat.com> - 1.0.0-1
-- Version bump for release
-
-* Mon Feb 25 2008 Rob Crittenden <rcritten@redhat.com> - 0.99.0-2
-- Add ipa-getkeytab man page
-
-* Thu Feb 21 2008 Rob Crittenden <rcritten@redhat.com> - 0.99.0-1
-- Version bump for release
-
-* Thu Jan 31 2008 Rob Crittenden <rcritten@redhat.com> - 0.6.0-3
-- Marked with wrong license. IPA is GPLv2.
-
-* Thu Jan 17 2008 Rob Crittenden <rcritten@redhat.com> - 0.6.0-2
-- Fixed License in specfile
-- Move client python files to /usr/lib*/python*/site-packages
-
-* Fri Dec 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.6.0-1
-- Version bump for release
-
-* 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
-
-* Thu Oct 18 2007 Karl MacMillan <kmacmill@redhat.com> - 0.3.0-2
-- Convert to autotools-based build
-
-* Thu Aug 16 2007 Simo Sorce <ssorce@redhat.com> - 0.1.0-1
-- Initial rpm version
diff --git a/ipa-python/ipa-python.spec b/ipa-python/ipa-python.spec
deleted file mode 100755
index dd7f0af20..000000000
--- a/ipa-python/ipa-python.spec
+++ /dev/null
@@ -1,82 +0,0 @@
-Name: ipa-python
-Version: 1.0.0
-Release: 1%{?dist}
-Summary: IPA authentication server
-
-Group: System Environment/Base
-License: GPLv2
-URL: http://www.freeipa.org
-Source0: http://www.freeipa.org/downloads/%{name}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-BuildRequires: python-devel
-Requires: python-kerberos
-
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
-%description
-IPA is a server for identity, policy, and audit.
-
-%prep
-%setup -q
-
-%build
-
-%install
-rm -rf %{buildroot}
-%{__python} setup.py install --no-compile --root=%{buildroot}
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-%{python_sitelib}/*
-%config(noreplace) %{_sysconfdir}/ipa/ipa.conf
-
-%changelog
-* Thu Apr 3 2008 Rob Crittenden <rcritten@redhat.com> - 1.0.0-1
-- Version bump for release
-
-* Thu Feb 21 2008 Rob Crittenden <rcritten@redhat.com> - 0.99.0-1
-- Version bump for release
-
-* Thu Jan 31 2008 Rob Crittenden <rcritten@redhat.com> - 0.6.0-4
-- Marked with wrong license. IPA is GPLv2.
-
-* Thu Jan 24 2008 Rob Crittenden <rcritten@redhat.com> - 0.6.0-3
-- Use new name of PyKerberos, python-kerberos, in Requires
-
-* Thu Jan 17 2008 Rob Crittenden <rcritten@redhat.com> - 0.6.0-2
-- Fixed License in specfile
-
-* Fri Dec 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.6.0-1
-- Version bump for release
-
-* 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
-
-* Wed Oct 17 2007 Rob Crittenden <rcritten@redhat.com> - 0.4.0-2
-- Use new python setup.py build script
-
-* Tue Oct 2 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.0-1
-- Milestone 4
-
-* Mon Sep 10 2007 Karl MacMillan <kmacmill@redhat.com> - 0.3.0-1
-- Milestone 3
-
-* Fri Aug 17 2007 Karl MacMillan <kmacmill@redhat.com> = 0.2.0-4
-- Added PyKerberos dep.
-
-* Mon Aug 5 2007 Rob Crittenden <rcritten@redhat.com> - 0.1.0-3
-- Abstracted client class to work directly or over RPC
-
-* Wed Aug 1 2007 Rob Crittenden <rcritten@redhat.com> - 0.1.0-2
-- Add User class
-- Add kerberos authentication to the XML-RPC request made from tools.
-
-* Fri Jul 27 2007 Karl MacMillan <kmacmill@localhost.localdomain> - 0.1.0-1
-- Initial rpm version
diff --git a/ipa-python/setup.py b/ipa-python/setup.py.in
index a48b8e690..a48b8e690 100644
--- a/ipa-python/setup.py
+++ b/ipa-python/setup.py.in
diff --git a/ipa-radius-admintools/ipa-radius-admintools.spec b/ipa-radius-admintools/ipa-radius-admintools.spec
deleted file mode 100755
index 8d3d7a3f9..000000000
--- a/ipa-radius-admintools/ipa-radius-admintools.spec
+++ /dev/null
@@ -1,53 +0,0 @@
-Name: ipa-radius-admintools
-Version: 1.0.0
-Release: 1%{?dist}
-Summary: IPA authentication server - radius admin tools
-
-Group: System Environment/Base
-License: GPLv2
-URL: http://www.freeipa.org
-Source0: %{name}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-
-Requires: python python-krbV ipa-python ipa-admintools
-
-%description
-IPA is a server for identity, policy, and audit.
-
-%prep
-%setup -q
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_sbindir}
-
-make install DESTDIR=%{buildroot}
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{_sbindir}/ipa*
-
-%changelog
-* Thu Apr 3 2008 Rob Crittenden <rcritten@redhat.com> - 1.0.0-1
-- Version bump for release
-
-* Thu Feb 21 2008 Rob Crittenden <rcritten@redhat.com> - 0.99.0-1
-- Version bump for release
-
-* Thu Jan 31 2008 Rob Crittenden <rcritten@redhat.com> - 0.6.0-3
-- Marked with wrong license. IPA is GPLv2.
-
-* Thu Jan 17 2008 Rob Crittenden <rcritten@redhat.com> - 0.6.0-2
-- Fixed License in specfile
-
-* Fri Dec 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.6.0-1
-- Version bump for release
-
-* Tue Dec 18 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0
-- Initial rpm version
diff --git a/ipa-radius-server/ipa-radius-server.spec b/ipa-radius-server/ipa-radius-server.spec
deleted file mode 100755
index d243e13bd..000000000
--- a/ipa-radius-server/ipa-radius-server.spec
+++ /dev/null
@@ -1,61 +0,0 @@
-Name: ipa-radius-server
-Version: 1.0.0
-Release: 1%{?dist}
-Summary: IPA authentication server - radius plugin
-
-Group: System Environment/Base
-License: GPLv2
-URL: http://www.freeipa.org
-Source0: %{name}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-
-Requires: python
-Requires: ipa-server
-Requires: freeradius
-
-%description
-Radius plugin for an IPA server
-
-%prep
-%setup -q
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_sbindir}
-
-make install DESTDIR=%{buildroot}
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{_sbindir}/ipa*
-
-%dir %{_usr}/share/ipa/plugins
-%{_usr}/share/ipa/plugins/*
-
-%dir %{_usr}/share/ipa/ipaserver/plugins
-%{_usr}/share/ipa/ipaserver/plugins/*
-
-%changelog
-* Thu Apr 3 2008 Rob Crittenden <rcritten@redhat.com> - 1.0.0-1
-- Version bump for release
-
-* Thu Feb 21 2008 Rob Crittenden <rcritten@redhat.com> - 0.99.0-1
-- Version bump for release
-
-* Thu Jan 31 2008 Rob Crittenden <rcritten@redhat.com> - 0.6.0-3
-- Marked with wrong license. IPA is GPLv2.
-
-* Thu Jan 17 2008 Rob Crittenden <rcritten@redhat.com> - 0.6.0-2
-- Fixed License in specfile
-
-* Fri Dec 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.6.0-1
-- Version bump for release
-
-* Wed Dec 12 2007 Karl MacMillan <kmacmill@redhat.com> - 0.5.0-1
-- Initial version
diff --git a/ipa-server/ipa-server.spec b/ipa-server/ipa-server.spec
deleted file mode 100755
index d0b7c8a5b..000000000
--- a/ipa-server/ipa-server.spec
+++ /dev/null
@@ -1,264 +0,0 @@
-Name: ipa-server
-Version: 1.0.0
-Release: 1%{?dist}
-Summary: IPA authentication server
-
-Group: System Environment/Base
-License: GPLv2
-URL: http://www.freeipa.org
-Source0: %{name}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: fedora-ds-base-devel >= 1.1
-BuildRequires: mozldap-devel
-BuildRequires: openssl-devel
-BuildRequires: openldap-devel
-BuildRequires: krb5-devel
-BuildRequires: nss-devel
-BuildRequires: libcap-devel
-
-Requires(post): ipa-server-selinux
-Requires: ipa-python
-Requires: ipa-admintools
-Requires: ipa-client
-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: python-pyasn1
-Requires: libcap
-
-Conflicts: mod_ssl
-
-%define httpd_conf /etc/httpd/conf.d
-%define plugin_dir %{_libdir}/dirsrv/plugins
-
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
-%description
-IPA is a server for identity, policy, and audit.
-
-%prep
-%setup -q
-./configure --prefix=%{buildroot}/usr --libdir=%{buildroot}/%{_libdir} --sysconfdir=%{buildroot}/etc --localstatedir=%{buildroot}/var
-
-%build
-
-make
-
-%install
-rm -rf %{buildroot}
-
-make install
-
-# Remove .la files from libtool - we don't want to package
-# these files
-rm %{buildroot}/%{plugin_dir}/libipa_pwd_extop.la
-rm %{buildroot}/%{plugin_dir}/libipa-memberof-plugin.la
-rm %{buildroot}/%{plugin_dir}/libipa-dna-plugin.la
-
-# Some user-modifiable HTML files are provided. Move these to /etc
-# and link back.
-mkdir -p %{buildroot}/%{_sysconfdir}/ipa/html
-mv %{buildroot}/%{_usr}/share/ipa/html/ssbrowser.html %{buildroot}/%{_sysconfdir}/ipa/html
-mv %{buildroot}/%{_usr}/share/ipa/html/unauthorized.html %{buildroot}/%{_sysconfdir}/ipa/html
-ln -s ../../../..%{_sysconfdir}/ipa/html/ssbrowser.html \
- %{buildroot}%{_usr}/share/ipa/html/ssbrowser.html
-ln -s ../../../..%{_sysconfdir}/ipa/html/unauthorized.html \
- %{buildroot}%{_usr}/share/ipa/html/unauthorized.html
-
-%clean
-rm -rf %{buildroot}
-
-%post
-if [ $1 = 1 ]; then
- /sbin/chkconfig --add ipa_kpasswd
- /sbin/chkconfig --add ipa_webgui
-fi
-/bin/touch /var/log/ipa_error.log
-/bin/chown apache /var/log/ipa_error.log
-/bin/chmod 600 /var/log/ipa_error.log
-restorecon /var/log/ipa_error.log
-
-%preun
-if [ $1 = 0 ]; then
- /sbin/chkconfig --del ipa_kpasswd
- /sbin/chkconfig --del ipa_webgui
- /sbin/service ipa_kpasswd stop >/dev/null 2>&1 || :
- /sbin/service ipa_webgui stop >/dev/null 2>&1 || :
-fi
-
-%postun
-if [ "$1" -ge "1" ]; then
- /sbin/service ipa_kpasswd condrestart >/dev/null 2>&1 || :
- /sbin/service ipa_webgui condrestart >/dev/null 2>&1 || :
-fi
-
-%files
-%defattr(-,root,root,-)
-%{_sbindir}/ipa-server-install
-%{_sbindir}/ipa-replica-install
-%{_sbindir}/ipa-replica-prepare
-%{_sbindir}/ipa-replica-manage
-%{_sbindir}/ipa-server-certinstall
-%{_sbindir}/ipactl
-%{_sbindir}/ipa_kpasswd
-%{_sbindir}/ipa_webgui
-%attr(755,root,root) %{_initrddir}/ipa_kpasswd
-%attr(755,root,root) %{_initrddir}/ipa_webgui
-
-%dir %{_usr}/share/ipa
-%{_usr}/share/ipa/*.ldif
-%{_usr}/share/ipa/*.template
-%dir %{_usr}/share/ipa/html
-%{_usr}/share/ipa/html/ssbrowser.html
-%{_usr}/share/ipa/html/unauthorized.html
-%dir %{_sysconfdir}/ipa
-%dir %{_sysconfdir}/ipa/html
-%config(noreplace) %{_sysconfdir}/ipa/html/ssbrowser.html
-%config(noreplace) %{_sysconfdir}/ipa/html/unauthorized.html
-%{_usr}/share/ipa/ipa_webgui.cfg
-%{_usr}/share/ipa/ipa.conf
-%{_usr}/share/ipa/ipa-rewrite.conf
-%dir %{_usr}/share/ipa/ipagui
-%{_usr}/share/ipa/ipagui/*
-%dir %{_usr}/share/ipa/ipa_gui.egg-info
-%{_usr}/share/ipa/ipa_gui.egg-info/*
-%dir %{_usr}/share/ipa/ipaserver
-%{_usr}/share/ipa/ipaserver/*
-%dir %{_usr}/share/ipa/locales/
-%{_usr}/share/ipa/locales/*
-
-%dir %{python_sitelib}/ipaserver
-%{python_sitelib}/ipaserver/*.py*
-
-%attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.so
-%attr(755,root,root) %{plugin_dir}/libipa-memberof-plugin.so
-%attr(755,root,root) %{plugin_dir}/libipa-dna-plugin.so
-
-%dir %{_localstatedir}/lib/ipa
-%attr(700,root,root) %dir %{_localstatedir}/lib/ipa/sysrestore
-%dir %{_localstatedir}/cache/ipa
-%attr(700,root,root) %dir %{_localstatedir}/cache/ipa/kpasswd
-%attr(700,apache,apache) %dir %{_localstatedir}/cache/ipa/sessions
-
-%{_mandir}/man8/ipactl.8.gz
-%{_mandir}/man8/ipa_kpasswd.8.gz
-%{_mandir}/man8/ipa_webgui.8.gz
-%{_mandir}/man1/ipa-replica-install.1.gz
-%{_mandir}/man1/ipa-replica-manage.1.gz
-%{_mandir}/man1/ipa-replica-prepare.1.gz
-%{_mandir}/man1/ipa-server-certinstall.1.gz
-%{_mandir}/man1/ipa-server-install.1.gz
-
-%changelog
-* Thu Apr 3 2008 Rob Crittenden <rcritten@redhat.com> - 1.0.0-1
-- Version bump for release
-
-* Fri Mar 14 2008 Rob Crittenden <rcritten@redhat.com> - 0.99.0-5
-- Run restorecon on /var/log/ipa_error.log to ensure correct selinux context
-- Add (post) to ipa-server-selinux Requires
-
-* Fri Mar 14 2008 Rob Crittenden <rcritten@redhat.com> - 0.99.0-4
-- Add missing man pages
-- Add Conflicts for mod_ssl
-
-* Thu Feb 26 2008 Rob Crittenden <rcritten@redhat.com> - 0.99.0-3
-- Add ipactl command
-
-* Thu Feb 21 2008 Rob Crittenden <rcritten@redhat.com> - 0.99.0-2
-- package new file ipa-rewrite.conf
-
-* Thu Feb 21 2008 Rob Crittenden <rcritten@redhat.com> - 0.99.0-1
-- Version bump for release
-
-* Thu Feb 7 2008 Masato Taruishi <taruishi@redhat.com> = 0.6.0-9
-- Internationalize the kid templates and include a Japanese translation.
-
-* Thu Feb 6 2008 Karl MacMillan <kmacmill@redhat.com> = 0.6.0-8
-- Add requirement on ipa-server-selinux
-
-* Thu Jan 31 2008 Rob Crittenden <rcritten@redhat.com> = 0.6.0-7
-- Marked with wrong license. IPA is GPLv2.
-
-* Thu Jan 31 2008 Rob Crittenden <rcritten@redhat.com> = 0.6.0-6
-- Ensure that the ipa_webgui error log exists and has correct permissions.
-
-* Tue Jan 29 2008 Rob Crittenden <rcritten@redhat.com> = 0.6.0-5
-- Put user-modifiable files into /etc/ipa so they can be marked as
- config(noreplace).
-
-* Thu Jan 24 2008 Rob Crittenden <rcritten@redhat.com> = 0.6.0-4
-- Use new name of pyasn1, python-pyasn1, in Requires
-
-* Tue Jan 22 2008 Rob Crittenden <rcritten@redhat.com> = 0.6.0-3
-- add session cache directory
-
-* Thu Jan 17 2008 Rob Crittenden <rcritten@redhat.com> = 0.6.0-2
-- Fixed License in specfile
-- Include files from /usr/lib/python*/site-packages/ipaserver
-
-* Fri Dec 21 2007 Karl MacMillan <kmacmill@redhat.com> - 0.6.0-1
-- Version bump for release
-
-* Wed Nov 21 2007 Karl MacMillan <kmacmill@mentalrootkit.com> - 0.5.0-1
-- Preverse mode on ipa-keytab-util
-- 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
-- Added python-tgexpandingformwidget as a dependency
-- Require at least fedora-ds-base 1.1
-
-* Thu Nov 1 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.1-1
-- Version bump for release
-
-* Wed Oct 31 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.0-6
-- Add dep for freeipa-admintools and acl
-
-* Wed Oct 24 2007 Rob Crittenden <rcritten@redhat.com> - 0.4.0-5
-- Add dependency for python-krbV
-
-* Fri Oct 19 2007 Rob Crittenden <rcritten@redhat.com> - 0.4.0-4
-- Require mod_nss-1.0.7-2 for mod_proxy fixes
-
-* Thu Oct 18 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.0-3
-- Convert to autotools-based build
-
-* Tue Sep 25 2007 Karl MacMillan <kmacmill@redhat.com> - 0.4.0-2
-- Package ipa-webgui
-
-* Fri Sep 7 2007 Karl MacMillan <kmacmill@redhat.com> - 0.3.0-1
-- Added support for libipa-dna-plugin
-
-* Fri Aug 10 2007 Karl MacMillan <kmacmill@redhat.com> - 0.2.0-1
-- Added support for ipa_kpasswd and ipa_pwd_extop
-
-* Mon Aug 5 2007 Rob Crittenden <rcritten@redhat.com> - 0.1.0-3
-- Abstracted client class to work directly or over RPC
-
-* Wed Aug 1 2007 Rob Crittenden <rcritten@redhat.com> - 0.1.0-2
-- Add mod_auth_kerb and cyrus-sasl-gssapi to Requires
-- Remove references to admin server in ipa-server-setupssl
-- Generate a client certificate for the XML-RPC server to connect to LDAP with
-- Create a keytab for Apache
-- Create an ldif with a test user
-- Provide a certmap.conf for doing SSL client authentication
-
-* Fri Jul 27 2007 Karl MacMillan <kmacmill@redhat.com> - 0.1.0-1
-- Initial rpm version
diff --git a/ipa-server/selinux/ipa-server-selinux.spec b/ipa-server/selinux/ipa-server-selinux.spec
deleted file mode 100644
index c54f02b07..000000000
--- a/ipa-server/selinux/ipa-server-selinux.spec
+++ /dev/null
@@ -1,86 +0,0 @@
-%define POLICYCOREUTILSVER 1.33.12-1
-
-Name: ipa-server-selinux
-Version: 1.0.0
-Release: 1%{?dist}
-Summary: IPA server SELinux policies
-
-Group: System Environment/Base
-License: GPLv2
-URL: http://www.freeipa.org
-Source0: ipa-server-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-
-BuildRequires: selinux-policy-devel m4 make policycoreutils >= %{POLICYCOREUTILSVER}
-Requires(pre): policycoreutils >= %{POLICYCOREUTILSVER} libsemanage
-
-%description
-SELinux policy for ipa-server
-
-%prep
-%setup -n ipa-server-%{version} -q
-
-%build
-cd selinux
-make
-
-%clean
-%{__rm} -fR %{buildroot}
-
-%install
-%{__rm} -fR %{buildroot}
-cd selinux
-install -d %{buildroot}/%{_usr}/share/selinux/targeted/
-make DESTDIR=%{buildroot} install
-
-%files
-%{_usr}/share/selinux/targeted/ipa_webgui.pp
-%{_usr}/share/selinux/targeted/ipa_kpasswd.pp
-
-
-%define saveFileContext() \
-if [ -s /etc/selinux/config ]; then \
- . %{_sysconfdir}/selinux/config; \
- FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
- if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT} ]; then \
- cp -f ${FILE_CONTEXT} ${FILE_CONTEXT}.%{name}; \
- fi \
-fi;
-
-%define relabel() \
-. %{_sysconfdir}/selinux/config; \
-FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
-selinuxenabled; \
-if [ $? == 0 -a "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.%{name} ]; then \
- fixfiles -C ${FILE_CONTEXT}.%{name} restore; \
- rm -f ${FILE_CONTEXT}.%name; \
-fi;
-
-%pre
-%saveFileContext targeted
-
-%post
-semodule -s targeted -i /usr/share/selinux/targeted/ipa_webgui.pp /usr/share/selinux/targeted/ipa_kpasswd.pp
-%relabel targeted
-
-%preun
-if [ $1 = 0 ]; then
-%saveFileContext targeted
-fi
-
-%postun
-if [ $1 = 0 ]; then
-semodule -s targeted -r ipa_webgui ipa_kpasswd
-%relabel targeted
-fi
-
-%changelog
-* Thu Apr 3 2008 Rob Crittenden <rcritten@redhat.com> - 1.0.0-1
-- Version bump for release
-
-* Thu Feb 21 2008 Rob Crittenden <rcritten@redhat.com> - 0.99.0-1
-- Version bump for release
-
-* Thu Jan 17 2008 Karl MacMillan <kmacmill@redhat.com> - 0.6.0-1
-- Initial version