From cad1c310aac361cb8f07ffaa77e8ce8a5d6dda98 Mon Sep 17 00:00:00 2001 From: jbj Date: Fri, 27 Dec 2002 16:12:09 +0000 Subject: [PATCH] - add BETA-GPG-KEY (but not in headers using %%pubkey yet). CVS patchset: 5975 CVS date: 2002/12/27 16:12:09 --- CHANGES | 1 + Makefile.am | 2 +- build/rpmfc.c | 2 +- rpm.spec.in | 6 ++++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 1859924..6bcbb92 100644 --- a/CHANGES +++ b/CHANGES @@ -77,6 +77,7 @@ - add %%pubkey attribute to read armored pubkey files into header. - permit both relative/absolute paths, display 'P' when verifying. - resurrect automagic perl(foo) dependency generation. + - add BETA-GPG-KEY (but not in headers using %%pubkey yet). 4.0.4 -> 4.1: - loosely wire beecrypt library into rpm. diff --git a/Makefile.am b/Makefile.am index d66bfa4..fea3e87 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign LINT = splint EXTRA_DIST = CHANGES CREDITS Doxyheader GROUPS README.amiga INSTALL \ - RPM-GPG-KEY RPM-PGP-KEY \ + RPM-PGP-KEY RPM-GPG-KEY BETA-GPG-KEY \ autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \ config.site db db3/configure gendiff installplatform platform* \ xmlspec/Makefile xmlspec/*.c xmlspec/*.h \ diff --git a/build/rpmfc.c b/build/rpmfc.c index 905b091..679753e 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c @@ -708,7 +708,7 @@ static int rpmfcSCRIPT(rpmfc fc) if (fc->fcolor->vals[fc->ix] & RPMFC_PERL) { xx = rpmfcHelper(fc, 'P', "perl"); - if (is_executable) + if (is_executable || fc->fcolor->vals[fc->ix] & RPMFC_TEXT) xx = rpmfcHelper(fc, 'R', "perl"); } if (fc->fcolor->vals[fc->ix] & RPMFC_PYTHON) { diff --git a/rpm.spec.in b/rpm.spec.in index f8b0257..fd7abb1 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -15,7 +15,7 @@ Name: rpm %define version @VERSION@ Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 0.39 +Release: 0.40 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Copyright: GPL @@ -232,7 +232,6 @@ exit 0 %files %defattr(-,root,root) %doc RPM-PGP-KEY RPM-GPG-KEY BETA-GPG-KEY CHANGES GROUPS doc/manual/[a-z]* -%pubkey RPM-PGP-KEY RPM-GPG-KEY BETA-GPG-KEY %attr(0755, @RPMUSER@, @RPMGROUP@) /bin/rpm %ifos linux @@ -456,6 +455,9 @@ exit 0 %{__prefix}/include/popt.h %changelog +* Fri Dec 27 2002 Jeff Johnson 4.2-0.40 +- add BETA-GPG-KEY (but not in headers using %%pubkey yet). + * Thu Dec 26 2002 Jeff Johnson 4.2-0.39 - add Red Hat pubkeys to rpm header. - resurrect automagic perl(foo) dependency generation. -- 2.7.4