summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2003-12-28 18:27:40 +0000
committerjbj <devnull@localhost>2003-12-28 18:27:40 +0000
commitf5580509bf9a5d6df7afa6ea34a281f270d3a6be (patch)
treeb3dbb24a2dae10e3cac5292fe65f48d6a335738f
parentae5e64ce0d32b6f933639991c77ad70d20d45c1c (diff)
downloadrpm-f5580509bf9a5d6df7afa6ea34a281f270d3a6be.tar.gz
rpm-f5580509bf9a5d6df7afa6ea34a281f270d3a6be.tar.bz2
rpm-f5580509bf9a5d6df7afa6ea34a281f270d3a6be.zip
revert using perldeps.pl, not yet ready.
CVS patchset: 7044 CVS date: 2003/12/28 18:27:40
-rw-r--r--CHANGES1
-rw-r--r--macros.in12
2 files changed, 6 insertions, 7 deletions
diff --git a/CHANGES b/CHANGES
index cccf6ec31..3e39d6948 100644
--- a/CHANGES
+++ b/CHANGES
@@ -30,7 +30,6 @@
- mark _javadocdir as documentation (#102898).
- flush pipe before exit 1 in check-files (#103867).
- perl.req: avoid regex misfire on '^use' in "= <<" assign (#109934).
- - use perldeps {--provides|--requires}.
- find-debuginfo.sh: permit stripping unwritable by non-root (#112429).
- missing build dependency (#111104).
diff --git a/macros.in b/macros.in
index 5a0c8c3cc..1cab4b978 100644
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
# \verbatim
#
-# $Id: macros.in,v 1.143 2003/12/28 15:14:40 jbj Exp $
+# $Id: macros.in,v 1.144 2003/12/28 18:27:40 jbj Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -366,11 +366,11 @@ package or when debugging this package.\
# Path to scripts to autogenerate per-interpreter package dependencies,
#
# Note: Used iff _use_internal_dependency_generator is non-zero. The
-# helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires).
-%__perl_provides @RPMCONFIGDIR@/perldeps --provides
-%__perl_requires @RPMCONFIGDIR@/perldeps --requires
-#%__perl_provides @RPMCONFIGDIR@/perl.prov
-#%__perl_requires @RPMCONFIGDIR@/perl.req
+# helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires}.
+#%__perl_provides @RPMCONFIGDIR@/perldeps.pl --provides
+#%__perl_requires @RPMCONFIGDIR@/perldeps.pl --requires
+%__perl_provides @RPMCONFIGDIR@/perl.prov
+%__perl_requires @RPMCONFIGDIR@/perl.req
#
# fixowner, fixgroup, and fixperms are run at the end of hardcoded setup