OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 27-Aug-2003 11:52:25
Branch: HEAD Handle: 2003082710522302
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec
openpkg-web news.txt
Log:
enhance and fix %post script to correctly rebuild RPM DB and import
OpenPGP public key
Summary:
Revision Changes Path
1.32 +1 -0 openpkg-src/openpkg/HISTORY
1.197 +18 -15 openpkg-src/openpkg/openpkg.spec
1.6308 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.31 -r1.32 HISTORY
--- openpkg-src/openpkg/HISTORY 26 Aug 2003 13:55:17 -0000 1.31
+++ openpkg-src/openpkg/HISTORY 27 Aug 2003 09:52:25 -0000 1.32
@@ -2,6 +2,7 @@
2003
====
+20030827 enhance and fix %post script to correctly rebuild RPM DB and import
OpenPGP public key
20030826 **** MAJOR UPGRADE FROM RPM 4.0.2 TO RPM 4.2.1 ****
20030820 name internal bootstrapping tarball just .tar instead of .tar.Z -- it is
no longer compressed.
20030806 fix "rcTmp -f" functionality
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.196 -r1.197 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 26 Aug 2003 15:35:22 -0000 1.196
+++ openpkg-src/openpkg/openpkg.spec 27 Aug 2003 09:52:25 -0000 1.197
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030826
+%define V_openpkg 20030827
# the used software versions
%define V_rpm 4.2.1
@@ -1518,18 +1518,13 @@
fi
%post
- # On upgrades (especially from OpenPKG 1.2 or earlier), make
- # sure the OpenPKG OpenPGP public key is available to RPM for
- # out-of-the-box package signature verification.
- if [ ".$1" = .2 ]; then
- %{l_prefix}/bin/rpm -q gpg-pubkey-63c4cb9f-3c591eda >/dev/null 2>&1 || \
- %{l_prefix}/bin/rpm --import %{l_prefix}/etc/openpkg/openpkg.pgp
- fi
-
- # Finally, rebuild the RPM database with the newly installed RPM
- # program on upgrades. Because of RPM internal database locking we
- # have to play a little trick here and delay the operation until RPM
- # thinks this "post" script has already terminated.
+ # Finally, rebuild the RPM database with the newly installed
+ # RPM program on upgrades (especially important on upgrade from
+ # RPM-4.0.x/DB-3.2.x to RPM-4.2.x/DB-4.1.x in order to upgrade
+ # from DB version 7 to DB version 8 hash format files). Because
+ # of RPM internal database locking we have to play a little trick
+ # here and delay the operation until RPM thinks this "%post"
+ # script has already terminated.
if [ ".$1" = .2 ]; then
( # wait until RPM has released the database
i=0
@@ -1538,10 +1533,15 @@
sleep 1
i=`expr $i + 1`
done
+
# rebuild the RPM database
- # (especially important on upgrade from RPM-4.0.x/DB-3.2.x in order
- # to upgrade from DB version 7 to DB version 8 format files)
%{l_prefix}/bin/rpm --rebuilddb || true
+
+ # import OpenPKG OpenPGP public key into RPM database
+ %{l_prefix}/bin/rpm -q gpg-pubkey-63c4cb9f-3c591eda >/dev/null 2>&1 || \
+ %{l_prefix}/bin/rpm --import %{l_prefix}/etc/openpkg/openpkg.pgp ||
true
+
+ # fix ownership of (especially newly created) RPM database files
chown %{l_musr}:%{l_mgrp} %{l_prefix}/RPM/DB/* || true
) </dev/null >/dev/null 2>/dev/null &
fi
@@ -1786,6 +1786,9 @@
# delayed removal of top-level directory.
( sleep 10
+ rm -rf %{l_prefix}/RPM/DB/* %{l_prefix}/RPM/DB/.[a-z]* >/dev/null 2>&1 || true
+ rmdir %{l_prefix}/RPM/DB >/dev/null 2>&1 || true
+ rmdir %{l_prefix}/RPM >/dev/null 2>&1 || true
rmdir %{l_prefix} >/dev/null 2>&1 || true
) </dev/null >/dev/null 2>/dev/null &
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6307 -r1.6308 news.txt
--- openpkg-web/news.txt 27 Aug 2003 08:03:46 -0000 1.6307
+++ openpkg-web/news.txt 27 Aug 2003 09:52:23 -0000 1.6308
@@ -1,3 +1,4 @@
+27-Aug-2003: Upgraded package: P<openpkg-20030827-20030827>
27-Aug-2003: Upgraded package: P<orbit2-2.8.0-20030827>
27-Aug-2003: Upgraded package: P<perl-wx-20030827-20030827>
27-Aug-2003: Upgraded package: P<gtk2-2.2.3-20030827>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
