rpms/389-admin/F-12 .cvsignore, 1.6, 1.7 389-admin-git-local.sh, 1.4, 1.5 389-admin-git.sh, 1.4, 1.5 389-admin.spec, 1.12, 1.13 sources, 1.9, 1.10

Thu Jan 21 00:04:28 UTC 2010

Author: rmeggins

Update of /cvs/extras/rpms/389-admin/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14687/F-12

Modified Files:
	.cvsignore 389-admin-git-local.sh 389-admin-git.sh 
	389-admin.spec sources 
Log Message:
this is the 1.1.10 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7

--- .cvsignore	14 Jan 2010 22:39:04 -0000	1.6
+++ .cvsignore	21 Jan 2010 00:04:28 -0000	1.7
@@ -1 +1 @@
-389-admin-1.1.10.a3.tar.bz2
+389-admin-1.1.10.tar.bz2


Index: 389-admin-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/389-admin-git-local.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 389-admin-git-local.sh	14 Jan 2010 22:39:04 -0000	1.4
+++ 389-admin-git-local.sh	21 Jan 2010 00:04:28 -0000	1.5
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.10.a3
+VERSION=1.1.10
 PKGNAME=389-admin
 TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}


Index: 389-admin-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/389-admin-git.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 389-admin-git.sh	14 Jan 2010 22:39:04 -0000	1.4
+++ 389-admin-git.sh	21 Jan 2010 00:04:28 -0000	1.5
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.10.a3
+VERSION=1.1.10
 PKGNAME=389-admin
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION


Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/389-admin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- 389-admin.spec	19 Jan 2010 19:39:44 -0000	1.12
+++ 389-admin.spec	21 Jan 2010 00:04:28 -0000	1.13
@@ -1,15 +1,13 @@
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field - comment out for official release
-%global prerel .a4
+###%global prerel
 # also need the relprefix field for a pre-release - also comment out for official release
-%global relprefix 0.
-
-%global selinux_variants mls targeted
+###%global relprefix
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
 Version:          1.1.10
-Release:          %{?relprefix}4%{?prerel}%{?dist}
+Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -29,12 +27,6 @@ BuildRequires:    apr-devel
 BuildRequires:    mod_nss
 BuildRequires:    389-adminutil-devel
 
-# The following are needed to build the SELinux policy
-BuildRequires:    checkpolicy
-BuildRequires:    selinux-policy-devel
-BuildRequires:    /usr/share/selinux/devel/Makefile
-BuildRequires:    389-ds-base-selinux-devel
-
 Requires:         389-ds-base
 Requires:         mod_nss
 # the following are needed for some of our scripts
@@ -57,22 +49,12 @@ for 389 Directory Server.  It provides s
 be used through a web browser.  It provides the authentication, access control,
 and CGI utilities used by the console.
 
-%package          selinux
-Summary:          SELinux policy for 389 Administration Server
-Group:            System Environment/Daemons
-Requires:         selinux-policy
-Requires:         %{name} = %{version}-%{release}
-Requires:         389-ds-base-selinux
-
-%description      selinux
-SELinux policy for the 389 Adminstration Server package.
-
 %prep
 %setup -q -n %{name}-%{version}%{?prerel}
 %patch1
 
 %build
-%configure --disable-rpath --with-selinux
+%configure --disable-rpath
 
 # Generate symbolic info for debuggers
 export XCFLAGS=$RPM_OPT_FLAGS
@@ -83,18 +65,6 @@ export USE_64=1
 
 make %{?_smp_mflags}
 
-# Build the SELinux policy module for each variant
-cd selinux-built
-cp %{_datadir}/%{pkgname}-selinux/%{pkgname}.if .
-cp %{_datadir}/%{pkgname}-selinux/%{pkgname}.te .
-for selinuxvariant in %{selinux_variants}
-do
-  make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
-  mv %{pkgname}-admin.pp %{pkgname}-admin.pp.${selinuxvariant}
-  make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
-done
-cd -
-
 %install
 rm -rf $RPM_BUILD_ROOT 
 
@@ -110,16 +80,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.la
 
-# Install the SELinux policy
-cd selinux-built
-for selinuxvariant in %{selinux_variants}
-do
-  install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
-  install -p -m 644 %{pkgname}-admin.pp.${selinuxvariant} \
-    %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{pkgname}-admin.pp
-done
-cd -
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -183,34 +143,6 @@ if %{pkgname}admin_exists then
     os.execute('/sbin/service %{pkgname}-admin 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}-admin.pp 2>/dev/null || :
-done
-fixfiles -R %{name} restore || :
-/sbin/service %{pkgname}-admin 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}-admin 2>/dev/null || :
-done
-fixfiles -R %{name} restore || :
-/sbin/service %{pkgname}-admin 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}-admin.pp 2>/dev/null || :
-done
-fi
-
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
@@ -224,14 +156,10 @@ fi
 %{_libdir}/%{pkgname}
 %{_mandir}/man8/*
 
-%files selinux
-%defattr(-,root,root,-)
-%{_datadir}/selinux/*/%{pkgname}-admin.pp
-
 %changelog
-* Mon Jan 18 2010 Nathan Kinder <nkinder at redhat.com> - 1.1.10.a4-0.4
-- the 1.1.10.a4 release
-- added SELinux subpackage
+* Wed Jan 20 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.10-1
+- the 1.1.10 release
+- allow server to run unconfined if not built with selinux support
 
 * Thu Jan 14 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.10.a3-0.3
 - the 1.1.10.a3 release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-admin/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Jan 2010 22:39:04 -0000	1.9
+++ sources	21 Jan 2010 00:04:28 -0000	1.10
@@ -1 +1 @@
-9379a20ef8ea32d779eb9b034048036a  389-admin-1.1.10.a3.tar.bz2
+55f4b856e31916a7fa05afe5b15be9c4  389-admin-1.1.10.tar.bz2

