rpms/fedora-ds-admin/devel .cvsignore, 1.5, 1.6 fedora-ds-admin-cvs.sh, 1.4, 1.5 fedora-ds-admin.spec, 1.6, 1.7 sources, 1.5, 1.6

[Richard Allen Megginson]

Author: rmeggins

Update of /cvs/extras/rpms/fedora-ds-admin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30898/devel

Modified Files:
	.cvsignore fedora-ds-admin-cvs.sh fedora-ds-admin.spec sources 
Log Message:
this is the 1.1.7 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Sep 2008 14:53:00 -0000	1.5
+++ .cvsignore	1 Apr 2009 20:02:21 -0000	1.6
@@ -1,2 +1 @@
-fedora-ds-admin-1.1.5.tar.bz2
-fedora-ds-admin-1.1.6.tar.bz2
+fedora-ds-admin-1.1.7.tar.bz2


Index: fedora-ds-admin-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/fedora-ds-admin-cvs.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-ds-admin-cvs.sh	4 Sep 2008 14:53:00 -0000	1.4
+++ fedora-ds-admin-cvs.sh	1 Apr 2009 20:02:21 -0000	1.5
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSrvAdmin_1_1_6
-VERSION=1.1.6
+CVSTAG=FedoraDirSrvAdmin_1_1_7_RC1
+VERSION=1.1.7
 PKGNAME=fedora-ds-admin
 export CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
 #SRCNAME=$PKGNAME-$VERSION-$DATE


Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/fedora-ds-admin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-ds-admin.spec	24 Feb 2009 16:24:13 -0000	1.6
+++ fedora-ds-admin.spec	1 Apr 2009 20:02:21 -0000	1.7
@@ -3,8 +3,8 @@
 
 Summary:          Fedora Administration Server (admin)
 Name:             fedora-ds-admin
-Version:          1.1.6
-Release:          3%{?dist}
+Version:          1.1.7
+Release:          1%{?dist}
 License:          GPLv2
 URL:              http://directory.fedoraproject.org/
 Group:            System Environment/Daemons
@@ -76,10 +76,54 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+# save permission info in temp file
+# if upgrading
+if [ "$1" -gt 1 ] ; then
+    set -x
+    mydt=`date +%Y%m%d`
+    mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID
+    perm1=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null`
+    if [ -z "$perm1" ] ; then
+        perm1=0
+    fi
+    own1=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null`
+    if [ -z "$own1" ] ; then
+        own1=0
+    fi
+    perm2=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null`
+    if [ -z "$perm2" ] ; then
+        perm2=0
+    fi
+    own2=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null`
+    if [ -z "$own2" ] ; then
+        own2=0
+    fi
+    echo $perm1 $own1 $perm2 $own2 > $mytmpfile
+fi
+
 %post
 /sbin/chkconfig --add %{pkgname}-admin
 /sbin/ldconfig
-
+# if installing for the first time, make sure the config
+# directory and file have the correct permissions
+# the setup script is used to "fix" these
+if [ "$1" -gt 1 ]; then
+    set -x
+    mydt=`date +%Y%m%d`
+    mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID
+    if [ ! -f $mytmpfile ] ; then
+        echo Error: upgrade temp file $mytmpfile not found
+        exit 1
+    fi
+    cat $mytmpfile | while read perm1 own1 perm2 own2 ; do
+        chmod $perm1 %{_sysconfdir}/%{pkgname}/admin-serv
+        chown $own1 %{_sysconfdir}/%{pkgname}/admin-serv
+        chmod $perm2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf
+        chown $own2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf
+    done
+    rm -f $mytmpfile
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -100,8 +144,18 @@
 %{_sbindir}/*
 %{_libdir}/*.so.*
 %{_libdir}/%{pkgname}
+%{_mandir}/man8/*
 
 %changelog
+* Tue Mar 31 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.7-1
+- this is the 1.1.7 release
+- added man pages for setup, migration, remove commands
+- better error handling for command line utilities
+- fixed remove from console
+- added remove-ds-admin.pl
+- added pre and post sections in order to preserve the permissions and ownerships
+- CVS tag FedoraDirSrvAdmin_1_1_7_RC1 FedoraDirSrvAdmin_1_1_7_RC1_20090331
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-admin/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Sep 2008 14:53:00 -0000	1.5
+++ sources	1 Apr 2009 20:02:21 -0000	1.6
@@ -1,2 +1 @@
-766c2ab5a7659450ac9fb37fac5ddeb5  fedora-ds-admin-1.1.5.tar.bz2
-63a2b5f4496d0cb4b067160fc9da5fd8  fedora-ds-admin-1.1.6.tar.bz2
+531313c0991f27c9c7b91cdbaaa8fd75  fedora-ds-admin-1.1.7.tar.bz2