sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4.0.4-alt96.7

Browse Source 
- build/reqprov.c: when folding duplicate dependencies, Requires(pre)
  or Requires(post) should not opimitze out bare Requires
- build/files.c: execute find-requires before find-scriptlet-requires
- 0common-files.req.list: added /etc/rc.d/init.d (service)
This commit is contained in:
Alexey Tourbin 2008-10-06 10:00:15 +04:00
commit e4ee0c28f8
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/files.c
View File

@ -2557,6 +2557,9 @@ DepMsg_t depMsgs[] = {
{ "PreReq", { "%{?__find_prereq}", 0 },
RPMTAG_REQUIRENAME, RPMTAG_REQUIREVERSION, RPMTAG_REQUIREFLAGS,
RPMSENSE_PREREQ, 0 },
{ "Requires", { "%{?__find_requires}", 0 },
-1, -1, RPMTAG_REQUIREFLAGS, /* XXX inherit name/version arrays */
RPMSENSE_PREREQ, RPMSENSE_PREREQ },
{ "Requires(interp)", { 0, "interp", 0 },
-1, -1, RPMTAG_REQUIREFLAGS,
_notpre(RPMSENSE_INTERP), 0 },
@ -2578,9 +2581,6 @@ DepMsg_t depMsgs[] = {
{ "Requires(postun)", { 0, "postun", 0 },
-1, -1, RPMTAG_REQUIREFLAGS,
_notpre(RPMSENSE_SCRIPT_POSTUN), 0 },
{ "Requires", { "%{?__find_requires}", 0 },
-1, -1, RPMTAG_REQUIREFLAGS, /* XXX inherit name/version arrays */
RPMSENSE_PREREQ, RPMSENSE_PREREQ },
{ "Conflicts", { "%{?__find_conflicts}", 0 },
RPMTAG_CONFLICTNAME, RPMTAG_CONFLICTVERSION, RPMTAG_CONFLICTFLAGS,
0, -1 },

4
build/reqprov.c
View File

@ -174,11 +174,11 @@ static dep_compare_t compare_deps (rpmTag tag,
}
/* 7e. Aflags contains Bflags? */
else if ((Areq & Breq) == Breq)
else if (Breq && (Areq & Breq) == Breq)
rc = DEP_ST;
/* 7f. Bflags contains Aflags? */
else if ((Areq & Breq) == Areq)
else if (Areq && (Areq & Breq) == Areq)
rc = DEP_WK;
else

8
rpm-4_0.spec
View File

@ -4,7 +4,7 @@
Name: %rpm_name
Version: %rpm_version
Release: alt96.6
Release: alt96.7
%define ifdef() %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
%define get_dep() %(rpm -q --qf '%%{NAME} >= %%|SERIAL?{%%{SERIAL}:}|%%{VERSION}-%%{RELEASE}' %1 2>/dev/null || echo '%1 >= unknown')
@ -551,6 +551,12 @@ fi
%endif #with contrib
%changelog
* Mon Oct 06 2008 Alexey Tourbin <at@altlinux.ru> 4.0.4-alt96.7
- build/reqprov.c: when folding duplicate dependencies, Requires(pre)
or Requires(post) should not opimitze out bare Requires
- build/files.c: execute find-requires before find-scriptlet-requires
- 0common-files.req.list: added /etc/rc.d/init.d (service)
* Thu Oct 02 2008 Dmitry V. Levin <ldv@altlinux.org> 4.0.4-alt96.6
- build/parsePrep.c (doUntar): Remove "-L" option from "unzip" invocation
(Igor Vlasenko; closes: ALT#17407).

1
scripts/0common-files.req.list
View File

@ -14,6 +14,7 @@
/etc/pam.d pam-config
/etc/ppp/ip-down.d ppp-common
/etc/ppp/ip-up.d ppp-common
/etc/rc.d/init.d service
/etc/rpm/macros.d rpm
/etc/security/console.apps pam0_console
/etc/sudo.d sudo