SPECS: rpm-macros.spec - add conflicts on rpm < 4.4.1 because in r...

glen glen at pld-linux.org
Sun Jun 19 21:14:21 CEST 2005


Author: glen                         Date: Sun Jun 19 19:14:21 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add conflicts on rpm < 4.4.1 because in rpm.macros currently in AC-branch
  will expand in %install _enable_debug_packages, even if it's defined to 0.
  i think it's bug by itself (no way to disable _enable_debug_packages by
  redefining it to 0, other than %undefining it?)
  rpm-4.4.1:
  %install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
  %%install\
  rpm-4.3-0.20040107.62:
  %install \
  %if 0%{?_enable_debug_packages}\
  %{?buildsubdir:%{debug_package}}\
  %endif\
  %%install\

---- Files affected:
SPECS:
   rpm-macros.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/rpm-macros.spec
diff -u SPECS/rpm-macros.spec:1.6 SPECS/rpm-macros.spec:1.7
--- SPECS/rpm-macros.spec:1.6	Sun Jun 19 20:01:19 2005
+++ SPECS/rpm-macros.spec	Sun Jun 19 21:14:16 2005
@@ -14,6 +14,7 @@
 Source0:	rpm.macros
 Provides:	rpmbuild(macros) = %{rpm_macros_rev}
 Requires:	rpm-build
+Conflicts:	rpm < 4.4.1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,6 +47,23 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/06/19 19:14:16  glen
+- add conflicts on rpm < 4.4.1 because in rpm.macros currently in AC-branch
+  will expand in %install _enable_debug_packages, even if it's defined to 0.
+  i think it's bug by itself (no way to disable _enable_debug_packages by
+  redefining it to 0, other than %undefining it?)
+
+  rpm-4.4.1:
+  %install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
+  %%install\
+
+  rpm-4.3-0.20040107.62:
+  %install \
+  %if 0%{?_enable_debug_packages}\
+  %{?buildsubdir:%{debug_package}}\
+  %endif\
+  %%install\
+
 Revision 1.6  2005/06/19 18:01:19  glen
 - version eq rpm_macros_rev
 - rpm.macros will be overwritten with a upgrade
================================================================

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




More information about the pld-cvs-commit mailing list