folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- add perldeps.pl, start to replace perl.{prov,req}. 

CVS patchset: 5999
CVS date: 2003/01/07 00:49:55
This commit is contained in:
jbj 2003-01-07 00:49:55 +00:00
parent b4ca0ec8b2
commit a585d154ac
5 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -100,6 +100,7 @@
- file: avoid ogg/vorbis file classification problems.
- portabilitly: solaris fixes.
- for DSO's, provide the file basename if DT_SONAME not found.
- add perldeps.pl, start to replace perl.{prov,req}.
4.0.4 -> 4.1:
- loosely wire beecrypt library into rpm.

8
build/rpmfc.c
View File

@ -975,6 +975,7 @@ assert(s != NULL);
if (!fc->skipProv && isDSO && !gotSONAME) {
depsp = &fc->provides;
tagN = RPMTAG_PROVIDENAME;
dsContext = RPMSENSE_FIND_PROVIDES;
s = strrchr(fn, '/');
if (s)
@ -1092,7 +1093,14 @@ assert(se != NULL);
/*@switchbreak@*/ break;
}
/* XXX assertion incorrect while generating -debuginfo deps. */
#if 0
assert(dix >= 0);
#else
if (dix < 0)
continue;
#endif
val = (deptype << 24) | (dix & 0x00ffffff);
xx = argiAdd(&fc->ddictx, -1, val);

3
macros.in
View File

@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
# \verbatim
#
# $Id: macros.in,v 1.135 2003/01/01 20:33:21 jbj Exp $
# $Id: macros.in,v 1.136 2003/01/07 00:49:55 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
@ -121,6 +121,7 @@
%package debug\
Summary: Debug information for package %{name}\
Group: Development/Debug\
AutoReqProv: 0\
%description debug\
This package provides debug information for package %{name}.\
Debug information is useful when developing applications that use this\

2
rpm.spec.in
View File

@ -369,6 +369,7 @@ exit 0
%rpmattr %{__prefix}/lib/rpm/magic.mime.mgc
%rpmattr %{__prefix}/lib/rpm/magic.prov
%rpmattr %{__prefix}/lib/rpm/magic.req
%rpmattr %{__prefix}/lib/rpm/perldeps.pl
%rpmattr %{__prefix}/lib/rpm/perl.prov
%rpmattr %{__prefix}/lib/rpm/perl.req
@ -462,6 +463,7 @@ exit 0
* Mon Jan 6 2003 Jeff Johnson <jbj@redhat.com> 4.2-0.52
- portabilitly: solaris fixes.
- for DSO's, provide the file basename if DT_SONAME not found.
- add perldeps.pl, start to replace perl.{prov,req}.
* Sun Jan 5 2003 Jeff Johnson <jbj@redhat.com> 4.2-0.51
- file: avoid ogg/vorbis file classification problems.

6
scripts/Makefile.am
View File

@ -9,7 +9,8 @@ EXTRA_DIST = \
find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
cpanflute cpanflute2 Specfile.pm find-provides.perl \
find-requires.perl get_magic.pl getpo.sh http.req \
magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi \
magic.prov magic.req perldeps.pl perl.prov perl.req rpmdiff \
rpmdiff.cgi \
rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \
sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \
vpkg-provides.sh vpkg-provides2.sh \
@ -28,7 +29,8 @@ config_SCRIPTS = \
find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
cpanflute cpanflute2 Specfile.pm find-provides.perl \
find-requires.perl get_magic.pl getpo.sh http.req \
magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi \
magic.prov magic.req perldeps.pl perl.prov perl.req rpmdiff \
rpmdiff.cgi \
rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \
sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \
vpkg-provides.sh vpkg-provides2.sh