- avoid -L poisoning in *.la

[packages/rpm.git] / rpm-macros.patch

diff --git a/rpm-macros.patch b/rpm-macros.patch
index d03ae6083c0a457262e49a0e09525daa58b677c7..3257e0de96074ca7b6a8d92ff130c7a4c0bb6a58 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,41 +1,30 @@
-diff -Nur rpm-3.0.1/macros.in rpm-3.0.1.pld/macros.in
---- rpm-3.0.1/macros.in        Tue May 11 11:24:08 1999
-+++ rpm-3.0.1.pld/macros.in    Mon May 17 20:07:52 1999
-@@ -55,8 +55,8 @@
- %_builddir            %{_topdir}/BUILD
- %_buildshell          /bin/sh
- %_bzip2bin            @BZIP2BIN@
--%_dbpath              %{_var}/lib/rpm
--%_defaultdocdir               %{_usr}/doc
-+%_dbpath              %{_var}/db/rpm
-+%_defaultdocdir               %{_usr}/share/doc
- #
- # XXX fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
- %_fixowner            [ `%{__id} -u` = '0' ] && %{__chown} -Rf root
-@@ -69,13 +69,13 @@
- %_rpmdir              %{_topdir}/RPMS
- #
- # XXX Note escaped %% for use in headerSprintf
--%_rpmfilename         %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
-+%_rpmfilename         %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
- %_signature           none
- %_sourcedir           %{_topdir}/SOURCES
- %_specdir             %{_topdir}/SPECS
- %_srcrpmdir           %{_topdir}/SRPMS
+--- ./macros.in~       2005-10-30 16:24:30.000000000 +0200
++++ ./macros.in        2005-10-30 16:24:32.000000000 +0200
+@@ -223,7 +223,7 @@
  %_tmppath             %{_var}/tmp
+ 
+ #     Path to top of build area.
 -%_topdir              %{_usrsrc}/redhat
-+%_topdir              %(echo $HOME)/rpm
++%_topdir         %(echo $HOME)/rpm
+ 
+ #     The path to the unzip executable (legacy, use %{__unzip} instead).
+ %_unzipbin            %{__unzip}
+@@ -1276,5 +1276,18 @@
  #
- #==============================================================================
- # ---- Optional rpmrc macros.
-@@ -154,8 +154,8 @@
- %_libdir              %{_exec_prefix}/lib
- %_includedir          %{_prefix}/include
- %_oldincludedir               /usr/include
--%_infodir             %{_prefix}/include
--%_mandir              %{_prefix}/man
-+%_infodir             /usr/share/info
-+%_mandir              %{_prefix}/share/man
+ %find_lang    @RPMCONFIGDIR@/find-lang.sh %{buildroot}
  
- #==============================================================================
- # ---- config.guess platform macros.
++# PLD rpm macros
++%_enable_debug_packages 1
++
++#-----------------------------------------------------------------
++# CFLAGS and LDFLAGS used to build
++
++%debuginfocflags      %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -ggdb}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
++
++%debugcflags  -O0 -g -Wall
++%rpmcflags    %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
++%rpmcxxflags  %{rpmcflags}
++%rpmldflags   %{nil}
++
+ # \endverbatim
+ #*/