[packages/rpm/rpm.org] - updated javadeps patch, removed namespaceccompare (code differs to much)
baggins
baggins at pld-linux.org
Sun Dec 29 13:25:15 CET 2019
commit 58639ed6a0563b2f93ab436bbe31aec535bcc89d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Dec 29 21:24:34 2019 +0900
- updated javadeps patch, removed namespaceccompare (code differs to much)
rpm-javadeps.patch | 38 ++++-----
rpm-namespace-compare.patch | 198 --------------------------------------------
rpm.spec | 4 +-
3 files changed, 16 insertions(+), 224 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 7f64ab9..9710cba 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -90,7 +90,6 @@ Patch18: %{name}-javadeps.patch
Patch20: %{name}-libtool-deps.patch
Patch29: %{name}-builddir-readlink.patch
Patch30: %{name}-changelog_order_check_nonfatal.patch
-Patch35: %{name}-namespace-compare.patch
Patch37: %{name}-postun-nofail.patch
Patch61: %{name}-clean-docdir.patch
Patch64: %{name}-fix-compress-doc.patch
@@ -662,11 +661,10 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
%patch14 -p0
%patch15 -p1
#%patch16 -p1
-#%patch18 -p1
+%patch18 -p1
%patch20 -p1
%patch29 -p1
%patch30 -p1
-#%patch35 -p1
%patch37 -p1
%patch61 -p1
#%patch64 -p1
diff --git a/rpm-javadeps.patch b/rpm-javadeps.patch
index 3e8303c..8ae3ef8 100644
--- a/rpm-javadeps.patch
+++ b/rpm-javadeps.patch
@@ -1,26 +1,18 @@
---- rpm-4.4.9/lib/rpmfc.c.orig 2007-05-22 20:19:05.990914000 +0200
-+++ rpm-4.4.9/lib/rpmfc.c 2007-05-22 22:12:38.775152636 +0200
-@@ -875,6 +875,10 @@
- xx = rpmfcHelper(fc, 'P', "gstreamer");
- /* XXX: currently of no use, but for the sake of consistency... */
- xx = rpmfcHelper(fc, 'R', "gstreamer");
-+ } else
-+ if (fc->fcolor->vals[fc->ix] & RPMFC_JAVA) {
-+ xx = rpmfcHelper(fc, 'P', "java");
-+ xx = rpmfcHelper(fc, 'R', "java");
- }
+--- rpm-4.15.1/fileattrs/Makefile.am~ 2019-06-26 23:17:31.000000000 +0900
++++ rpm-4.15.1/fileattrs/Makefile.am 2019-12-29 00:23:02.120085588 +0900
+@@ -8,6 +8,6 @@
+ fattrs_DATA = \
+ debuginfo.attr desktop.attr elf.attr font.attr libtool.attr metainfo.attr \
+ perl.attr perllib.attr pkgconfig.attr python.attr pythondist.attr ocaml.attr \
+- script.attr php.attr
++ script.attr php.attr java.attr
- /*@-observertrans@*/
---- rpm-4.4.9/macros/java.in.orig 2007-05-24 21:20:49.657284000 +0200
-+++ rpm-4.4.9/macros/java.in 2007-05-24 21:22:32.823163996 +0200
-@@ -1416,8 +1416,8 @@
- #
- # Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
--%__java_provides %{_rpmhome}/javadeps.sh --provides
--%__java_requires %{_rpmhome}/javadeps.sh --requires
+ EXTRA_DIST = $(fattrs_DATA)
+--- /dev/null 2019-12-23 19:28:16.334291624 +0900
++++ rpm-4.15.1/fileattrs/java.attr 2019-12-29 00:22:52.989864428 +0900
+@@ -0,0 +1,5 @@
+%__java_provides %{nil}
+%__java_requires env RPM_BUILD_ROOT=%{buildroot} MIN_CLASSDATAVERSION=%{?java_min_classdataversion} %{_rpmhome}/java-find-requires
-
- # The value of CLASSPATH in build scriptlets (iff configured).
- #
++%__java_magic ^PHP script.*
++%__java_path \\.php$
++%__java_flags magic_and_path
diff --git a/rpm-namespace-compare.patch b/rpm-namespace-compare.patch
deleted file mode 100644
index e38d8dd..0000000
--- a/rpm-namespace-compare.patch
+++ /dev/null
@@ -1,198 +0,0 @@
---- rpm-5.4.10/lib/rpmds.c~ 2012-07-06 17:39:16.000000000 +0200
-+++ rpm-5.4.10/lib/rpmds.c 2012-09-13 12:40:32.439076460 +0200
-@@ -4036,6 +4036,12 @@
-
- assert((rpmdsFlags(A) & RPMSENSE_SENSEMASK) == A->ns.Flags);
- assert((rpmdsFlags(B) & RPMSENSE_SENSEMASK) == B->ns.Flags);
-+ /* Different namespaces don't overlap. */
-+ if (A->ns.Type != B->ns.Type) {
-+ result = 0;
-+ goto exit;
-+ }
-+
- /* Different names (and/or name.arch's) don't overlap. */
- if (rpmdsNAcmp(A, B)) {
- result = 0;
-diff -ur rpm-5.4.10/lib/depends.c rpm-5.4.10.nstype/lib/depends.c
---- rpm-5.4.10/lib/depends.c 2012-11-30 13:03:40.350619256 +0100
-+++ rpm-5.4.10.nstype/lib/depends.c 2012-11-30 12:08:01.266204377 +0100
-@@ -16,6 +16,7 @@
- #define _RPMDB_INTERNAL /* XXX response cache needs dbiOpen et al. */
- #include <rpmdb.h>
-
-+#define _RPMDS_INTERNAL
- #define _RPMEVR_INTERNAL
- #include <rpmds.h>
- #include <rpmfi.h>
-@@ -1570,6 +1579,7 @@
- /*@null@*/ rpmds dirnames,
- /*@null@*/ rpmds linktos,
- /*@null@*/ const char * depName,
-+ nsType depNS,
- rpmuint32_t tscolor, int adding)
- /*@globals rpmGlobalMacroContext, h_errno,
- fileSystem, internalState @*/
-@@ -1579,6 +1589,7 @@
- rpmps ps = rpmtsProblems(ts);
- rpmuint32_t dscolor;
- const char * Name;
-+ nsType NSType;
- int terminate = 2; /* XXX terminate if rc >= terminate */
- int rc;
- int ourrc = 0;
-@@ -1598,6 +1609,11 @@
- if (depName != NULL && strcmp(depName, Name))
- continue;
-
-+ NSType = rpmdsNSType(requires);
-+
-+ if (depNS != RPMNS_TYPE_UNKNOWN && depNS != NSType)
-+ continue;
-+
- /* Ignore colored requires not in our rainbow. */
- dscolor = rpmdsColor(requires);
- if (tscolor && dscolor && !(tscolor & dscolor))
-@@ -1639,6 +1659,11 @@
- if (depName != NULL && strcmp(depName, Name))
- continue;
-
-+ NSType = rpmdsNSType(conflicts);
-+
-+ if (depNS != RPMNS_TYPE_UNKNOWN && depNS != NSType)
-+ continue;
-+
- /* Ignore colored conflicts not in our rainbow. */
- dscolor = rpmdsColor(conflicts);
- if (tscolor && dscolor && !(tscolor & dscolor))
-@@ -1676,6 +1703,11 @@
- if (depName != NULL && strcmp(depName, Name))
- continue;
-
-+ NSType = rpmdsNSType(dirnames);
-+
-+ if (depNS != RPMNS_TYPE_UNKNOWN && depNS != NSType)
-+ continue;
-+
- /* Ignore colored dirnames not in our rainbow. */
- dscolor = rpmdsColor(dirnames);
- if (tscolor && dscolor && !(tscolor & dscolor))
-@@ -1724,6 +1758,11 @@
- if (depName != NULL && strcmp(depName, Name))
- continue;
-
-+ NSType = rpmdsNSType(linktos);
-+
-+ if (depNS != RPMNS_TYPE_UNKNOWN && depNS != NSType)
-+ continue;
-+
- /* Ignore colored linktos not in our rainbow. */
- dscolor = rpmdsColor(linktos);
- if (tscolor && dscolor && !(tscolor & dscolor))
-@@ -1771,7 +1812,7 @@
- * @param adding dependency is from added package set?
- * @return 0 no problems found
- */
--static int checkPackageSet(rpmts ts, const char * depName,
-+static int checkPackageSet(rpmts ts, const char * depName, nsType depNS,
- /*@only@*/ /*@null@*/ rpmmi mi, int adding)
- /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
- /*@modifies ts, mi, rpmGlobalMacroContext, fileSystem, internalState @*/
-@@ -1816,7 +1857,7 @@
-
- rc = checkPackageDeps(ts, he->p.str,
- requires, conflicts, dirnames, linktos,
-- depName, tscolor, adding);
-+ depName, depNS, tscolor, adding);
-
- (void)rpmdsFree(linktos);
- linktos = NULL;
-@@ -1844,7 +1886,7 @@
- * @param depName requires name
- * @return 0 no problems found
- */
--static int checkDependentPackages(rpmts ts, const char * depName)
-+static int checkDependentPackages(rpmts ts, const char * depName, nsType depNS)
- /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
- /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/
- {
-@@ -1854,7 +1896,7 @@
- if (rpmtsGetRdb(ts) != NULL) {
- rpmmi mi;
- mi = rpmtsInitIterator(ts, RPMTAG_REQUIRENAME, depName, 0);
-- rc = checkPackageSet(ts, depName, mi, 0);
-+ rc = checkPackageSet(ts, depName, depNS, mi, 0);
- }
- return rc;
- }
-@@ -1865,7 +1908,7 @@
- * @param depName conflicts name
- * @return 0 no problems found
- */
--static int checkDependentConflicts(rpmts ts, const char * depName)
-+static int checkDependentConflicts(rpmts ts, const char * depName, nsType depNS)
- /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
- /*@modifies ts, rpmGlobalMacroContext, fileSystem, internalState @*/
- {
-@@ -1875,7 +1918,7 @@
- if (rpmtsGetRdb(ts) != NULL) {
- rpmmi mi;
- mi = rpmtsInitIterator(ts, RPMTAG_CONFLICTNAME, depName, 0);
-- rc = checkPackageSet(ts, depName, mi, 1);
-+ rc = checkPackageSet(ts, depName, depNS, mi, 1);
- }
-
- return rc;
-@@ -1939,7 +1985,7 @@
-
- rc = checkPackageDeps(ts, rpmteNEVRA(p),
- requires, conflicts, dirnames, linktos,
-- NULL, tscolor, 1);
-+ NULL, RPMNS_TYPE_UNKNOWN, tscolor, 1);
- if (rc && (ourrc = rc) >= terminate)
- break;
-
-@@ -1963,7 +2011,7 @@
- #endif
-
- /* Adding: check provides key against conflicts matches. */
-- if (checkDependentConflicts(ts, depName))
-+ if (checkDependentConflicts(ts, depName, rpmdsNSType(provides)))
- rc = 1;
- }
- if (rc && (ourrc = rc) >= terminate)
-@@ -1975,7 +2026,7 @@
- depName = _free(depName);
- depName = xstrdup(rpmfiFN(fi));
- /* Adding: check filename against conflicts matches. */
-- if (checkDependentConflicts(ts, depName))
-+ if (checkDependentConflicts(ts, depName, RPMNS_TYPE_UNKNOWN))
- rc = 1;
- }
- if (rc && (ourrc = rc) >= terminate)
-@@ -2006,7 +2058,7 @@
- depName = xstrdup(rpmdsN(provides));
-
- /* Erasing: check provides against requiredby matches. */
-- if (checkDependentPackages(ts, depName))
-+ if (checkDependentPackages(ts, depName, rpmdsNSType(provides)))
- rc = 1;
- }
- if (rc && (ourrc = rc) >= terminate)
-@@ -2018,7 +2070,7 @@
- depName = _free(depName);
- depName = xstrdup(rpmfiFN(fi));
- /* Erasing: check filename against requiredby matches. */
-- if (checkDependentPackages(ts, depName))
-+ if (checkDependentPackages(ts, depName, RPMNS_TYPE_UNKNOWN))
- rc = 1;
- }
- if (rc && (ourrc = rc) >= terminate)
-@@ -2039,7 +2091,7 @@
- const char * dep = NULL;
- int adding = 2;
- tscolor = 0; /* XXX no coloring for transaction dependencies. */
-- rc = checkPackageDeps(ts, tsNEVRA, R, C, D, L, dep, tscolor, adding);
-+ rc = checkPackageDeps(ts, tsNEVRA, R, C, D, L, dep, RPMNS_TYPE_UNKNOWN, tscolor, adding);
- }
- if (rc && (ourrc = rc) >= terminate)
- goto exit;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/58639ed6a0563b2f93ab436bbe31aec535bcc89d
More information about the pld-cvs-commit
mailing list