Merge pull request #84 from shundhammer/huha-drop-rpm-groups

Removed Leftovers of Dropping RPM Group Tags
libyui · Feb 17, 2020 · e295e0b · e295e0b
2 parents f9c4f24 + f3ea192
commit e295e0b
Show file tree

Hide file tree

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

diff --git a/package/libyui-qt-pkg-doc.spec b/package/libyui-qt-pkg-doc.spec
@@ -19,7 +19,7 @@
 %define parent libyui-qt-pkg
 %define so_version 11
 Name:           %{parent}-doc
-Version:        2.47.2
+Version:        2.47.3
 Release:        0
 Summary:        Libyui-qt-pkg documentation
 License:        LGPL-2.1-only OR LGPL-3.0-only

diff --git a/package/libyui-qt-pkg.changes b/package/libyui-qt-pkg.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 17 09:32:16 UTC 2020 - Stefan Hundhammer <shundhammer@suse.com>
+
+- Removed leftovers of dropping support for RPM group tags (bsc#1163594)
+- 2.47.3
+
 -------------------------------------------------------------------
 Thu Jan 16 09:54:05 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

diff --git a/package/libyui-qt-pkg.spec b/package/libyui-qt-pkg.spec
@@ -21,7 +21,7 @@
 %define libyui_qt_devel_version libyui-qt-devel >= 2.50.1
 %define libzypp_devel_version libzypp-devel >= 17.21.0
 Name:           libyui-qt-pkg
-Version:        2.47.2
+Version:        2.47.3
 Release:        0
 Summary:        Libyui - Qt Package Selector
 License:        LGPL-2.1-only OR LGPL-3.0-only

diff --git a/src/YQPkgTechnicalDetailsView.cc b/src/YQPkgTechnicalDetailsView.cc
@@ -45,8 +45,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "YQPkgTechnicalDetailsView.h"
 #include "YQi18n.h"
 #include "utf8.h"
-//Added by qt3to4:
-#include <QList>
 
 using std::list;
 using std::string;
@@ -125,26 +123,6 @@ YQPkgTechnicalDetailsView::authorsListCell( ZyppPkg pkg ) const
 }
 
 
-QString
-YQPkgTechnicalDetailsView::formatRpmGroup( ZyppPkg pkg ) const
-{
-    QStringList groups = fromUTF8( pkg->group() ).split( '/', QString::KeepEmptyParts );
-
-    // Translate group path components
-
-    QStringList translated;
-
-    for ( QStringList::const_iterator it = groups.begin();
-	  it != groups.end();
-	  ++it )
-    {
-	translated.append( QString::fromUtf8( dgettext( "rpm-groups", (*it).toUtf8() ) ) );
-    }
-
-    return translated.join( "/" );
-}
-
-
 QString
 YQPkgTechnicalDetailsView::simpleTable( ZyppSel selectable,
 					ZyppPkg		pkg )
@@ -158,7 +136,6 @@ YQPkgTechnicalDetailsView::simpleTable( ZyppSel selectable,
 	*pkg == selectable->installedObj() ?
 	row( hcell( _( "Install Time:" ) ) + cell( pkg->installtime() ) ) : "";
 
-    html += row( hcell( _( "Package Group:"	) ) + cell( formatRpmGroup( pkg )		) );
     html += row( hcell( _( "License:"		) ) + cell( pkg->license()			) );
     html += row( hcell( _( "Installed Size:" 	) ) + cell( pkg->installSize().asString()	) );
     html += row( hcell( _( "Download Size:"  	) ) + cell( pkg->downloadSize().asString()	) );
@@ -196,7 +173,6 @@ YQPkgTechnicalDetailsView::complexTable( ZyppSel	selectable,
     html += row( hcell( _( "Version:"		) ) + cell( p1->edition().asString()		) + cell( p2->edition().asString()	) );
     html += row( hcell( _( "Build Time:"	) ) + cell( p1->buildtime()			) + cell( p2->buildtime()		) );
     html += row( hcell( _( "Install Time:"	) ) + cell( p1->installtime()			) + cell( p2->installtime()		) );
-    html += row( hcell( _( "Package Group:"	) ) + cell( formatRpmGroup( p1 )		) + cell( formatRpmGroup( p2 )		) );
     html += row( hcell( _( "License:"		) ) + cell( p1->license()			) + cell( p2->license()			) );
     html += row( hcell( _( "Installed Size:" 	) ) + cell( p1->installSize().asString()	) + cell( p2->installSize().asString()	) );
     html += row( hcell( _( "Download Size:"  	) ) + cell( p1->downloadSize().asString()	) + cell( p2->downloadSize().asString()	) );

diff --git a/src/YQPkgTechnicalDetailsView.h b/src/YQPkgTechnicalDetailsView.h
@@ -97,11 +97,6 @@ class YQPkgTechnicalDetailsView : public YQPkgGenericDetailsView
      * Returns a string containing HTML code for a package's authors list.
      **/
     QString authorsListCell( ZyppPkg pkg ) const;
-
-    /**
-     * Format an RPM group. Retrieves the translated ( ! ) version.
-     **/
-    QString formatRpmGroup( ZyppPkg pkg ) const;
 };