- don't generate dependencies unless execute bit is set.
- enable internal automagic dependency generation as default. CVS patchset: 5926 CVS date: 2002/12/09 17:22:55
This commit is contained in:
parent
1b650d04ab
commit
971303be3e
2
CHANGES
2
CHANGES
|
@ -41,6 +41,8 @@
|
||||||
- use usrlib_LTLIBRARIES to install directly in /usr/lib64 instead.
|
- use usrlib_LTLIBRARIES to install directly in /usr/lib64 instead.
|
||||||
- late rpmts reference causes premature free (#78862).
|
- late rpmts reference causes premature free (#78862).
|
||||||
- internal automagic dependency generation (disabled for now).
|
- internal automagic dependency generation (disabled for now).
|
||||||
|
- don't generate dependencies unless execute bit is set.
|
||||||
|
- enable internal automagic dependency generation as default.
|
||||||
|
|
||||||
4.0.4 -> 4.1:
|
4.0.4 -> 4.1:
|
||||||
- loosely wire beecrypt library into rpm.
|
- loosely wire beecrypt library into rpm.
|
||||||
|
|
|
@ -962,7 +962,7 @@ int rpmfcApply(rpmfc fc)
|
||||||
const char * N;
|
const char * N;
|
||||||
const char * EVR;
|
const char * EVR;
|
||||||
int_32 Flags;
|
int_32 Flags;
|
||||||
rpmfcApplyTbl fcat;
|
struct stat sb, * st = &sb;
|
||||||
unsigned char deptype;
|
unsigned char deptype;
|
||||||
int nddict;
|
int nddict;
|
||||||
int previx;
|
int previx;
|
||||||
|
@ -974,6 +974,13 @@ int rpmfcApply(rpmfc fc)
|
||||||
|
|
||||||
/* Generate package and per-file dependencies. */
|
/* Generate package and per-file dependencies. */
|
||||||
for (fc->ix = 0; fc->fn[fc->ix] != NULL; fc->ix++) {
|
for (fc->ix = 0; fc->fn[fc->ix] != NULL; fc->ix++) {
|
||||||
|
rpmfcApplyTbl fcat;
|
||||||
|
|
||||||
|
/* Files with executable bit set only. */
|
||||||
|
if (stat(fc->fn[fc->ix], st) != 0
|
||||||
|
|| !(st->st_mode & (S_IXUSR|S_IXGRP|S_IXOTH)))
|
||||||
|
continue;
|
||||||
|
|
||||||
for (fcat = rpmfcApplyTable; fcat->func != NULL; fcat++) {
|
for (fcat = rpmfcApplyTable; fcat->func != NULL; fcat++) {
|
||||||
if (!(fc->fcolor->vals[fc->ix] & fcat->colormask))
|
if (!(fc->fcolor->vals[fc->ix] & fcat->colormask))
|
||||||
/*@innercontinue@*/ continue;
|
/*@innercontinue@*/ continue;
|
||||||
|
@ -1324,7 +1331,7 @@ int rpmfcGenerateDepends(const Spec spec, Package pkg)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* If new-fangled dependency generation is disabled ... */
|
/* If new-fangled dependency generation is disabled ... */
|
||||||
if (!rpmExpandNumeric("%{?_classify_file_types}")) {
|
if (!rpmExpandNumeric("%{?_use_internal_dependency_generator}")) {
|
||||||
/* ... then generate dependencies using %{__find_requires} et al. */
|
/* ... then generate dependencies using %{__find_requires} et al. */
|
||||||
rc = rpmfcGenerateDependsHelper(spec, pkg, fi);
|
rc = rpmfcGenerateDependsHelper(spec, pkg, fi);
|
||||||
/*@-noeffect@*/
|
/*@-noeffect@*/
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
|
#/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
|
||||||
# \verbatim
|
# \verbatim
|
||||||
#
|
#
|
||||||
# $Id: macros.in,v 1.128 2002/11/20 15:13:03 jbj Exp $
|
# $Id: macros.in,v 1.129 2002/12/09 17:22:55 jbj Exp $
|
||||||
#
|
#
|
||||||
# This is a global RPM configuration file. All changes made here will
|
# This is a global RPM configuration file. All changes made here will
|
||||||
# be lost when the rpm package is upgraded. Any per-system configuration
|
# be lost when the rpm package is upgraded. Any per-system configuration
|
||||||
|
@ -107,6 +107,7 @@
|
||||||
# The location of the rpm database file(s) after "rpm --rebuilddb".
|
# The location of the rpm database file(s) after "rpm --rebuilddb".
|
||||||
%_dbpath_rebuild %{_dbpath}
|
%_dbpath_rebuild %{_dbpath}
|
||||||
|
|
||||||
|
#
|
||||||
# Path to script that creates debug symbols in a /usr/lib/debug
|
# Path to script that creates debug symbols in a /usr/lib/debug
|
||||||
# shadow tree.
|
# shadow tree.
|
||||||
%__debug_install_post \
|
%__debug_install_post \
|
||||||
|
@ -129,17 +130,19 @@ package or when debugging this package. \
|
||||||
|
|
||||||
%_defaultdocdir %{_usr}/doc
|
%_defaultdocdir %{_usr}/doc
|
||||||
|
|
||||||
|
# Use internal dependency generator rather than external
|
||||||
|
# find-provides/find-requires)?
|
||||||
|
%_use_internal_dependency_generator 1
|
||||||
|
|
||||||
# Path to scripts to autogenerate package dependencies.
|
# Path to scripts to autogenerate package dependencies.
|
||||||
%__find_provides @RPMCONFIGDIR@/rpmdeps --provides
|
%__find_provides @RPMCONFIGDIR@/rpmdeps --provides
|
||||||
%__find_requires @RPMCONFIGDIR@/rpmdeps --requires
|
%__find_requires @RPMCONFIGDIR@/rpmdeps --requires
|
||||||
#%__find_prereq ???
|
|
||||||
#%__find_conflicts ???
|
#%__find_conflicts ???
|
||||||
#%__find_obsoletes ???
|
#%__find_obsoletes ???
|
||||||
|
|
||||||
%__perl_provides @RPMCONFIGDIR@/perl.prov
|
%__perl_provides @RPMCONFIGDIR@/perl.prov
|
||||||
%__perl_requires @RPMCONFIGDIR@/perl.req
|
%__perl_requires @RPMCONFIGDIR@/perl.req
|
||||||
|
|
||||||
#
|
|
||||||
# fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
|
# fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
|
||||||
# These macros are necessary only for legacy compatibility, and have moved
|
# These macros are necessary only for legacy compatibility, and have moved
|
||||||
# to per-platform macro configuration (i.e. @RPMCONFIGDIR@/<arch>-<os>/macros)
|
# to per-platform macro configuration (i.e. @RPMCONFIGDIR@/<arch>-<os>/macros)
|
||||||
|
|
|
@ -60,7 +60,7 @@ if (_rpmbc_debug)
|
||||||
fprintf(stderr, "*** rpmbc_dealloc(%p)\n", s);
|
fprintf(stderr, "*** rpmbc_dealloc(%p)\n", s);
|
||||||
|
|
||||||
mp32nfree(&s->n);
|
mp32nfree(&s->n);
|
||||||
PyMem_DEL(s);
|
PyObject_DEL(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
|
|
@ -16,7 +16,7 @@ Name: rpm
|
||||||
%define version @VERSION@
|
%define version @VERSION@
|
||||||
Version: %{version}
|
Version: %{version}
|
||||||
%{expand: %%define rpm_version %{version}}
|
%{expand: %%define rpm_version %{version}}
|
||||||
Release: 0.19
|
Release: 0.20
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
|
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
|
||||||
Copyright: GPL
|
Copyright: GPL
|
||||||
|
@ -459,6 +459,10 @@ exit 0
|
||||||
%{__prefix}/include/popt.h
|
%{__prefix}/include/popt.h
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 9 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.20
|
||||||
|
- don't generate dependencies unless execute bit is set.
|
||||||
|
- enable internal automagic dependency generation as default.
|
||||||
|
|
||||||
* Sat Dec 7 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.19
|
* Sat Dec 7 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.19
|
||||||
- resurrect AutoReq: and AutoProv:.
|
- resurrect AutoReq: and AutoProv:.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue