diff --git a/389-ds-base.spec b/389-ds-base.spec index 7722c54..944a466 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -1,16 +1,14 @@ %global pkgname dirsrv # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release -%global prerel .a2 +%global prerel .a3 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release %global relprefix 0. -%global selinux_variants strict targeted - Summary: 389 Directory Server (base) Name: 389-ds-base Version: 1.2.6 -Release: %{?relprefix}2%{?prerel}%{?dist} +Release: %{?relprefix}3%{?prerel}%{?dist} License: GPLv2 with exceptions URL: http://port389.org/ Group: System Environment/Daemons @@ -36,10 +34,6 @@ BuildRequires: bzip2-devel BuildRequires: zlib-devel BuildRequires: openssl-devel BuildRequires: tcp_wrappers -# The following are needed to build the SELinux policy -BuildRequires: checkpolicy -BuildRequires: selinux-policy-devel -BuildRequires: /usr/share/selinux/devel/Makefile # the following is for the pam passthru auth plug-in BuildRequires: pam-devel @@ -90,28 +84,12 @@ Obsoletes: fedora-ds-base-devel < 1.2.1-1 %description devel Development Libraries and headers for the 389 Directory Server base package. -%package selinux -Summary: SELinux policy for 389 Directory Server -Group: System Environment/Daemons -Requires: selinux-policy >= 2.4.6-203 -Requires: %{name} = %{version}-%{release} - -%description selinux -SELinux policy for the 389 Directory Server base package. - -%package selinux-devel -Summary: Development interface for 389 Directory Server base SELinux policy -Group: Development/Libraries - -%description selinux-devel -SELinux policy interface for the 389 Directory Server base package. - %prep %setup -q -n %{name}-%{version}%{?prerel} cp %{SOURCE2} README.devel %build -%configure --enable-autobind --with-selinux +%configure --enable-autobind # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS @@ -122,15 +100,6 @@ export USE_64=1 make %{?_smp_mflags} -# Build the SELinux policy module for each variant -cd selinux-built -for selinuxvariant in %{selinux_variants} -do - make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile - mv %{pkgname}.pp %{pkgname}.pp.${selinuxvariant} - make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean -done -cd - %install rm -rf $RPM_BUILD_ROOT @@ -154,23 +123,6 @@ install -p -m 644 ldap/servers/plugins/replication/winsync-plugin.h $RPM_BUILD_R # make sure perl scripts have a proper shebang sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/script-templates/template-*.pl -# Install the SELinux policy -cd selinux-built -for selinuxvariant in %{selinux_variants} -do - install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} - install -p -m 644 %{pkgname}.pp.${selinuxvariant} \ - %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{pkgname}.pp -done -cd - - -# Install the SELinux policy interface -cd selinux-built -install -d %{buildroot}%{_datadir}/%{pkgname}-selinux -install -p -m 644 %{pkgname}.if %{buildroot}%{_datadir}/%{pkgname}-selinux/%{pkgname}.if -install -p -m 644 %{pkgname}.te %{buildroot}%{_datadir}/%{pkgname}-selinux/%{pkgname}.te -install -p -m 644 %{pkgname}.fc %{buildroot}%{_datadir}/%{pkgname}-selinux/%{pkgname}.fc -cd - %clean rm -rf $RPM_BUILD_ROOT @@ -282,36 +234,6 @@ if %{pkgname}_exists then os.execute('/sbin/service %{pkgname} start >/dev/null 2>&1') end -%post selinux -if [ "$1" -le "1" ] ; then # First install -for selinuxvariant in %{selinux_variants} -do - semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/%{pkgname}.pp 2>/dev/null || : -done -fixfiles -R %{name} restore || : -/sbin/service %{pkgname} condrestart > /dev/null 2>&1 || : -/sbin/service %{pkgname}-snmp condrestart > /dev/null 2>&1 || : -fi - -%preun selinux -if [ "$1" -lt "1" ]; then # Final removal -for selinuxvariant in %{selinux_variants} -do - semodule -s ${selinuxvariant} -r %{pkgname} 2>/dev/null || : -done -fixfiles -R %{name} restore || : -/sbin/service %{pkgname} condrestart > /dev/null 2>&1 || : -/sbin/service %{pkgname}-snmp condrestart > /dev/null 2>&1 || : -fi - -%postun selinux -if [ "$1" -ge "1" ]; then # Upgrade -for selinuxvariant in %{selinux_variants} -do - semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/%{pkgname}.pp 2>/dev/null || : -done -fi - %files %defattr(-,root,root,-) @@ -347,15 +269,14 @@ fi %{_includedir}/%{pkgname} %{_libdir}/%{pkgname}/*.so -%files selinux -%defattr(-,root,root,-) -%{_datadir}/selinux/*/%{pkgname}.pp - -%files selinux-devel -%defattr(-,root,root,-) -%{_datadir}/%{pkgname}-selinux %changelog +* Tue Apr 6 2010 Nathan Kinder - 1.2.6-0.3.a3 +- 1.2.6.a3 release +- add managed entries plug-in +- removed selinux policy since EL4 doesn't support modules +- many bug fixes + * Mon Mar 2 2010 Rich Megginson - 1.2.6-0.2.a2 - 1.2.6.a2 release - add support for matching rules