From e8af41b9b645261c3db11be9032d0f2cedfcda5c Mon Sep 17 00:00:00 2001
From: Richard Allen Megginson <rmeggins@fedoraproject.org>
Date: Aug 25 2009 20:00:51 +0000
Subject: backed out - added template-initconfig to %files - this change is for the

    next major release bump version to 1.2.2 fix reopened 509472 db2index
    all does not reindex all the db backends correctly fix 518520 - pre
    hashed salted passwords do not work (F-10 and F-11 only) fix 518418 -
    Package rename shuts down server, results in unconfigured package see
    https://bugzilla.redhat.com/show_bug.cgi?id=518519 for the list of bugs
    fixed in 1.2.2

---

diff --git a/.cvsignore b/.cvsignore
index ffd141e..a3005bb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 389-ds-base-1.2.1.tar.bz2
+389-ds-base-1.2.2.tar.bz2
diff --git a/389-ds-base.spec b/389-ds-base.spec
index f20dd94..ecd7e77 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -3,8 +3,8 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.1
-Release:          2%{?dist}
+Version:          1.2.2
+Release:          1%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -53,6 +53,9 @@ Requires:         db4-utils
 # This picks up libperl.so as a Requires, so we add this versioned one
 Requires:         perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# This is for the fedora-ds -> 389 run level hack
+Requires(posttrans): /sbin/service
+
 # for the init script
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -119,6 +122,30 @@ sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{pkgna
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre -p <lua>
+-- see if fedora-ds-base exists - if so, save the run level configuration
+-- and set a flag that tells us to restore that config in %posttrans
+-- and restart the server
+-- we can get rid of this code once Fedora 11 becomes obsolete
+rc = os.execute('rpm --quiet -q fedora-ds-base')
+if rc == 0 then
+    %{pkgname}_exists = true
+    %{pkgname}_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}") 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
 /sbin/chkconfig --add %{pkgname}
 /sbin/ldconfig
@@ -141,6 +168,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}_savelinks then
+    for fullpath,link in pairs(%{pkgname}_savelinks) do
+        posix.symlink(link,fullpath)
+--        print("posttrans - restored run level "..fullpath.." to "..link)
+    end
+end
+if %{pkgname}_exists then
+    os.execute('/sbin/service %{pkgname} start >/dev/null 2>&1')
+end
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE EXCEPTION LICENSE.GPLv2
@@ -150,7 +190,6 @@ fi
 %dir %{_sysconfdir}/%{pkgname}/config
 %config(noreplace)%{_sysconfdir}/%{pkgname}/config/slapd-collations.conf
 %config(noreplace)%{_sysconfdir}/%{pkgname}/config/certmap.conf
-%config(noreplace)%{_sysconfdir}/%{pkgname}/config/template-initconfig
 %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}
 %{_datadir}/%{pkgname}
 %{_sysconfdir}/rc.d/init.d/%{pkgname}
@@ -174,6 +213,15 @@ fi
 %{_libdir}/%{pkgname}/*.so
 
 %changelog
+* Thu Aug 20 2009 Rich Megginson <rmeggins@redhat.com> - 1.2.2-1
+- backed out - added template-initconfig to %files - this change is for the next major release
+- bump version to 1.2.2
+- fix reopened 509472 db2index all does not reindex all the db backends correctly
+- fix 518520 -  pre hashed salted passwords do not work
+- fix 518418 -  Package rename shuts down server, results in unconfigured package
+- see https://bugzilla.redhat.com/show_bug.cgi?id=518519 for the list of
+- bugs fixed in 1.2.2
+
 * Wed Aug 19 2009 Noriko Hosoi <nhosoi@redhat.com> - 1.2.1-2
 - added template-initconfig to %files
 
diff --git a/sources b/sources
index 718a352..e1525b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-49b7ebe34c9ea238b5d8f91c925c512b  389-ds-base-1.2.1.tar.bz2
+143564394e4ad20bf4ea96e3e8ce970a  389-ds-base-1.2.2.tar.bz2