[kpackagekit] show arch information by default (on multilib-capable archs)

Rex Dieter rdieter at fedoraproject.org
Thu Dec 23 14:53:22 UTC 2010


commit ecf07c16db21e89370c7ac3a1488cedac81055cd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Dec 23 08:52:53 2010 -0600

    show arch information by default (on multilib-capable archs)

 kpackagekit-0.6.3.2-showarch.patch |   12 ++++++++++++
 kpackagekit.spec                   |    8 ++++++++
 2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/kpackagekit-0.6.3.2-showarch.patch b/kpackagekit-0.6.3.2-showarch.patch
new file mode 100644
index 0000000..e3a0299
--- /dev/null
+++ b/kpackagekit-0.6.3.2-showarch.patch
@@ -0,0 +1,12 @@
+diff -up kpackagekit-0.6.3.2/Updater/UpdateKCM.cpp.showarch kpackagekit-0.6.3.2/Updater/UpdateKCM.cpp
+--- kpackagekit-0.6.3.2/Updater/UpdateKCM.cpp.showarch	2010-12-23 08:43:48.621102138 -0600
++++ kpackagekit-0.6.3.2/Updater/UpdateKCM.cpp	2010-12-23 08:44:25.596703121 -0600
+@@ -133,7 +133,7 @@ UpdateKCM::UpdateKCM(QWidget *&parent, c
+     m_showPackageArch->setCheckable(true);
+     connect(m_showPackageArch, SIGNAL(toggled(bool)),
+             this, SLOT(showArchs(bool)));
+-    m_showPackageArch->setChecked(viewGroup.readEntry("ShowArchs", false));
++    m_showPackageArch->setChecked(viewGroup.readEntry("ShowArchs", true));
+     showArchs(m_showPackageArch->isChecked());
+ 
+     checkUpdatesPB->setIcon(KIcon("view-refresh"));
diff --git a/kpackagekit.spec b/kpackagekit.spec
index e85d9db..1463f07 100644
--- a/kpackagekit.spec
+++ b/kpackagekit.spec
@@ -32,6 +32,10 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # enable "ShowVersion" option by default
 # http://bugzilla.redhat.com/665372
 Patch1: kpackagekit-0.6.3.2-showversion.patch
+# enable "ShowArch" option by default, 
+# on multilib-capable archs where it matters more
+%define multilib_arch x86_64
+Patch2: kpackagekit-0.6.3.2-showarch.patch
 
 ## upstream patches
 # fix issues id'd by valgrind
@@ -68,6 +72,9 @@ rmdir kpackagekit-translations-%{snap}
 %endif
 
 %patch1 -p1 -b .showversion
+%ifarch %{multilib_arch}
+%patch2 -p1 -b .showarch
+%endif
 %patch100 -p1 -b .valgrind
 
 
@@ -131,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Thu Dec 23 2010 Rex Dieter <rdieter at fedoraproject.org> 0.6.3.2-2
 - show version information by default (#665372)
+- show arch information by default (on multilib-capable archs)
 - upstream patch for issues found by valgrind
 
 * Thu Dec 23 2010 Rex Dieter <rdieter at fedoraproject.org> 0.6.3.2-1


More information about the scm-commits mailing list