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

4.0.4-alt95.M41.4+

Browse Source 
- build/reqprov.c: when folding duplicate dependencies, Requires(pre)
  or Requires(post) should not opimitze out bare Requires
This commit is contained in:
Alexey Tourbin 2008-09-22 18:56:46 +00:00
commit 0d54c4a6f0
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

6
rpm-4_0.spec
View File

@ -4,7 +4,7 @@
Name: %rpm_name
Version: %rpm_version
Release: alt95.M41.4
Release: alt95.M41.4+
%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,10 @@ fi
%endif #with contrib
%changelog
* Mon Sep 22 2008 Alexey Tourbin <at@altlinux.ru> 4.0.4-alt95.M41.4+
- build/reqprov.c: when folding duplicate dependencies, Requires(pre)
or Requires(post) should not opimitze out bare Requires
* Tue Sep 16 2008 Alexey Tourbin <at@altlinux.ru> 4.0.4-alt95.M41.4
- build/spec.c: don't allow multiple definition of PatchX or SourceX
(Jindrich Novy, rhbz#458261, rhbz#458260)