rpms/389-admin/devel 389-admin-git-local.sh, NONE, 1.1 .cvsignore, 1.2, 1.3 389-admin.spec, 1.7, 1.8 sources, 1.5, 1.6

[Richard Allen Megginson]

Author: rmeggins

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

Modified Files:
	.cvsignore 389-admin.spec sources 
Added Files:
	389-admin-git-local.sh 
Log Message:
This is the 1.1.9 release
Added 389-admin-git-local.sh to construct a source tarball
from a local git repo and a tag - also grabs the correct
versions of mod_admserv and mod_restartd from CVS



--- NEW FILE 389-admin-git-local.sh ---
#!/bin/bash

DATE=`date +%Y%m%d`
TAG=389-admin-1.1.9
CVSTAG=three89Admin_1_1_9
VERSION=1.1.9
PKGNAME=389-admin
SRCNAME=${PKGNAME}-${VERSION}
CVSROOT=:pserver:anonymous at cvs.fedoraproject.org:/cvs/dirsec
echo you must be in the admin server git repo to use this
git status > /dev/null || echo bye
if [ -z "$1" ] ; then
	dir=.
else
	dir="$1"
fi
git archive --format=tar --prefix=$SRCNAME/ $TAG | ( cd $dir ; tar xf - ; cd $SRCNAME ; cvs -d "$CVSROOT" -z3 export -r$CVSTAG mod_admserv mod_restartd ; cd .. ; tar cfj $dir/$SRCNAME.tar.bz2 $SRCNAME )
rm -rf $dir/$SRCNAME


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 Jun 2009 02:36:44 -0000	1.2
+++ .cvsignore	7 Oct 2009 15:50:27 -0000	1.3
@@ -1 +1 @@
-389-admin-1.1.8.tar.bz2
+389-admin-1.1.9.tar.bz2


Index: 389-admin.spec
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/389-admin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- 389-admin.spec	25 Aug 2009 20:05:59 -0000	1.7
+++ 389-admin.spec	7 Oct 2009 15:50:27 -0000	1.8
@@ -2,8 +2,8 @@
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.8
-Release:          6%{?dist}
+Version:          1.1.9
+Release:          1%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -84,6 +84,25 @@ rm -rf $RPM_BUILD_ROOT
 -- if these don't exist, the vars will be nil
 %{pkgname}admin_adminserv = posix.stat('%{_sysconfdir}/%{pkgname}/admin-serv')
 %{pkgname}admin_consoleconf = posix.stat('%{_sysconfdir}/%{pkgname}/admin-serv/console.conf')
+-- save the run level configuration, if any
+rc = os.execute('rpm --quiet -q fedora-ds-admin')
+if rc == 0 then
+    %{pkgname}admin_exists = true
+    %{pkgname}admin_savelinks = {}
+    for dir in posix.files("%{_sysconfdir}/rc.d") do
+        if string.find(dir, "rc%d.d") then
+--          print("looking in %{_sysconfdir}/rc.d/"..dir)
+            for link in posix.files("%{_sysconfdir}/rc.d/"..dir) do
+                if string.find(link, "[SK]%d%d%{pkgname}-admin") then
+                    fullname = "%{_sysconfdir}/rc.d/"..dir.."/"..link
+                    linked = posix.readlink(fullname)
+--                  print(fullname.." is linked to "..linked)
+                    %{pkgname}_savelinks[fullname] = linked
+                end
+            end
+        end
+    end
+end
 
 %post -p <lua>
 -- do the usual daemon post setup stuff
@@ -107,6 +126,19 @@ fi
 
 %postun -p /sbin/ldconfig
 
+%posttrans -p <lua>
+-- if we saved the run level configuration in %pre, restore it now
+-- we can get rid of this code once Fedora 11 becomes obsolete
+if %{pkgname}admin_savelinks then
+    for fullpath,link in pairs(%{pkgname}admin_savelinks) do
+        posix.symlink(link,fullpath)
+--        print("posttrans - restored run level "..fullpath.." to "..link)
+    end
+end
+if %{pkgname}admin_exists then
+    os.execute('/sbin/service %{pkgname}-admin start >/dev/null 2>&1')
+end
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
@@ -121,6 +153,9 @@ fi
 %{_mandir}/man8/*
 
 %changelog
+* Mon Sep 14 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.9-1
+- the 1.1.9 release
+
 * Tue Aug 25 2009 Rich Megginson <rmeggins at redhat.com> - 1.1.8-6
 - rewrite perm/owner preservation code to use lua
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-admin/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	12 Aug 2009 20:00:08 -0000	1.5
+++ sources	7 Oct 2009 15:50:27 -0000	1.6
@@ -1 +1 @@
-62d9c76e138e1421db7ca515e445f022  389-admin-1.1.8.tar.bz2
+1f84413babbcd29035b8707f2ee9cea1  389-admin-1.1.9.tar.bz2