SPECS (AC-branch): rpm.spec - skip reading backups and rpmsave fil...

Wed Apr 26 23:55:17 CEST 2006

Author: glen                         Date: Wed Apr 26 21:55:17 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- skip reading backups and rpmsave files from /etc/rpm
- lockup fix for non-vanilla kernels (ck for example)

---- Files affected:
SPECS:
   rpm.spec (1.555.2.170 -> 1.555.2.171) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.555.2.170 SPECS/rpm.spec:1.555.2.171

--- SPECS/rpm.spec:1.555.2.170	Wed Apr 26 21:53:53 2006
+++ SPECS/rpm.spec	Wed Apr 26 23:55:11 2006
@@ -3,8 +3,6 @@
 # TODO:
 # - python(abi) cap is not provided automatically (because /usr/bin/python matches
 #   ELF first; it should be provided by python-libs not binary anyway)
-# - /etc/rpm/macros.rpm{new,old,save} should not be processed
-#   open("/etc/rpm/macros.rpmnew", O_RDONLY|O_LARGEFILE) = 3
 #
 # Conditional build:
 %bcond_with	static		# build static rpmi (not supported at the moment)
@@ -33,7 +31,7 @@
 Summary(uk):	íĹÎĹÄÖĹŇ ĐÁËĹÔŚ× ×ŚÄ RPM
 Name:		rpm
 Version:	4.4.2
-Release:	31.44
+Release:	31.50
 License:	GPL
 Group:		Base
 Source0:	ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -112,6 +110,8 @@
 Patch52:	%{name}-dep_whiteout.patch
 Patch53:	%{name}-doxygen_no_file.patch
 Patch54:	%{name}-truncate-cvslog.patch
+Patch55:	%{name}-bug-146549.patch
+Patch56:	%{name}-skip-backups.patch
 URL:		http://wraptastic.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -692,6 +692,8 @@
 %patch53 -p1
 %endif
 %patch54 -p1
+%patch55 -p1
+%patch56 -p1
 
 cd scripts
 mv -f perl.req perl.req.in
@@ -906,7 +908,7 @@
 done
 
 # remove arch dependant macros which have no use on noarch
-sed -i -e '
+%{__sed} -i -e '
 /{__spec_install_post_strip}/d
 /{__spec_install_post_chrpath}/d
 /{__spec_install_post_compress_modules}/d
@@ -1161,6 +1163,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.555.2.171  2006/04/26 21:55:11  glen
+- skip reading backups and rpmsave files from /etc/rpm
+- lockup fix for non-vanilla kernels (ck for example)
+
 Revision 1.555.2.170  2006/04/26 19:53:53  glen
 - changelog truncation patch
 - adapterize
@@ -1215,7 +1221,7 @@
 - add branch specific macros
 
 Revision 1.555.2.154  2005/10/29 14:51:51  bszx
- - rpm-p4.patch added: Pentium 4 540J is recognized as pentium4
+- rpm-p4.patch added: Pentium 4 540J is recognized as pentium4
 
 Revision 1.555.2.153  2005/10/28 21:10:00  glen
 - cleanup
@@ -1340,7 +1346,8 @@
 - BR libmagic-static for static subpackage
 
 Revision 1.555.2.112  2005/09/06 17:49:10  glen
-- obsolete older rpm_macros_rev from standalone rpm-macros package if we provide newer to prevent older macros doing bad things
+- obsolete older rpm_macros_rev from standalone rpm-macros package if
+  we provide newer to prevent older macros doing bad things
 
 Revision 1.555.2.111  2005/09/06 17:45:20  glen
 - rpm_macros_rev 1.236
@@ -1486,7 +1493,7 @@
 - fixed autoreqdep bcond
 
 Revision 1.555.2.68  2005/06/17 14:43:30  baggins
-- merged fro HEAD
+- merged from HEAD
 - version 4.4.1
 - release 0.1
 - please STBR test
@@ -1513,7 +1520,7 @@
 - more x8664 usage, amd64 patch already dropped (removed from todo)
 
 Revision 1.661  2005/05/11 12:53:04  qboosh
-- use ifarch %%{x8664} to allow using amd64/ia32e as buildarch
+- use ifarch %{x8664} to allow using amd64/ia32e as buildarch
 
 Revision 1.660  2005/05/11 10:53:06  qboosh
 - macros 1.213
@@ -1522,7 +1529,7 @@
 - merged getcwd patch from AC-branch
 
 Revision 1.658  2005/05/07 14:14:44  pluto
-- fixed quotation in %%{x8664} macro, release 1.8.
+- fixed quotation in %{x8664} macro, release 1.8.
 
 Revision 1.657  2005/05/07 01:05:22  pluto
 - macros rev. bumped to 1.211.
@@ -1700,21 +1707,21 @@
 - fix rpm vs symlinks
 
 Revision 1.604  2004/11/26 00:59:48  pzurowski
-- changed behaviour in -n and -t in %%banner
+- changed behaviour in -n and -t in %banner
 - added banner support to user_group.sh (PLEASE CHECK!)
 - release .5
 - req. macros rev. 1.177
 
 Revision 1.603  2004/11/24 10:02:57  pzurowski
-- added stderr support for %%banner
+- added stderr support for %banner
 - req. macro rev. 1.176
 - rel. .4
 
 Revision 1.602  2004/11/24 06:43:17  pzurowski
-- rewritten %%banner macro (now is much safer)
+- rewritten %banner macro (now is much safer)
 - req. macro rev. 1.175
 - rel .3
-- %%banner works for me
+- %banner works for me
 
 Revision 1.601  2004/11/23 16:04:59  saq
 - rpmmacros version up to 1.174
@@ -1726,7 +1733,7 @@
 Revision 1.599  2004/11/23 14:11:56  pzurowski
 - rpm macros rev = 1.170
 - release 0.snap.0.2
-- added banner.sh and %%banner support
+- added banner.sh and %banner support
 
 Revision 1.598  2004/11/21 21:34:35  arekm
 - add missing symlinks
@@ -1815,7 +1822,7 @@
 - release .0.5
 
 Revision 1.575  2004/08/20 23:38:25  ankry
-- %%{user,group}remove support really merged from AC-ranch
+- %{user,group}remove support really merged from AC-ranch
 
 Revision 1.574  2004/08/19 12:30:06  djurban
 - %define       rpm_macros_rev  1.161
@@ -1828,7 +1835,7 @@
 - -build R: cpio for debuginfo; release .0.4
 
 Revision 1.571  2004/07/28 08:03:19  troll
-- removed %%include /usr/lib/rpm/macros.python
+- removed %include /usr/lib/rpm/macros.python
 
 Revision 1.570  2004/07/24 13:37:57  havner
 - trying to fix what i broke
@@ -1838,7 +1845,7 @@
 
 Revision 1.567  2004/07/22 10:26:30  pluto
 - R(kernel-headers) added.
-  %%__kernel_rel uses %{_kernelsrcdir}/include/linux/fs.h.
+  %__kernel_rel uses %{_kernelsrcdir}/include/linux/fs.h.
 
 Revision 1.566  2004/07/14 22:33:48  qboosh
 - updated groups for no->nb transition
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.555.2.170&r2=1.555.2.171&f=u

