Hello community,

here is the log from the commit of package apper for openSUSE:12.1 checked in 
at 2011-11-02 13:11:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1/apper (Old)
 and      /work/SRC/openSUSE:12.1/.apper.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "apper", Maintainer is ""

Changes:
--------
--- /work/SRC/openSUSE:12.1/apper/apper.changes 2011-10-28 15:35:52.000000000 
+0200
+++ /work/SRC/openSUSE:12.1/.apper.new/apper.changes    2011-11-02 
13:11:19.000000000 +0100
@@ -1,0 +2,11 @@
+Sat Oct 29 20:20:26 UTC 2011 - [email protected]
+
+- Add patch so that accepting the EULA dialog works (bnc#700526)
+ 
+-------------------------------------------------------------------
+Thu Oct 27 13:11:47 UTC 2011 - [email protected]
+
+- license update: GPL-2.0+
+  SPDX syntax (http://www.spdx.org/licenses)
+
+-------------------------------------------------------------------

New:
----
  apper-accept-eula.diff
  apper-ui-fixes.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ apper.spec ++++++
--- /var/tmp/diff_new_pack.LUHrHB/_old  2011-11-02 13:11:19.000000000 +0100
+++ /var/tmp/diff_new_pack.LUHrHB/_new  2011-11-02 13:11:19.000000000 +0100
@@ -15,15 +15,18 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Summary:        KDE interface for PackageKit
 
 Name:           apper
 Version:        0.7.0
 Release:        1
-License:        GPLv2+
+License:        GPL-2.0+
 Group:          System/Packages
 Source0:        %{name}-%{version}.tar.bz2
 Patch0:         revert-upstream.diff
+Patch1:         apper-accept-eula.diff
+Patch2:         apper-ui-fixes.diff
 Url:            http://kde-apps.org/content/show.php/Apper?content=84745
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libkde4-devel 
@@ -50,6 +53,8 @@
 %setup -q -n %{name}-%{version}
 # For now revert this specific commit to make libapper.so in a private 
library. INSTALL_RPATH seems not to function
 %patch0 -p1 
+%patch1 -p1 
+#%patch2 -p1 
 
 %build
 %cmake_kde4 -d build -- -DEDIT_ORIGNS_DESKTOP_NAME="yast inst_source"

++++++ apper-accept-eula.diff ++++++
Index: apper-0.7.0/libapper/PkTransaction.cpp
===================================================================
--- apper-0.7.0.orig/libapper/PkTransaction.cpp
+++ apper-0.7.0/libapper/PkTransaction.cpp
@@ -546,7 +546,7 @@ void PkTransaction::eulaRequired(Package
     }
 
     LicenseAgreement *eula = new LicenseAgreement(info, this);
-    connect(eula, SIGNAL(accepted()), this, SLOT(installSignature()));
+    connect(eula, SIGNAL(yesClicked()), this, SLOT(acceptEula()));
     connect(eula, SIGNAL(rejected()), this, SLOT(reject()));
     showDialog(eula);
 }
@@ -560,11 +560,11 @@ void PkTransaction::acceptEula()
         setTransaction(trans, Transaction::RoleAcceptEula);
         trans->acceptEula(eula->id());
         if (trans->error()) {
-            showSorry(i18n("Failed to install signature"),
+            showSorry(i18n("Failed to accept EULA"),
                       PkStrings::daemonError(trans->error()));
         }
     } else {
-        kWarning() << "something is broken";
+        kWarning() << "something is broken, slot is bound to LicenseAgreement 
but signalled from elsewhere.";
     }
 }
 
++++++ apper-ui-fixes.diff ++++++
Index: apper-0.7.0/ApperKCM/ApperKCM.ui
===================================================================
--- apper-0.7.0.orig/ApperKCM/ApperKCM.ui
+++ apper-0.7.0/ApperKCM/ApperKCM.ui
@@ -227,7 +227,7 @@
        <item>
         <widget class="QPushButton" name="checkUpdatesPB">
          <property name="text">
-          <string>Check for new Updates</string>
+          <string>Check for new updates</string>
          </property>
          <property name="flat">
           <bool>true</bool>
Index: apper-0.7.0/ApperKCM/Updater/Updater.cpp
===================================================================
--- apper-0.7.0.orig/ApperKCM/Updater/Updater.cpp
+++ apper-0.7.0/ApperKCM/Updater/Updater.cpp
@@ -347,7 +347,7 @@ void Updater::on_packageView_customConte
     menu->addAction(m_showPackageArch);
     menu->addAction(m_showPackageSize);
     QAction *action;
-    action = menu->addAction(i18n("Check for new Updates"));
+    action = menu->addAction(i18n("Check for new updates"));
     action->setIcon(KIcon("view-refresh"));
     connect(action, SIGNAL(triggered(bool)),
             this, SIGNAL(refreshCache()));
Index: apper-0.7.0/libapper/ApplicationLauncher.cpp
===================================================================
--- apper-0.7.0.orig/libapper/ApplicationLauncher.cpp
+++ apper-0.7.0/libapper/ApplicationLauncher.cpp
@@ -33,7 +33,7 @@ ApplicationLauncher::ApplicationLauncher
 {
     ui->setupUi(mainWidget());
     setObjectName("ApplicationLauncher");
-
+    setCaption(i18n("Application Installed")); 
     connect(ui->kdialogbuttonbox, SIGNAL(rejected()), this, SLOT(accept()));
     setButtons(KDialog::None);
 
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to