SPECS (AC-branch): rpm.spec - rpm handles non-orphaned file->dir o...

[glen]

Author: glen                         Date: Mon Apr  7 19:33:09 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- rpm handles non-orphaned file->dir okay. remove pretrans to skip confusing error on clean install; rel 62

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.37 -> 1.837.2.42.2.38) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.37 SPECS/rpm.spec:1.837.2.42.2.38
--- SPECS/rpm.spec:1.837.2.42.2.37	Mon Apr  7 21:01:23 2008
+++ SPECS/rpm.spec	Mon Apr  7 21:33:03 2008
@@ -36,7 +36,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.4.9
-Release:	61
+Release:	62
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -907,7 +907,6 @@
 install %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/banner.sh
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo
-
 touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Conflictname
 touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Dirnames
 install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Filelinktos
@@ -1097,14 +1096,6 @@
 fi
 echo >&2 "You should rebuild your rpmdb: rpm --rebuilddb to avoid random rpmdb errors"
 
-%pretrans
-# this needs to be a dir
-if [ -f %{_sysconfdir}/rpm/sysinfo ]; then
-	umask 022
-	mv -f %{_sysconfdir}/rpm/sysinfo{,.rpmsave}
-	mkdir %{_sysconfdir}/rpm/sysinfo
-fi
-
 %triggerpostun -- %{name} < 4.4.9-44
 %{_rpmlibdir}/hrmib-cache
 
@@ -1344,6 +1335,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.38  2008-04-07 19:33:03  glen
+- rpm handles non-orphaned file->dir okay. remove pretrans to skip confusing error on clean install; rel 62
+
 Revision 1.837.2.42.2.37  2008-04-07 19:01:23  glen
 - fix for erase-before-install problem; rel 61
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.42.2.37&r2=1.837.2.42.2.38&f=u