From: yang.zhang Date: Thu, 16 Mar 2017 08:29:25 +0000 (+0800) Subject: Enable RPM_WEAK_DEPS_SUPPORT and ENABLE_LEGACY_WEAKDEPS X-Git-Tag: upstream/0.10.1~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df25c73adf7d726771b354f39d15ad933bf4540b;p=services%2Fcreaterepo_c.git Enable RPM_WEAK_DEPS_SUPPORT and ENABLE_LEGACY_WEAKDEPS Change-Id: I385aecfa9530e6177bd00f786782f369d8d936ea --- diff --git a/debian/rules b/debian/rules index 33f8460..2a50ea5 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ build: build-stamp build-stamp: dh_testdir - cmake -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr + cmake -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_LEGACY_WEAKDEPS=ON make clean: diff --git a/packaging/createrepo_c.spec b/packaging/createrepo_c.spec index e8279f8..773b870 100644 --- a/packaging/createrepo_c.spec +++ b/packaging/createrepo_c.spec @@ -28,7 +28,8 @@ cp %{SOURCE1001} . %build cmake -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DENABLE_LEGACY_WEAKDEPS=ON %{__make} %{?jobs:-j%jobs} diff --git a/src/parsehdr.c b/src/parsehdr.c index 54feb5c..704b955 100644 --- a/src/parsehdr.c +++ b/src/parsehdr.c @@ -29,10 +29,35 @@ #if defined(RPMTAG_SUGGESTS) && defined(RPMTAG_ENHANCES) \ && defined(RPMTAG_RECOMMENDS) && defined(RPMTAG_SUPPLEMENTS) #define RPM_WEAK_DEPS_SUPPORT 1 +#else +#define RPMTAG_RECOMMENDNAME 5046 +#define RPMTAG_RECOMMENDS RPMTAG_RECOMMENDNAME +#define RPMTAG_RECOMMENDVERSION 5047 +#define RPMTAG_RECOMMENDFLAGS 5048 +#define RPMTAG_SUGGESTNAME 5049 +#define RPMTAG_SUGGESTS RPMTAG_SUGGESTNAME +#define RPMTAG_SUGGESTVERSION 5050 +#define RPMTAG_SUGGESTFLAGS 5051 +#define RPMTAG_SUPPLEMENTNAME 5052 +#define RPMTAG_SUPPLEMENTS RPMTAG_SUPPLEMENTNAME +#define RPMTAG_SUPPLEMENTVERSION 5053 +#define RPMTAG_SUPPLEMENTFLAGS 5054 +#define RPMTAG_ENHANCENAME 5055 +#define RPMTAG_ENHANCES RPMTAG_ENHANCENAME +#define RPMTAG_ENHANCEVERSION 5056 +#define RPMTAG_ENHANCEFLAGS 5057 #endif #ifdef ENABLE_LEGACY_WEAKDEPS #define RPMSENSE_STRONG (1 << 27) +#define RPMTAG_OLDSUGGESTSNAME 1156 +#define RPMTAG_OLDSUGGESTS RPMTAG_OLDSUGGESTSNAME +#define RPMTAG_OLDSUGGESTSVERSION 1157 +#define RPMTAG_OLDSUGGESTSFLAGS 1158 +#define RPMTAG_OLDENHANCESNAME 1159 +#define RPMTAG_OLDENHANCES RPMTAG_OLDENHANCESNAME +#define RPMTAG_OLDENHANCESVERSION 1160 +#define RPMTAG_OLDENHANCESFLAGS 1161 #endif typedef enum DepType_e { @@ -64,7 +89,6 @@ static DepItem dep_items[] = { { DEP_CONFLICTS, RPMTAG_CONFLICTNAME, RPMTAG_CONFLICTFLAGS, RPMTAG_CONFLICTVERSION }, { DEP_OBSOLETES, RPMTAG_OBSOLETENAME, RPMTAG_OBSOLETEFLAGS, RPMTAG_OBSOLETEVERSION }, { DEP_REQUIRES, RPMTAG_REQUIRENAME, RPMTAG_REQUIREFLAGS, RPMTAG_REQUIREVERSION }, -#ifdef RPM_WEAK_DEPS_SUPPORT { DEP_SUGGESTS, RPMTAG_SUGGESTNAME, RPMTAG_SUGGESTFLAGS, RPMTAG_SUGGESTVERSION }, { DEP_ENHANCES, RPMTAG_ENHANCENAME, RPMTAG_ENHANCEFLAGS, RPMTAG_ENHANCEVERSION }, { DEP_RECOMMENDS, RPMTAG_RECOMMENDNAME, RPMTAG_RECOMMENDFLAGS, RPMTAG_RECOMMENDVERSION }, @@ -72,7 +96,6 @@ static DepItem dep_items[] = { #ifdef ENABLE_LEGACY_WEAKDEPS { DEP_OLDSUGGESTS, RPMTAG_OLDSUGGESTSNAME, RPMTAG_OLDSUGGESTSFLAGS, RPMTAG_OLDSUGGESTSVERSION }, { DEP_OLDENHANCES, RPMTAG_OLDENHANCESNAME, RPMTAG_OLDENHANCESFLAGS, RPMTAG_OLDENHANCESVERSION }, -#endif #endif { DEP_SENTINEL, 0, 0, 0 }, };