Revert "Add support for Recommends:, Suggests:, Supplements: and Enhances:"submit/tizen_base/20170228.034447accepted/tizen/base/20170228.084720

This reverts commit c31c49f42b54dcf6edb8804e633e6b6985acbb41.

Change-Id: I94a88f43ba2db764c7c3a9435683ca26fe97c565

10 files changed, 8 insertions, 112 deletions

diff --git a/build/pack.c b/build/pack.c
index e426a75f7..6480cecaa 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -232,10 +232,8 @@ static rpmTagVal depevrtags[] = {
     RPMTAG_CONFLICTVERSION,
     RPMTAG_ORDERVERSION,
     RPMTAG_TRIGGERVERSION,
-    RPMTAG_SUGGESTVERSION,
-    RPMTAG_ENHANCEVERSION,
-    RPMTAG_RECOMMENDVERSION,
-    RPMTAG_SUPPLEMENTVERSION,
+    RPMTAG_SUGGESTSVERSION,
+    RPMTAG_ENHANCESVERSION,
     0
 };
 
diff --git a/build/parsePreamble.c b/build/parsePreamble.c
index bf6b26b04..523e452e3 100644
--- a/build/parsePreamble.c
+++ b/build/parsePreamble.c
@@ -785,10 +785,6 @@ static rpmRC handlePreambleTag(rpmSpec spec, Package pkg, rpmTagVal tag,
     case RPMTAG_BUILDPREREQ:
     case RPMTAG_BUILDREQUIRES:
     case RPMTAG_BUILDCONFLICTS:
-    case RPMTAG_RECOMMENDFLAGS:
-    case RPMTAG_SUGGESTFLAGS:
-    case RPMTAG_SUPPLEMENTFLAGS:
-    case RPMTAG_ENHANCEFLAGS:
     case RPMTAG_CONFLICTFLAGS:
     case RPMTAG_OBSOLETEFLAGS:
     case RPMTAG_PROVIDEFLAGS:
@@ -896,10 +892,6 @@ static struct PreambleRec_s const preambleList[] = {
     {RPMTAG_ICON,		0, 0, LEN_AND_STR("icon")},
     {RPMTAG_PROVIDEFLAGS,	0, 0, LEN_AND_STR("provides")},
     {RPMTAG_REQUIREFLAGS,	2, 0, LEN_AND_STR("requires")},
-    {RPMTAG_RECOMMENDFLAGS,	0, 0, LEN_AND_STR("recommends")},
-    {RPMTAG_SUGGESTFLAGS,	0, 0, LEN_AND_STR("suggests")},
-    {RPMTAG_SUPPLEMENTFLAGS,	0, 0, LEN_AND_STR("supplements")},
-    {RPMTAG_ENHANCEFLAGS,	0, 0, LEN_AND_STR("enhances")},
     {RPMTAG_PREREQ,		2, 1, LEN_AND_STR("prereq")},
     {RPMTAG_CONFLICTFLAGS,	0, 0, LEN_AND_STR("conflicts")},
     {RPMTAG_OBSOLETEFLAGS,	0, 0, LEN_AND_STR("obsoletes")},
diff --git a/build/parseReqs.c b/build/parseReqs.c
index aa1758d9d..1507090d3 100644
--- a/build/parseReqs.c
+++ b/build/parseReqs.c
@@ -52,18 +52,6 @@ rpmRC parseRCPOT(rpmSpec spec, Package pkg, const char *field, rpmTagVal tagN,
 	nametag = RPMTAG_REQUIRENAME;
 	tagflags |= RPMSENSE_ANY;
 	break;
-    case RPMTAG_RECOMMENDFLAGS:
-	nametag = RPMTAG_RECOMMENDNAME;
-	break;
-    case RPMTAG_SUGGESTFLAGS:
-	nametag = RPMTAG_SUGGESTNAME;
-	break;
-    case RPMTAG_SUPPLEMENTFLAGS:
-	nametag = RPMTAG_SUPPLEMENTNAME;
-	break;
-    case RPMTAG_ENHANCEFLAGS:
-	nametag = RPMTAG_ENHANCENAME;
-	break;
     case RPMTAG_PROVIDEFLAGS:
 	nametag = RPMTAG_PROVIDENAME;
 	break;
diff --git a/build/reqprov.c b/build/reqprov.c
index cbfbe56b5..bc2f7ea26 100644
--- a/build/reqprov.c
+++ b/build/reqprov.c
@@ -85,30 +85,6 @@ int addReqProv(Header h, rpmTagVal tagN,
 	flagtag = RPMTAG_ENHANCESFLAGS;
 	extra = Flags & _ALL_REQUIRES_MASK;
 	break;
-    case RPMTAG_RECOMMENDNAME:
-	versiontag = RPMTAG_RECOMMENDVERSION;
-	flagtag = RPMTAG_RECOMMENDFLAGS;
-	extra = Flags & _ALL_REQUIRES_MASK;
-	dsp = &pkg->recommends;
-	break;
-    case RPMTAG_SUGGESTNAME:
-	versiontag = RPMTAG_SUGGESTVERSION;
-	flagtag = RPMTAG_SUGGESTFLAGS;
-	extra = Flags & _ALL_REQUIRES_MASK;
-	dsp = &pkg->suggests;
-	break;
-    case RPMTAG_SUPPLEMENTNAME:
-	versiontag = RPMTAG_SUPPLEMENTVERSION;
-	flagtag = RPMTAG_SUPPLEMENTFLAGS;
-	extra = Flags & _ALL_REQUIRES_MASK;
-	dsp = &pkg->supplements;
-	break;
-    case RPMTAG_ENHANCENAME:
-	versiontag = RPMTAG_ENHANCEVERSION;
-	flagtag = RPMTAG_ENHANCEFLAGS;
-	extra = Flags & _ALL_REQUIRES_MASK;
-	dsp = &pkg->enhances;
-	break;
     case RPMTAG_REQUIRENAME:
     default:
 	tagN = RPMTAG_REQUIRENAME;
diff --git a/build/rpmbuild_internal.h b/build/rpmbuild_internal.h
index b7d8af578..fb6198d76 100644
--- a/build/rpmbuild_internal.h
+++ b/build/rpmbuild_internal.h
@@ -88,10 +88,6 @@ struct rpmSpec_s {
 struct Package_s {
     Header header;
     rpmds ds;			/*!< Requires: N = EVR */
-    rpmds recommends;
-    rpmds suggests;
-    rpmds supplements;
-    rpmds enhances;
     rpmfi cpioList;
 
     struct Source * icon;
diff --git a/build/spec.c b/build/spec.c
index 98f7ff77b..4b6b6805d 100644
--- a/build/spec.c
+++ b/build/spec.c
@@ -129,10 +129,6 @@ static Package freePackage(Package pkg)
 
     pkg->header = headerFree(pkg->header);
     pkg->ds = rpmdsFree(pkg->ds);
-    pkg->recommends = rpmdsFree(pkg->recommends);
-    pkg->suggests = rpmdsFree(pkg->suggests);
-    pkg->supplements = rpmdsFree(pkg->supplements);
-    pkg->enhances = rpmdsFree(pkg->enhances);
     pkg->fileList = argvFree(pkg->fileList);
     pkg->fileFile = argvFree(pkg->fileFile);
     pkg->policyList = argvFree(pkg->policyList);
diff --git a/lib/rpmds.c b/lib/rpmds.c
index 28eda9719..1e6798648 100644
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -54,22 +54,6 @@ static int dsType(rpmTagVal tag,
 	t = "Requires";
 	evr = RPMTAG_REQUIREVERSION;
 	f = RPMTAG_REQUIREFLAGS;
-    } else if (tag == RPMTAG_SUPPLEMENTNAME) {
-	t = "Supplements";
-	evr = RPMTAG_SUPPLEMENTVERSION;
-	f = RPMTAG_SUPPLEMENTFLAGS;
-    } else if (tag == RPMTAG_ENHANCENAME) {
-	t = "Enhances";
-	evr = RPMTAG_ENHANCEVERSION;
-	f = RPMTAG_ENHANCEFLAGS;
-    } else if (tag == RPMTAG_RECOMMENDNAME) {
-	t = "Recommends";
-	evr = RPMTAG_RECOMMENDVERSION;
-	f = RPMTAG_RECOMMENDFLAGS;
-    } else if (tag == RPMTAG_SUGGESTNAME) {
-	t = "Suggests";
-	evr = RPMTAG_SUGGESTVERSION;
-	f = RPMTAG_SUGGESTFLAGS;
     } else if (tag == RPMTAG_CONFLICTNAME) {
 	t = "Conflicts";
 	evr = RPMTAG_CONFLICTVERSION;
diff --git a/tests/data/SPECS/deptest.spec b/tests/data/SPECS/deptest.spec
index 02616f8a4..7f2228f11 100644
--- a/tests/data/SPECS/deptest.spec
+++ b/tests/data/SPECS/deptest.spec
@@ -10,10 +10,6 @@ BuildArch:	noarch
 %{?provs:Provides: %{provs}}
 %{?cfls:Conflicts: %{cfls}}
 %{?obs:Obsoletes: %{obs}}
-%{?recs:Recommends: %{recs}}
-%{?sugs:Suggests: %{sugs}}
-%{?sups:Supplements: %{sups}}
-%{?ens:Enhances: %{ens}}
 
 %description
 %{summary}
diff --git a/tests/rpmbuild.at b/tests/rpmbuild.at
index b6a6ef02f..7661e35f5 100644
--- a/tests/rpmbuild.at
+++ b/tests/rpmbuild.at
@@ -185,25 +185,3 @@ lrwxrwxrwx /opt/globtest/linkgood
 ],
 [])
 AT_CLEANUP
-
-# ------------------------------
-# Check if weak and reverse requires can be built
-AT_SETUP([Weak and reverse requires])
-AT_KEYWORDS([build])
-AT_CHECK([
-
-runroot rpmbuild -bb --quiet \
-	--define "pkg weakdeps" \
-	--define "recs foo > 1.2.3" \
-	--define "sugs bar >= 0.1.2" \
-	--define "sups baz" \
-	--define "ens zap = 3" \
-	  /data/SPECS/deptest.spec
-
-runroot rpm -qp --qf "[%{supplementname}\n]" /build/RPMS/noarch/deptest-weakdeps-1.0-1.noarch.rpm
-],
-[0],
-[baz
-],
-[ignore])
-AT_CLEANUP
diff --git a/tests/rpmgeneral.at b/tests/rpmgeneral.at
index bdef73dea..eb0d86dda 100644
--- a/tests/rpmgeneral.at
+++ b/tests/rpmgeneral.at
@@ -79,10 +79,10 @@ DISTTAG
 DISTURL
 DSAHEADER
 E
-ENHANCEFLAGS
-ENHANCENAME
 ENHANCES
-ENHANCEVERSION
+ENHANCESFLAGS
+ENHANCESNAME
+ENHANCESVERSION
 EPOCH
 EPOCHNUM
 EVR
@@ -203,10 +203,6 @@ PROVIDES
 PROVIDEVERSION
 PUBKEYS
 R
-RECOMMENDFLAGS
-RECOMMENDNAME
-RECOMMENDS
-RECOMMENDVERSION
 RECONTEXTS
 RELEASE
 REMOVETID
@@ -227,15 +223,11 @@ SOURCE
 SOURCEPACKAGE
 SOURCEPKGID
 SOURCERPM
-SUGGESTFLAGS
-SUGGESTNAME
 SUGGESTS
-SUGGESTVERSION
+SUGGESTSFLAGS
+SUGGESTSNAME
+SUGGESTSVERSION
 SUMMARY
-SUPPLEMENTFLAGS
-SUPPLEMENTNAME
-SUPPLEMENTS
-SUPPLEMENTVERSION
 TRIGGERCONDS
 TRIGGERFLAGS
 TRIGGERINDEX