Merge pull request #39 from shundhammer/huha-rpm-groups

Removed Leftovers of Dropping RPM Group Tags
libyui · Feb 17, 2020 · 69ea8ef · 69ea8ef
2 parents 43f7aeb + 01b9762
commit 69ea8ef
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 21 deletions.
diff --git a/VERSION.cmake b/VERSION.cmake
@@ -1,6 +1,6 @@
 SET( VERSION_MAJOR "2" )
 SET( VERSION_MINOR "50" )
-SET( VERSION_PATCH "5" )
+SET( VERSION_PATCH "6" )
 SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
 
 ##### This is need for the libyui core, ONLY.

diff --git a/package/libyui-ncurses-pkg-doc.spec b/package/libyui-ncurses-pkg-doc.spec
@@ -19,7 +19,7 @@
 %define so_version 11
 
 Name:           %{parent}-doc
-Version:        2.50.5
+Version:        2.50.6
 Release:        0
 Source:         %{parent}-%{version}.tar.bz2
 

diff --git a/package/libyui-ncurses-pkg.changes b/package/libyui-ncurses-pkg.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 17 10:26:48 UTC 2020 - Stefan Hundhammer <shundhammer@suse.com>
+
+- Removed leftovers of dropping support for RPM group tags (bsc#1163594)
+- 2.50.6
+
 -------------------------------------------------------------------
 Thu Feb  6 15:24:40 UTC 2020 - Stefan Hundhammer <shundhammer@suse.com>
 

diff --git a/package/libyui-ncurses-pkg.spec b/package/libyui-ncurses-pkg.spec
@@ -17,7 +17,7 @@
 
 
 Name:           libyui-ncurses-pkg
-Version:        2.50.5
+Version:        2.50.6
 Release:        0
 Source:         %{name}-%{version}.tar.bz2
 

diff --git a/src/NCPkgFilterMain.h b/src/NCPkgFilterMain.h
@@ -62,7 +62,6 @@ class NCPkgFilterMain : public NCComboBox
 
     YItem *patterns;
     YItem *languages;
-    YItem *rpmgroups;
     YItem *repositories;
     YItem *services;
     YItem *search;

diff --git a/src/NCPkgPackageDetails.cc b/src/NCPkgPackageDetails.cc
@@ -207,11 +207,6 @@ void NCPkgPackageDetails::technicalData( ZyppObj pkgPtr, ZyppSel slbPtr )
         text += "  ";
         text += "<br>";
 
-        // the rpm group
-        text += NCPkgStrings::RpmGroup();
-        text += package->group();
-        text += "<br>";
-
 	// name of the source package
 	text += "<b>" + _( "Source Package: " ) + "</b>";
 	text += package->sourcePkgName();

diff --git a/src/NCPkgStrings.cc b/src/NCPkgStrings.cc
@@ -534,13 +534,6 @@ const std::string NCPkgStrings::MediaNo()
     return value;
 }
 
-const std::string NCPkgStrings::RpmGroup()
-{
-    // part of the package description
-    static const std::string value = _( "<b>Package Group: </b>" );
-    return value;
-}
-
 const std::string NCPkgStrings::Provides()
 {
     // part of the package description

diff --git a/src/NCPkgStrings.h b/src/NCPkgStrings.h
@@ -187,11 +187,6 @@ class NCPkgStrings
      */
     static const std::string Size();
 
-    /**
-     * bold text Package Group: (richtext)
-     */
-    static const std::string RpmGroup();
-
     /**
      * bold text Authors: (richtext)
      */