[oe-commits] [openembedded-core] 14/35: package_rpm.bbclass: correctly map RRECOMMENDS and RSUGGESTS to rpm tags

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 06270f20ba4312d20d0fd348595adf1b239bcac5
Author: Alexander Kanavin <alexander.kanavin at linux.intel.com>
AuthorDate: Thu Jan 19 19:24:37 2017 +0200

    package_rpm.bbclass: correctly map RRECOMMENDS and RSUGGESTS to rpm tags
    
    Previously they were swapped, not sure why. Their meaning, as far as rpm
    world goes, is different:
    
    - Recommends is a soft dependency and will be installed by default; there is
    an option not to do that.
    
    - Suggests is a suggestion to be picked up and presented to end user by
    package management tools; it has no special meaning otherwise.
    
    OE packages use RRECOMMENDS, which should be mapped to Recommends rpm tag,
    so that the packages will be picked up as dependencies.
    
    Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
---
 meta/classes/package_rpm.bbclass | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 07eb974..480c6d5 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -450,10 +450,8 @@ python write_specfile () {
         if splitrpostrm:
             print_deps(splitrdepends, "Requires(postun)", spec_preamble_bottom, d)
 
-        # Suggests in RPM are like recommends in OE-core!
-        print_deps(splitrrecommends, "Suggests", spec_preamble_bottom, d)
-        # While there is no analog for suggests... (So call them recommends for now)
-        print_deps(splitrsuggests,  "Recommends", spec_preamble_bottom, d)
+        print_deps(splitrrecommends, "Recommends", spec_preamble_bottom, d)
+        print_deps(splitrsuggests,  "Suggests", spec_preamble_bottom, d)
         print_deps(splitrprovides,  "Provides", spec_preamble_bottom, d)
         print_deps(splitrobsoletes, "Obsoletes", spec_preamble_bottom, d)
 
@@ -560,10 +558,8 @@ python write_specfile () {
     if srcrpostrm:
         print_deps(srcrdepends, "Requires(postun)", spec_preamble_top, d)
 
-    # Suggests in RPM are like recommends in OE-core!
-    print_deps(srcrrecommends, "Suggests", spec_preamble_top, d)
-    # While there is no analog for suggests... (So call them recommends for now)
-    print_deps(srcrsuggests, "Recommends", spec_preamble_top, d)
+    print_deps(srcrrecommends, "Recommends", spec_preamble_top, d)
+    print_deps(srcrsuggests, "Suggests", spec_preamble_top, d)
     print_deps(srcrprovides, "Provides", spec_preamble_top, d)
     print_deps(srcrobsoletes, "Obsoletes", spec_preamble_top, d)
     

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.