Hello community,
here is the log from the commit of package yast2-qt
checked in at Mon Aug 27 17:59:34 CEST 2007.
--------
--- yast2-qt/yast2-qt.changes 2007-08-15 13:18:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2007-08-27 16:20:06.616082000 +0200
@@ -1,0 +2,12 @@
+Mon Aug 27 16:14:15 CEST 2007 - sh@suse.de
+
+- Fixed bug #297637: Repository names not shown in Package Manager
+- V 2.15.14
+
+-------------------------------------------------------------------
+Thu Aug 23 13:25:08 CEST 2007 - kmachalkova@suse.cz
+
+- Display repository name instead of product name in package selector
+ (#296782)
+
+-------------------------------------------------------------------
Old:
----
yast2-qt-2.15.12.tar.bz2
New:
----
yast2-qt-2.15.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.O13423/_old 2007-08-27 17:59:21.000000000 +0200
+++ /var/tmp/diff_new_pack.O13423/_new 2007-08-27 17:59:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-qt (Version 2.15.12)
+# spec file for package yast2-qt (Version 2.15.14)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-qt
-Version: 2.15.12
+Version: 2.15.14
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-2.15.12.tar.bz2
+Source0: yast2-qt-2.15.14.tar.bz2
prefix: /usr
BuildRequires: boost-devel curl-devel dbus-1-devel docbook-xsl-stylesheets doxygen hal-devel libdrm-devel libjpeg-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer qt3-devel rpm-devel sgml-skel update-desktop-files yast2-core-devel yast2-devtools
Summary: YaST2 - Graphical User Interface
@@ -43,7 +43,7 @@
Stefan Hundhammer
%prep
-%setup -n yast2-qt-2.15.12
+%setup -n yast2-qt-2.15.14
%build
%{prefix}/bin/y2tool y2autoconf
@@ -89,6 +89,12 @@
%doc %{prefix}/share/doc/packages/yast2-qt
%changelog
+* Mon Aug 27 2007 - sh@suse.de
+- Fixed bug #297637: Repository names not shown in Package Manager
+- V 2.15.14
+* Thu Aug 23 2007 - kmachalkova@suse.cz
+- Display repository name instead of product name in package selector
+ (#296782)
* Wed Aug 15 2007 - jsuchome@suse.cz
- Messages back from proofreading
- 2.15.12
++++++ yast2-qt-2.15.12.tar.bz2 -> yast2-qt-2.15.14.tar.bz2 ++++++
++++ 1786 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-qt-2.15.12/configure.in new/yast2-qt-2.15.14/configure.in
--- old/yast2-qt-2.15.12/configure.in 2007-08-14 17:25:30.000000000 +0200
+++ new/yast2-qt-2.15.14/configure.in 2007-08-23 14:50:58.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-qt
dnl
-dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-qt, 2.15.11, http://bugs.opensuse.org/, yast2-qt)
+AC_INIT(yast2-qt, 2.15.12, http://bugs.opensuse.org/, yast2-qt)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.11"
+VERSION="2.15.12"
RPMNAME="yast2-qt"
MAINTAINER="Stefan Hundhammer "
@@ -143,8 +143,8 @@
AC_PROG_CC
AC_PROG_CPP
-CFLAGS="${CFLAGS} -Wall -Wformat -Wmissing-prototypes"
-CXXFLAGS="${CXXFLAGS} -Wall -Wformat"
+CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2"
: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
AC_SUBST(AGENT_LIBADD)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-qt-2.15.12/Makefile.am new/yast2-qt-2.15.14/Makefile.am
--- old/yast2-qt-2.15.12/Makefile.am 2007-08-14 17:25:30.000000000 +0200
+++ new/yast2-qt-2.15.14/Makefile.am 2007-08-23 14:50:58.000000000 +0200
@@ -210,8 +210,7 @@
# For po/ modules
checkpo:
- test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
-# test ! -d $(srcdir)/po \
-# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
+# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# Contents of ./SUBDIRS
SUBDIRS = src doc fonts testsuite
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-qt-2.15.12/src/pkg/YQPkgRepoList.cc new/yast2-qt-2.15.14/src/pkg/YQPkgRepoList.cc
--- old/yast2-qt-2.15.12/src/pkg/YQPkgRepoList.cc 2007-08-10 14:05:43.000000000 +0200
+++ new/yast2-qt-2.15.14/src/pkg/YQPkgRepoList.cc 2007-08-27 16:01:20.000000000 +0200
@@ -33,6 +33,7 @@
using std::set;
using std::vector;
+#define SHOW_SINGLE_PRODUCT 0
YQPkgRepoList::YQPkgRepoList( QWidget * parent )
@@ -224,13 +225,16 @@
{
if ( nameCol() >= 0 )
{
- string name;
+ string name = repo.info().name();
+
+#if SHOW_SINGLE_PRODUCT
ZyppProduct product = singleProduct( _zyppRepo );
if ( product ) // only if the repository provides exactly one product
{ // (which is the most common case)
name = product->summary();
}
+#endif
if ( ! name.empty() )
setText( nameCol(), name.c_str() );
@@ -281,7 +285,7 @@
if ( zypp::dynamic_pointer_castzypp::Product( *it ) )
{
y2milestone( "Multiple products in repository %s",
- zyppRepo.info().alias().c_str() );
+ zyppRepo.info().name().c_str() );
ZyppProduct null;
return null;
}
@@ -291,7 +295,7 @@
if ( ! product )
y2milestone( "No product in repository %s",
- zyppRepo.info().alias().c_str() );
+ zyppRepo.info().name().c_str() );
return product;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-qt-2.15.12/src/pkg/YQPkgVersionsView.cc new/yast2-qt-2.15.14/src/pkg/YQPkgVersionsView.cc
--- old/yast2-qt-2.15.12/src/pkg/YQPkgVersionsView.cc 2007-08-10 14:05:43.000000000 +0200
+++ new/yast2-qt-2.15.14/src/pkg/YQPkgVersionsView.cc 2007-08-27 16:01:49.000000000 +0200
@@ -248,7 +248,7 @@
if ( versionCol() >= 0 ) setText( versionCol(), zyppObj->edition().asString().c_str() );
if ( archCol() >= 0 ) setText( archCol(), zyppObj->arch().asString().c_str() );
- if ( repoCol() >= 0 ) setText( repoCol(), zyppObj->repository().info().alias().c_str() );
+ if ( repoCol() >= 0 ) setText( repoCol(), zyppObj->repository().info().name().c_str() );
if ( productCol() >= 0 )
{
ZyppProduct product = YQPkgRepoListItem::singleProduct( zyppObj->repository() );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-qt-2.15.12/src/YQUIThreadHandler.h new/yast2-qt-2.15.14/src/YQUIThreadHandler.h
--- old/yast2-qt-2.15.12/src/YQUIThreadHandler.h 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-qt-2.15.14/src/YQUIThreadHandler.h 2007-08-01 17:25:23.000000000 +0200
@@ -0,0 +1,103 @@
+/*---------------------------------------------------------------------\
+| |
+| __ __ ____ _____ ____ |
+| \ \ / /_ _/ ___|_ _|___ \ |
+| \ V / _` \___ \ | | __) | |
+| | | (_| |___) || | / __/ |
+| |_|\__,_|____/ |_| |_____| |
+| |
+| core system |
+| (C) SuSE GmbH |
+\----------------------------------------------------------------------/
+
+ File: YQUIThreadHandler.h
+
+ Authors: Stefan Hundhammer
+
+/-*/
+
+#ifndef YQUIThreadHandler_h
+#define YQUIThreadHandler_h
+
+#include
+
+
+#include "qthread.h"
+
+class YQUIThread;
+
+
+/**
+ * Helper class to manage UI threads based on QThread.
+ **/
+class YQUIThreadHandler: public YUIThreadHandler
+{
+public:
+
+ /**
+ * Constructor. Takes the function to be started upon startThread() and the
+ * sole argument to that function. The constructor just stores both
+ * parameters; it will neither create a thread nor call the function.
+ * Use startThread() for that at some later time.
+ **/
+ YQUIThreadHandler( voidPtrFunction startFunc, void * startFuncArg );
+
+ /**
+ * Destructor.
+ *
+ * Notice that this will NOT call terminateUIThread() since
+ * virtual functions can't be used (as virtual functions) in the
+ * destructor. Remember to call terminateUIThread() manually.
+ **/
+ virtual ~YQUIThreadHandler();
+
+ /***
+ * Start the UI thread with the function (and the argument to that
+ * function) passed in the constructor.
+ *
+ * Reimplemented from YUIThreadHandler.
+ **/
+ virtual void startUIThread();
+
+ /**
+ * Terminate the UI thread if it running.
+ *
+ * Reimplemented from YUIThreadHandler.
+ **/
+ virtual void terminateUIThread();
+
+
+protected:
+
+ YQUIThread * _yquiThread;
+};
+
+
+class YQUIThread: public QThread
+{
+public:
+
+ /**
+ * Constructor.
+ **/
+ YQUIThread( voidPtrFunction startFunc, void * startFuncArg );
+
+ /**
+ * Destructor.
+ **/
+ virtual ~YQUIThread() {}
+
+ /**
+ * The worker function. Calls startfunc( startFuncArg ).
+ **/
+ virtual void run();
+
+
+private:
+
+ voidPtrFunction _startFunc;
+ void * _startFuncArg;
+};
+
+
+#endif // YQUIThreadHandler_h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-qt-2.15.12/VERSION new/yast2-qt-2.15.14/VERSION
--- old/yast2-qt-2.15.12/VERSION 2007-08-15 13:02:58.000000000 +0200
+++ new/yast2-qt-2.15.14/VERSION 2007-08-27 16:17:43.000000000 +0200
@@ -1 +1 @@
-2.15.12
+2.15.14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org