SOURCES: rpm-doxygen_hack.patch, rpm-macros-th.patch, rpm-macros.p...

[glen]

Author: glen                         Date: Sun Apr 13 16:25:43 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update to 5.1b2

---- Files affected:
SOURCES:
   rpm-doxygen_hack.patch (1.10 -> 1.11) , rpm-macros-th.patch (1.3 -> 1.4) , rpm-macros.patch (1.45 -> 1.46) 

---- Diffs:

================================================================
Index: SOURCES/rpm-doxygen_hack.patch
diff -u SOURCES/rpm-doxygen_hack.patch:1.10 SOURCES/rpm-doxygen_hack.patch:1.11
--- SOURCES/rpm-doxygen_hack.patch:1.10	Sat Jan  5 22:33:18 2008
+++ SOURCES/rpm-doxygen_hack.patch	Sun Apr 13 18:25:38 2008
@@ -1,10 +1,10 @@
---- rpm-4.4.9/Doxyfile.in.orig	2007-05-13 05:20:43.000000000 +0200
-+++ rpm-4.4.9/Doxyfile.in	2007-05-22 17:41:12.107028314 +0200
-@@ -504,7 +504,6 @@
+--- rpm-5.1b2/Doxyfile.in~	2008-04-13 19:14:33.000000000 +0300
++++ rpm-5.1b2/Doxyfile.in	2008-04-13 19:15:06.904571320 +0300
+@@ -503,7 +503,6 @@
                           @top_srcdir@/doc/manual/spec \
                           @top_srcdir@/doc/manual/triggers \
                           @top_srcdir@/doc/manual/tsort \
 -                         @top_srcdir@/file/src/tar.h \
-                          @top_srcdir@/lib/cpio.c \
-                          @top_srcdir@/lib/cpio.h \
                           @top_srcdir@/lib/depends.c \
+                          @top_srcdir@/lib/formats.c \
+                          @top_srcdir@/lib/fs.c \

================================================================
Index: SOURCES/rpm-macros-th.patch
diff -u SOURCES/rpm-macros-th.patch:1.3 SOURCES/rpm-macros-th.patch:1.4
--- SOURCES/rpm-macros-th.patch:1.3	Fri Apr  4 22:18:42 2008
+++ SOURCES/rpm-macros-th.patch	Sun Apr 13 18:25:38 2008
@@ -1,5 +1,5 @@
---- rpm-5.0.3/macros.in	2008-03-27 19:38:53.797722786 +0200
-+++ rpm-4.4.9/macros.in	2008-04-04 23:06:29.374285032 +0300
+--- rpm-5.1b2/macros.in~	2008-04-13 19:16:37.000000000 +0300
++++ rpm-5.1b2/macros.in	2008-04-13 19:16:57.396520131 +0300
 @@ -282,6 +282,9 @@
  #
  #%distribution
@@ -10,10 +10,11 @@
  #	Configurable distribution URL, same as DistURL: tag in a specfile.
  #	The URL will be used to supply reliable information to tools like
  #	rpmfind.
-@@ -1464,6 +1467,7 @@
+@@ -1625,7 +1625,7 @@
  # -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
  
  %debugcflags	-O0 -g -Wall
+-%optldflags	-Wl,--as-needed
 +%optldflags	-Wl,--as-needed -Wl,-z,relro -Wl,-z,-combreloc
  
  # Warning: those macros are overwritten by macros.build,

================================================================
Index: SOURCES/rpm-macros.patch
diff -u SOURCES/rpm-macros.patch:1.45 SOURCES/rpm-macros.patch:1.46
--- SOURCES/rpm-macros.patch:1.45	Tue Oct  2 20:49:40 2007
+++ SOURCES/rpm-macros.patch	Sun Apr 13 18:25:38 2008
@@ -46,15 +46,6 @@
  
  #	Archive formats to use for source/binary package payloads.
  #		"cpio"		cpio archive (default)
-@@ -522,7 +522,7 @@
- 
- #
- # Path to magic file used for file classification.
--%_rpmfc_magic_path	%{_rpmhome}/magic
-+%_rpmfc_magic_path	/usr/share/file/magic
- 
- #==============================================================================
- # ---- Database configuration macros.
 @@ -1224,17 +1224,17 @@
  %_exec_prefix		%{_prefix}
  %_bindir		%{_exec_prefix}/bin
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-doxygen_hack.patch?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-macros-th.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-macros.patch?r1=1.45&r2=1.46&f=u