openSUSE Commits
Threads by month
- ----- 2024 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
April 2010
- 2 participants
- 1248 discussions
Hello community,
here is the log from the commit of package koffice2-l10n for openSUSE:Factory
checked in at Thu Apr 1 18:14:17 CEST 2010.
--------
--- KDE/koffice2-l10n/koffice2-l10n.changes 2010-01-12 20:00:39.000000000 +0100
+++ /mounts/work_src_done/STABLE/koffice2-l10n/koffice2-l10n.changes 2010-03-31 16:23:59.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Mar 31 14:14:28 UTC 2010 - wstephenson(a)novell.com
+
+- update to 2.1.2 release
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
koffice-l10n-ca-2.1.1.tar.bz2
koffice-l10n-da-2.1.1.tar.bz2
koffice-l10n-de-2.1.1.tar.bz2
koffice-l10n-el-2.1.1.tar.bz2
koffice-l10n-en_GB-2.1.1.tar.bz2
koffice-l10n-es-2.1.1.tar.bz2
koffice-l10n-et-2.1.1.tar.bz2
koffice-l10n-fr-2.1.1.tar.bz2
koffice-l10n-fy-2.1.1.tar.bz2
koffice-l10n-gl-2.1.1.tar.bz2
koffice-l10n-hne-2.1.1.tar.bz2
koffice-l10n-it-2.1.1.tar.bz2
koffice-l10n-ja-2.1.1.tar.bz2
koffice-l10n-kk-2.1.1.tar.bz2
koffice-l10n-nb-2.1.1.tar.bz2
koffice-l10n-nds-2.1.1.tar.bz2
koffice-l10n-nl-2.1.1.tar.bz2
koffice-l10n-pl-2.1.1.tar.bz2
koffice-l10n-pt-2.1.1.tar.bz2
koffice-l10n-pt_BR-2.1.1.tar.bz2
koffice-l10n-sv-2.1.1.tar.bz2
koffice-l10n-tr-2.1.1.tar.bz2
koffice-l10n-uk-2.1.1.tar.bz2
koffice-l10n-wa-2.1.1.tar.bz2
koffice-l10n-zh_CN-2.1.1.tar.bz2
koffice-l10n-zh_TW-2.1.1.tar.bz2
New:
----
koffice-l10n-ca-2.1.2.tar.bz2
koffice-l10n-ca(a)valencia-2.1.2.tar.bz2
koffice-l10n-da-2.1.2.tar.bz2
koffice-l10n-de-2.1.2.tar.bz2
koffice-l10n-el-2.1.2.tar.bz2
koffice-l10n-en_GB-2.1.2.tar.bz2
koffice-l10n-es-2.1.2.tar.bz2
koffice-l10n-et-2.1.2.tar.bz2
koffice-l10n-fr-2.1.2.tar.bz2
koffice-l10n-fy-2.1.2.tar.bz2
koffice-l10n-gl-2.1.2.tar.bz2
koffice-l10n-hne-2.1.2.tar.bz2
koffice-l10n-it-2.1.2.tar.bz2
koffice-l10n-ja-2.1.2.tar.bz2
koffice-l10n-kk-2.1.2.tar.bz2
koffice-l10n-nb-2.1.2.tar.bz2
koffice-l10n-nds-2.1.2.tar.bz2
koffice-l10n-nl-2.1.2.tar.bz2
koffice-l10n-pl-2.1.2.tar.bz2
koffice-l10n-pt-2.1.2.tar.bz2
koffice-l10n-pt_BR-2.1.2.tar.bz2
koffice-l10n-sv-2.1.2.tar.bz2
koffice-l10n-tr-2.1.2.tar.bz2
koffice-l10n-uk-2.1.2.tar.bz2
koffice-l10n-wa-2.1.2.tar.bz2
koffice-l10n-zh_CN-2.1.2.tar.bz2
koffice-l10n-zh_TW-2.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ koffice2-l10n.spec ++++++
--- /var/tmp/diff_new_pack.QefrW2/_old 2010-04-01 18:12:33.000000000 +0200
+++ /var/tmp/diff_new_pack.QefrW2/_new 2010-04-01 18:12:33.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package koffice2-l10n (Version 2.1.1)
+# spec file for package koffice2-l10n (Version 2.1.2)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -25,40 +25,41 @@
License: GPLv2+
Group: System/Localization
Summary: Translations for KDE Applications
-Version: 2.1.1
+Version: 2.1.2
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Source0: koffice-l10n-ca-%version.tar.bz2
-Source1: koffice-l10n-da-%version.tar.bz2
-Source2: koffice-l10n-de-%version.tar.bz2
-Source3: koffice-l10n-el-%version.tar.bz2
-Source4: koffice-l10n-en_GB-%version.tar.bz2
-Source5: koffice-l10n-es-%version.tar.bz2
-Source6: koffice-l10n-et-%version.tar.bz2
-Source7: koffice-l10n-fr-%version.tar.bz2
-Source8: koffice-l10n-fy-%version.tar.bz2
-Source9: koffice-l10n-gl-%version.tar.bz2
-Source10: koffice-l10n-it-%version.tar.bz2
-Source11: koffice-l10n-ja-%version.tar.bz2
-Source12: koffice-l10n-kk-%version.tar.bz2
-Source13: koffice-l10n-nb-%version.tar.bz2
-Source14: koffice-l10n-nds-%version.tar.bz2
-Source15: koffice-l10n-nl-%version.tar.bz2
-Source16: koffice-l10n-pl-%version.tar.bz2
-Source17: koffice-l10n-pt-%version.tar.bz2
-Source18: koffice-l10n-pt_BR-%version.tar.bz2
-Source19: koffice-l10n-sv-%version.tar.bz2
-Source20: koffice-l10n-tr-%version.tar.bz2
-Source21: koffice-l10n-uk-%version.tar.bz2
-Source22: koffice-l10n-wa-%version.tar.bz2
-Source23: koffice-l10n-zh_CN-%version.tar.bz2
-Source24: koffice-l10n-zh_TW-%version.tar.bz2
-Source25: koffice-l10n-hne-%version.tar.bz2
+Source1: koffice-l10n-ca(a)valencia-%version.tar.bz2
+Source2: koffice-l10n-da-%version.tar.bz2
+Source3: koffice-l10n-de-%version.tar.bz2
+Source4: koffice-l10n-el-%version.tar.bz2
+Source5: koffice-l10n-en_GB-%version.tar.bz2
+Source6: koffice-l10n-es-%version.tar.bz2
+Source7: koffice-l10n-et-%version.tar.bz2
+Source8: koffice-l10n-fr-%version.tar.bz2
+Source9: koffice-l10n-fy-%version.tar.bz2
+Source10: koffice-l10n-gl-%version.tar.bz2
+Source11: koffice-l10n-it-%version.tar.bz2
+Source12: koffice-l10n-ja-%version.tar.bz2
+Source13: koffice-l10n-kk-%version.tar.bz2
+Source14: koffice-l10n-nb-%version.tar.bz2
+Source15: koffice-l10n-nds-%version.tar.bz2
+Source16: koffice-l10n-nl-%version.tar.bz2
+Source17: koffice-l10n-pl-%version.tar.bz2
+Source18: koffice-l10n-pt-%version.tar.bz2
+Source19: koffice-l10n-pt_BR-%version.tar.bz2
+Source20: koffice-l10n-sv-%version.tar.bz2
+Source21: koffice-l10n-tr-%version.tar.bz2
+Source22: koffice-l10n-uk-%version.tar.bz2
+Source23: koffice-l10n-wa-%version.tar.bz2
+Source24: koffice-l10n-zh_CN-%version.tar.bz2
+Source25: koffice-l10n-zh_TW-%version.tar.bz2
+Source26: koffice-l10n-hne-%version.tar.bz2
#@SOURCES@
Source200: update_spec.pl
Source201: attributes
-%define build_languages ca da de el en_GB es et fr fy gl it ja kk nb nds nl pl pt pt_BR sv tr uk wa zh_CN zh_TW hne
+%define build_languages ca ca@valencia da de el en_GB es et fr fy gl it ja kk nb nds nl pl pt pt_BR sv tr uk wa zh_CN zh_TW hne
%description
Translations for KDE applications.
@@ -82,6 +83,15 @@
%description ca-doc
Catalan translations for KOffice
+%package ca@valencia
+License: GPLv2+
+Summary: KOffice2 Translations for ca@valencia
+Group: System/GUI/KDE
+Provides: locale(koffice2:ca@valencia)
+
+%description ca@valencia
+ca@valencia
+
%package da
License: GPLv2+
Summary: Danish translations for KOffice
@@ -411,9 +421,10 @@
%description hne
hne
+#@PACKAGES@
%prep
-%setup -q -n koffice-l10n-de-%version -b 0 -b 1 -b 2 -b 3 -b 4 -b 5 -b 6 -b 7 -b 8 -b 9 -b 10 -b 11 -b 12 -b 13 -b 14 -b 15 -b 16 -b 17 -b 18 -b 19 -b 20 -b 21 -b 22 -b 23 -b 24 -b 25
+%setup -q -n koffice-l10n-de-%version -b 0 -b 1 -b 2 -b 3 -b 4 -b 5 -b 6 -b 7 -b 8 -b 9 -b 10 -b 11 -b 12 -b 13 -b 14 -b 15 -b 16 -b 17 -b 18 -b 19 -b 20 -b 21 -b 22 -b 23 -b 24 -b 25 -b 26
%build
cd ..
@@ -430,9 +441,11 @@
pushd koffice-l10n-$i-%version/build || exit 1
%makeinstall
popd
+
# work-around for bnc#457908
mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/$i/common
done
+
for i in %build_languages; do
filename=$i
case $i in
@@ -465,6 +478,8 @@
%files ca-doc -f ../files.doc.ca
+%files ca@valencia -f ../files.both.ca@valencia
+
%files da -f ../files.da
%files da-doc -f ../files.doc.da
++++++ koffice-l10n-ca-2.1.1.tar.bz2 -> koffice-l10n-ca-2.1.2.tar.bz2 ++++++
++++ 49778 lines of diff (skipped)
++++++ koffice-l10n-da-2.1.1.tar.bz2 -> koffice-l10n-da-2.1.2.tar.bz2 ++++++
++++ 42087 lines of diff (skipped)
++++++ koffice-l10n-de-2.1.1.tar.bz2 -> koffice-l10n-de-2.1.2.tar.bz2 ++++++
++++ 43670 lines of diff (skipped)
++++++ koffice-l10n-el-2.1.1.tar.bz2 -> koffice-l10n-el-2.1.2.tar.bz2 ++++++
++++ 43897 lines of diff (skipped)
++++++ koffice-l10n-en_GB-2.1.1.tar.bz2 -> koffice-l10n-en_GB-2.1.2.tar.bz2 ++++++
++++ 42057 lines of diff (skipped)
++++++ koffice-l10n-es-2.1.1.tar.bz2 -> koffice-l10n-es-2.1.2.tar.bz2 ++++++
++++ 43378 lines of diff (skipped)
++++++ koffice-l10n-et-2.1.1.tar.bz2 -> koffice-l10n-et-2.1.2.tar.bz2 ++++++
++++ 84395 lines of diff (skipped)
++++++ koffice-l10n-fr-2.1.1.tar.bz2 -> koffice-l10n-fr-2.1.2.tar.bz2 ++++++
KDE/koffice2-l10n/koffice-l10n-fr-2.1.1.tar.bz2 /mounts/work_src_done/STABLE/koffice2-l10n/koffice-l10n-fr-2.1.2.tar.bz2 differ: char 11, line 1
++++++ koffice-l10n-fy-2.1.1.tar.bz2 -> koffice-l10n-fy-2.1.2.tar.bz2 ++++++
++++ 44752 lines of diff (skipped)
++++++ koffice-l10n-gl-2.1.1.tar.bz2 -> koffice-l10n-gl-2.1.2.tar.bz2 ++++++
++++ 43666 lines of diff (skipped)
++++++ koffice-l10n-hne-2.1.1.tar.bz2 -> koffice-l10n-hne-2.1.2.tar.bz2 ++++++
++++ 43205 lines of diff (skipped)
++++++ koffice-l10n-it-2.1.1.tar.bz2 -> koffice-l10n-it-2.1.2.tar.bz2 ++++++
++++ 42627 lines of diff (skipped)
++++++ koffice-l10n-ja-2.1.1.tar.bz2 -> koffice-l10n-ja-2.1.2.tar.bz2 ++++++
++++ 44495 lines of diff (skipped)
++++++ koffice-l10n-kk-2.1.1.tar.bz2 -> koffice-l10n-kk-2.1.2.tar.bz2 ++++++
++++ 43762 lines of diff (skipped)
++++++ koffice-l10n-nb-2.1.1.tar.bz2 -> koffice-l10n-nb-2.1.2.tar.bz2 ++++++
++++ 42152 lines of diff (skipped)
++++++ koffice-l10n-nds-2.1.1.tar.bz2 -> koffice-l10n-nds-2.1.2.tar.bz2 ++++++
++++ 43090 lines of diff (skipped)
++++++ koffice-l10n-nl-2.1.1.tar.bz2 -> koffice-l10n-nl-2.1.2.tar.bz2 ++++++
++++ 93069 lines of diff (skipped)
++++++ koffice-l10n-pl-2.1.1.tar.bz2 -> koffice-l10n-pl-2.1.2.tar.bz2 ++++++
++++ 45345 lines of diff (skipped)
++++++ koffice-l10n-pt-2.1.1.tar.bz2 -> koffice-l10n-pt-2.1.2.tar.bz2 ++++++
++++ 42295 lines of diff (skipped)
++++++ koffice-l10n-pt_BR-2.1.1.tar.bz2 -> koffice-l10n-pt_BR-2.1.2.tar.bz2 ++++++
++++ 42701 lines of diff (skipped)
++++++ koffice-l10n-sv-2.1.1.tar.bz2 -> koffice-l10n-sv-2.1.2.tar.bz2 ++++++
++++ 42098 lines of diff (skipped)
++++++ koffice-l10n-tr-2.1.1.tar.bz2 -> koffice-l10n-tr-2.1.2.tar.bz2 ++++++
++++ 42170 lines of diff (skipped)
++++++ koffice-l10n-uk-2.1.1.tar.bz2 -> koffice-l10n-uk-2.1.2.tar.bz2 ++++++
++++ 43575 lines of diff (skipped)
++++++ koffice-l10n-wa-2.1.1.tar.bz2 -> koffice-l10n-wa-2.1.2.tar.bz2 ++++++
++++ 42366 lines of diff (skipped)
++++++ koffice-l10n-zh_CN-2.1.1.tar.bz2 -> koffice-l10n-zh_CN-2.1.2.tar.bz2 ++++++
++++ 43597 lines of diff (skipped)
++++++ koffice-l10n-zh_TW-2.1.1.tar.bz2 -> koffice-l10n-zh_TW-2.1.2.tar.bz2 ++++++
++++ 41828 lines of diff (skipped)
++++++ koffice2-l10n.spec.in ++++++
--- /var/tmp/diff_new_pack.QefrW2/_old 2010-04-01 18:12:45.000000000 +0200
+++ /var/tmp/diff_new_pack.QefrW2/_new 2010-04-01 18:12:45.000000000 +0200
@@ -17,7 +17,7 @@
License: GPL
Group: System/GUI/KDE
Summary: Translations for KOffice2
-Version: 2.1.1
+Version: 2.1.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kpackagekit for openSUSE:Factory
checked in at Thu Apr 1 18:11:52 CEST 2010.
--------
--- KDE/kpackagekit/kpackagekit.changes 2010-02-15 15:33:10.000000000 +0100
+++ /mounts/work_src_done/STABLE/kpackagekit/kpackagekit.changes 2010-03-26 17:18:53.000000000 +0100
@@ -1,0 +2,28 @@
+Fri Mar 26 16:13:23 UTC 2010 - wstephenson(a)suse.de
+
+- Update to 0.6.0
+ * Port to PackageKit 0.6
+ * Several bugs fixed
+
+0.5.4
+ * Fix automatic updates
+
+0.5.3
+ * Removed some lib dependencies from KdeD module to avoid crashes
+ there
+
+0.5.2
+ * Shows the icons of installed applications
+ * Session Interface
+ * Some fixes
+
+0.5.1
+ * Fix the restart bug once for all
+ * Fix the huge hangup on starting
+ * Some other fixes + strings update
+
+0.5.0
+ * Port to the new PackageKit version
+ * Some fixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
84745-kpackagekit-0.4.2.tar.bz2
gcc-45.diff
New:
----
KPackageKit-0.6.0.tar.xz
reduce-qt-version-req.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kpackagekit.spec ++++++
--- /var/tmp/diff_new_pack.yB90rK/_old 2010-04-01 18:11:05.000000000 +0200
+++ /var/tmp/diff_new_pack.yB90rK/_new 2010-04-01 18:11:05.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kpackagekit (Version 0.4.2)
+# spec file for package kpackagekit (Version 0.6.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,18 +19,19 @@
Summary: KDE interface for PackageKit
Name: kpackagekit
-Version: 0.4.2
-Release: 2
+Version: 0.6.0
+Release: 1
License: GPLv3
Group: System/Packages
#http://websvn.kde.org/trunk/playground/sysadmin/kpackagekit/
-Source0: http://www.kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}.…
+Source0: http://www.kde-apps.org/CONTENT/content-files/KPackageKit-%{version}.tar.xz
Url: http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: libkde4-devel libpackagekit-qt12-devel
+BuildRequires: libkde4-devel libpackagekit-qt-devel
Requires: PackageKit
Patch1: desktop.diff
-Patch2: gcc-45.diff
+Patch2: reduce-qt-version-req.diff
+Requires: %{name}-lang = %{version}
%kde4_runtime_requires
%description
@@ -43,27 +44,14 @@
Adrien BUSTANY <madcat(a)mymadcat.com>
Daniel Nicoletti <dantti85-pk(a)yahoo.com.br>
-%files -f kpackagekit.lang
-%defattr(-,root,root)
-%{_kde_libdir}/kde4/*.so
-%{_libdir}/libkpackagekitlib.so
-/usr/share/kde4/apps/kpackagekit
-/usr/bin/kpackagekit
-#/usr/bin/kpackagekit-smart-icon
-#/usr/share/kde4/apps/kpackagekit-smart-icon
-/usr/share/applications/kde4/kpackagekit.desktop
-#/usr/share/kde4/apps/kpackagekit-smart-icon/kpackagekit-smart-icon.notifyrc
-/usr/share/kde4/services
-%{_libdir}/kde4/libexec/kpackagekitsmarticon
-/usr/share/dbus-1/services/org.kde.KPackageKitSmartIcon.service
-/usr/share/kde4/apps/KPackageKitSmartIcon/KPackageKitSmartIcon.notifyrc
-/usr/share/kde4/apps/KPackageKitSmartIcon
#--------------------------------------------------------------------
+
+%lang_package
%prep
-%setup -q -n kpackagekit-%version
-%patch1 -p1
-%patch2
+%setup -q -n KPackageKit-%version
+%patch1
+%patch2 -p1
%build
%cmake_kde4 -d build
@@ -77,6 +65,21 @@
%kde_post_install
%find_lang kpackagekit kpackagekit.lang
+%files
+%defattr(-,root,root)
+%_kde_modulesdir/kde4/*.so
+%{_libdir}/libkpackagekitlib.so
+%_kde4_appsdir/kpackagekit
+%_kde4_appsdir/KPackageKitSmartIcon
+%_kde4_bindir/kpackagekit
+%_kde4_applicationsdir/kpackagekit.desktop
+%_kde4_servicesdir
+%_kde4_libexecdir/kpackagekitsmarticon
+/usr/share/dbus-1/services/org.kde.KPackageKitSmartIcon.service
+/usr/share/dbus-1/services/org.freedesktop.PackageKit.service
+
+%files lang -f %{name}.lang
+
%clean
%changelog
++++++ reduce-qt-version-req.diff ++++++
Index: KPackageKit-0.6.0/CMakeLists.txt
===================================================================
--- KPackageKit-0.6.0.orig/CMakeLists.txt
+++ KPackageKit-0.6.0/CMakeLists.txt
@@ -6,7 +6,7 @@ find_package(KDE4 REQUIRED)
find_package(Gettext)
include(FindPkgConfig)
-pkg_check_modules(QPACKAGEKIT REQUIRED packagekit-qt>=0.6.3)
+pkg_check_modules(QPACKAGEKIT REQUIRED packagekit-qt>=0.6.2)
include(KDE4Defaults)
add_definitions(${QT_DEFINITIONS}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package ldtp for openSUSE:Factory
checked in at Thu Apr 1 18:11:15 CEST 2010.
--------
--- ldtp/ldtp.changes 2010-02-12 01:43:21.000000000 +0100
+++ /mounts/work_src_done/STABLE/ldtp/ldtp.changes 2010-03-30 20:23:44.000000000 +0200
@@ -1,0 +2,21 @@
+Tue Mar 30 20:22:46 CEST 2010 - vuntz(a)opensuse.org
+
+- Update to version 2.0.5:
+ + bgo#614249 - Connection refused when importing ldtp module
+
+-------------------------------------------------------------------
+Sat Mar 27 12:10:41 CET 2010 - vuntz(a)opensuse.org
+
+- Update to version 2.0.4:
+ + Fix LDTPv2 hang
+ + Don't navigate table cell, as it causes more resource and time
+ in OpenOffice calc
+ + Added new API simulatemousemove for DnD test (VMware
+ Workstation / Player Unity-GHI feature)
+ + Fix bgo#612311
+ + Listen all Window events, else new application like Firefox is
+ not listed
+ + waittillguiexist now can wait for state as well
+ + hasstate can wait for given time till the state is True
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
ldtp-2.0.3.tar.bz2
New:
----
ldtp-2.0.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ldtp.spec ++++++
--- /var/tmp/diff_new_pack.zt7N0l/_old 2010-04-01 18:06:08.000000000 +0200
+++ /var/tmp/diff_new_pack.zt7N0l/_new 2010-04-01 18:06:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ldtp (Version 2.0.3)
+# spec file for package ldtp (Version 2.0.5)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,7 +19,7 @@
Name: ldtp
-Version: 2.0.3
+Version: 2.0.5
Release: 1
License: GPLv2+ ; LGPLv2.1+
Summary: Linux Desktop Testing Project (LDTP)
++++++ ldtp-2.0.3.tar.bz2 -> ldtp-2.0.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldtp-2.0.3/PKG-INFO new/ldtp-2.0.5/PKG-INFO
--- old/ldtp-2.0.3/PKG-INFO 2010-02-11 07:55:00.000000000 +0100
+++ new/ldtp-2.0.5/PKG-INFO 2010-03-30 08:57:57.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: ldtp
-Version: 2.0.3
+Version: 2.0.5
Summary: Linux Desktop Testing Project Version 2
Home-page: http://ldtp.freesktop.org
Author: Nagappan Alagappan
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldtp-2.0.3/ldtp/client.py new/ldtp-2.0.5/ldtp/client.py
--- old/ldtp-2.0.3/ldtp/client.py 2010-02-11 07:53:45.000000000 +0100
+++ new/ldtp-2.0.5/ldtp/client.py 2010-03-30 08:54:20.000000000 +0200
@@ -20,6 +20,8 @@
import os
import sys
import time
+import signal
+import traceback
import xmlrpclib
import subprocess
from socket import error as SocketError
@@ -44,9 +46,8 @@
class Transport(xmlrpclib.Transport):
def _spawn_daemon(self):
- self._daemon = subprocess.Popen(
- ['python', '-c', 'import ldtpd; ldtpd.main()'],
- close_fds = True)
+ self._daemon = os.spawnlp(os.P_NOWAIT, 'python',
+ 'python', '-c', 'import ldtpd; ldtpd.main()')
def request(self, host, handler, request_body, verbose=0):
try:
@@ -71,7 +72,8 @@
def kill_daemon(self):
try:
- self._daemon.kill()
+ # SIGKILL 9 Term Kill signal
+ os.kill(self._daemon, 9)
except AttributeError:
pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldtp-2.0.3/ldtpd/combo_box.py new/ldtp-2.0.5/ldtpd/combo_box.py
--- old/ldtp-2.0.3/ldtpd/combo_box.py 2010-02-11 07:53:45.000000000 +0100
+++ new/ldtp-2.0.5/ldtpd/combo_box.py 2010-03-30 08:54:20.000000000 +0200
@@ -327,7 +327,7 @@
if self._glob_match(item_name, text):
selectioni = child_obj.querySelection()
- print selectioni.selectChild(index)
+ selectioni.selectChild(index)
try:
try:
# In Firefox Preferences: Action to select
@@ -397,6 +397,10 @@
index += 1
raise LdtpServerException('Unable to select item index')
+ # Since selectindex and comboselectindex implementation are same,
+ # for backward compatibility let us assign selectindex to comboselectindex
+ comboselectindex = selectindex
+
def getallitem(self, window_name, object_name):
'''
Select combo box item
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldtp-2.0.3/ldtpd/core.py new/ldtp-2.0.5/ldtpd/core.py
--- old/ldtp-2.0.3/ldtpd/core.py 2010-02-11 07:53:45.000000000 +0100
+++ new/ldtp-2.0.5/ldtpd/core.py 2010-03-30 08:54:20.000000000 +0200
@@ -52,9 +52,6 @@
'''
def __init__(self):
Utils.__init__(self)
- self._states = {}
- self._state_names = {}
- self._get_all_state_names()
# Window up time and onwindowcreate events
self._events = ["window:create", "window:destroy"]
# User registered events
@@ -68,7 +65,10 @@
def _registered_event_cb(self, event):
if event and event.source and event.type:
- abbrev_role, abbrev_name = self._ldtpize_accessible(event.source)
+ try:
+ abbrev_role, abbrev_name = self._ldtpize_accessible(event.source)
+ except:
+ return
window_name = u'%s%s' % (abbrev_role, abbrev_name)
self._callback_event.append(u"%s-%s" % (event.type, window_name))
@@ -78,12 +78,18 @@
if event and event.source and window and \
self._match_name_to_acc(window, event.source):
self._callback_event.append(u"onwindowcreate-%s" % window)
- abbrev_role, abbrev_name = self._ldtpize_accessible(event.source)
+ try:
+ abbrev_role, abbrev_name = self._ldtpize_accessible(event.source)
+ except:
+ return
win_name = u'%s%s' % (abbrev_role, abbrev_name)
self._window_uptime[win_name] = [event.source_name,
time.strftime("%Y %m %d %H %M %S")]
elif event and event.type == "window:destroy":
- abbrev_role, abbrev_name = self._ldtpize_accessible(event.source)
+ try:
+ abbrev_role, abbrev_name = self._ldtpize_accessible(event.source)
+ except:
+ return
win_name = u'%s%s' % (abbrev_role, abbrev_name)
if win_name in self._window_uptime:
self._window_uptime[win_name].append( \
@@ -112,7 +118,10 @@
window_list = []
window_type = {}
for gui in self._list_guis():
- window_name = self._ldtpize_accessible(gui)
+ try:
+ window_name = self._ldtpize_accessible(gui)
+ except:
+ continue
if window_name[1] == '':
if window_name[0] in window_type:
window_type[window_name[0]] += 1
@@ -132,18 +141,6 @@
def isalive(self):
return True
- def _get_all_state_names(self):
- """
- This is used by client internally to populate all states
- Create a dictionary
- """
- for state in pyatspi.STATE_VALUE_TO_NAME.keys():
- self._states[state.__repr__()] = state
- # Ignore STATE_ string for LDTPv1 compatibility
- self._state_names[state] = \
- state.__repr__().lower().partition("state_")[2]
- return self._states
-
def launchapp(self, cmd, args=[], delay = 5, env = 1):
'''
Launch application.
@@ -421,7 +418,7 @@
return int(waiter.run())
- def waittillguiexist(self, window_name, object_name='', guiTimeOut=30):
+ def waittillguiexist(self, window_name, object_name='', guiTimeOut=30, state = ''):
'''
Wait till a window or component exists.
@@ -433,12 +430,14 @@
@type object_name: string
@param guiTimeOut: Wait timeout in seconds
@type guiTimeOut: integer
+ @param state: Object state used only when object_name is provided.
+ @type object_name: string
@return: 1 if GUI was found, 0 if not.
@rtype: integer
'''
if object_name:
- waiter = ObjectExistsWaiter(window_name, object_name, guiTimeOut)
+ waiter = ObjectExistsWaiter(window_name, object_name, guiTimeOut, state)
else:
waiter = GuiExistsWaiter(window_name, guiTimeOut)
@@ -515,7 +514,7 @@
_state.unref()
return _obj_states
- def hasstate(self, window_name, object_name, state):
+ def hasstate(self, window_name, object_name, state, guiTimeOut = 0):
'''
has state
@@ -525,22 +524,18 @@
@param object_name: Object name to look for, either full name,
LDTP's name convention, or a Unix glob.
@type object_name: string
+ @param state: Object state.
+ @type object_name: string
+ @param guiTimeOut: Wait timeout in seconds
+ @type guiTimeOut: integer
@return: 1 on success.
@rtype: integer
'''
try:
- if re.search(';', object_name):
- obj = self._get_menu_hierarchy(window_name, object_name)
- else:
- obj = self._get_object(window_name, object_name)
-
- _state_inst = obj.getState()
- _obj_state = _state_inst.getStates()
- state = 'STATE_%s' % state.upper()
- if state in self._states and \
- self._states[state] in _obj_state:
- return 1
+ waiter = \
+ ObjectExistsWaiter(window_name, object_name, guiTimeOut, state)
+ return int(waiter.run())
except:
pass
return 0
@@ -801,30 +796,42 @@
elif prop == 'label':
obj = self._get_object(window_name, object_name) # A sanity check.
return obj.name
+ elif prop == 'label_by':
+ obj = self._get_object(window_name, object_name)
+ rel_set = obj.getRelationSet()
+ if rel_set:
+ for i, rel in enumerate(rel_set):
+ relationType = rel.getRelationType()
+ if relationType == pyatspi.RELATION_LABELLED_BY or \
+ relationType == pyatspi.RELATION_CONTROLLED_BY:
+ label_acc = rel.getTarget(i)
+ return label_acc.name
+ return obj.name
elif prop == 'obj_index':
role_count = {}
- for gui in self._list_guis():
- if self._match_name_to_acc(window_name, gui):
- for name, obj, obj_index in self._appmap_pairs(gui):
- role = obj.getRole()
- role_count[role] = role_count.get(role, 0) + 1
- if name == object_name:
- return obj_index
+ gui = self._get_window_handle(window_name)
+ for name, obj, obj_index in self._appmap_pairs(gui):
+ role = obj.getRole()
+ role_count[role] = role_count.get(role, 0) + 1
+ if name == object_name:
+ return obj_index
raise LdtpServerException(
'Unable to find object name in application map')
elif prop == 'parent':
cached_list = []
- for gui in self._list_guis():
- if self._match_name_to_acc(window_name, gui):
- for name, obj, obj_index in self._appmap_pairs(gui):
- if name == object_name:
- for pname, pobj in cached_list:
- if obj in pobj: # avoid double link issues
- return pname
- _parent = self._ldtpize_accessible(obj.parent)
- return '%s%s' % (_parent[0], _parent[1])
- cached_list.insert(0, (name, obj))
+ gui = self._get_window_handle(window_name)
+ for name, obj, obj_index in self._appmap_pairs(gui):
+ if name == object_name:
+ for pname, pobj in cached_list:
+ if obj in pobj: # avoid double link issues
+ return pname
+ try:
+ _parent = self._ldtpize_accessible(obj.parent)
+ except:
+ continue
+ return u'%s%s' % (_parent[0], _parent[1])
+ cached_list.insert(0, (name, obj))
raise LdtpServerException(
'Unable to find object name in application map')
@@ -832,15 +839,21 @@
obj = self._get_object(window_name, object_name)
return obj.getRoleName().replace(' ', '_')
elif prop == 'children':
- children = []
+ children = ''
obj = self._get_object(window_name, object_name)
- for gui in self._list_guis():
- if self._match_name_to_acc(window_name, gui):
- for name, child, obj_index in self._appmap_pairs(gui):
- if child in obj:
- children.append(name)
- break
- return ' '.join(children)
+ for i in range(obj.childCount):
+ child_obj = obj.getChildAtIndex(i)
+ try:
+ child_name = self._ldtpize_accessible(child_obj)
+ except:
+ continue
+ child_obj.unref()
+ child_name = u'%s%s' % (child_name[0], child_name[1])
+ if children:
+ children += u' %s' % child_name
+ else:
+ children = child_name
+ return children
raise LdtpServerException('Unknown property "%s" in %s' % \
(prop, object_name))
@@ -862,27 +875,29 @@
@rtype: list
'''
matches = []
- for gui in self._list_guis():
- if self._match_name_to_acc(window_name, gui):
- for name, obj, obj_index in self._appmap_pairs(gui):
- if child_name and role:
- if obj.getRoleName() == role and \
- (child_name == name or \
- self._match_name_to_acc(child_name, obj)):
- matches.append(name)
- elif role:
- if obj.getRoleName() == role:
- matches.append(name)
- elif child_name:
- if child_name == name or \
- self._match_name_to_acc(child_name, obj):
- matches.append(name)
-
- #print matches, first
- if matches and first:
- # Return once we have a match
- return matches
-
+ gui = self._get_window_handle(window_name)
+ if gui:
+ if role:
+ role = re.sub('_', ' ', role)
+ for name, obj, obj_index in self._appmap_pairs(gui):
+ if child_name and role:
+ if obj.getRoleName() == role and \
+ (child_name == name or \
+ self._match_name_to_acc(child_name, obj)):
+ matches.append(name)
+ elif role:
+ if obj.getRoleName() == role:
+ matches.append(name)
+ elif child_name:
+ if child_name == name or \
+ self._match_name_to_acc(child_name, obj):
+ matches.append(name)
+
+ #print matches, first
+ if matches and first:
+ # Return once we have a match
+ return matches
+
if not matches:
raise LdtpServerException('Could not find a child.')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldtp-2.0.3/ldtpd/mouse.py new/ldtp-2.0.5/ldtpd/mouse.py
--- old/ldtp-2.0.3/ldtpd/mouse.py 2010-02-11 07:53:45.000000000 +0100
+++ new/ldtp-2.0.5/ldtpd/mouse.py 2010-03-30 08:54:20.000000000 +0200
@@ -19,6 +19,7 @@
Headers in this file shall remain intact.
'''
+import time
import pyatspi
from utils import Utils
from server_exception import LdtpServerException
@@ -134,3 +135,65 @@
return self._mouse_event(_coordinates.x + _coordinates.width / 2,
_coordinates.y + _coordinates.height / 2,
'b1d')
+
+ def simulatemousemove(self, source_x, source_y, dest_x, dest_y, delay = 0.0):
+ """
+ @param source_x: Source X
+ @type source_x: integer
+ @param source_y: Source Y
+ @type source_y: integer
+ @param dest_x: Dest X
+ @type dest_x: integer
+ @param dest_y: Dest Y
+ @type dest_y: integer
+ @param delay: Sleep time between the mouse move
+ @type delay: double
+
+ @return: 1 if simulation was successful, 0 if not.
+ @rtype: integer
+ """
+ size = self._get_size(self._desktop)
+ if (source_x < size.x or source_y < size.y or \
+ dest_x > size.width or dest_y > size.height) and \
+ (source_x > size.width or source_y > size.height or \
+ dest_x < size.x or dest_y < size.y):
+ return 0
+
+ x_flag = False # Iterated x ?
+ y_flag = False # Iterated y ?
+ while True:
+ if not x_flag:
+ if source_x > dest_x:
+ # If source X greather than dest X
+ # then move -1 pixel
+ source_x -= 1
+ elif source_x < dest_x:
+ # If source X less than dest X
+ # then move +1 pixel
+ source_x += 1
+ else:
+ # If source X equal to dest X
+ # then don't process X co-ordinate
+ x_flag = True
+ if not y_flag:
+ if source_y > dest_y:
+ # If source Y greather than dest Y
+ # then move -1 pixel
+ source_y -= 1
+ elif source_y < dest_y:
+ # If source Y less than dest Y
+ # then move +1 pixel
+ source_y += 1
+ else:
+ # If source Y equal to dest Y
+ # then don't process Y co-ordinate
+ y_flag = True
+ if delay:
+ time.sleep(delay)
+ # Start mouse move from source_x, source_y to dest_x, dest_y
+ self.generatemouseevent(source_x, source_y, 'abs')
+ if source_x == dest_x and source_y == dest_y:
+ # If we have reached the dest_x and dest_y
+ # then break the loop
+ break
+ return 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldtp-2.0.3/ldtpd/page_tab_list.py new/ldtp-2.0.5/ldtpd/page_tab_list.py
--- old/ldtp-2.0.3/ldtpd/page_tab_list.py 2009-08-26 05:34:08.000000000 +0200
+++ new/ldtp-2.0.5/ldtpd/page_tab_list.py 2010-02-24 05:23:29.000000000 +0100
@@ -20,6 +20,7 @@
'''
import pyatspi
from utils import Utils
+from server_exception import LdtpServerException
class PageTabList(Utils):
def selecttab(self, window_name, object_name, tab_name):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldtp-2.0.3/ldtpd/table.py new/ldtp-2.0.5/ldtpd/table.py
--- old/ldtp-2.0.3/ldtpd/table.py 2009-10-12 16:47:06.000000000 +0200
+++ new/ldtp-2.0.5/ldtpd/table.py 2010-03-17 06:57:23.000000000 +0100
@@ -76,12 +76,23 @@
if not cell:
continue
if cell.childCount > 0:
- children = self._list_objects(cell)
- for child in children:
- if self._match_name_to_acc(row_text, child):
- self._grab_focus(child)
- cell.unref()
- return 1
+ flag = False
+ try:
+ if self._handle_table_cell:
+ # Was externally set, let us not
+ # touch this value
+ flag = True
+ else:
+ self._handle_table_cell = True
+ children = self._list_objects(cell)
+ for child in children:
+ if self._match_name_to_acc(row_text, child):
+ self._grab_focus(child)
+ cell.unref()
+ return 1
+ finally:
+ if not flag:
+ self._handle_table_cell = False
elif self._match_name_to_acc(row_text, cell):
self._grab_focus(cell)
cell.unref()
@@ -118,12 +129,23 @@
if not cell:
continue
if cell.childCount > 0:
- children = self._list_objects(cell)
- for child in children:
- if re.search(row_text, child.name):
- self._grab_focus(child)
- cell.unref()
- return 1
+ flag = False
+ try:
+ if self._handle_table_cell:
+ # Was externally set, let us not
+ # touch this value
+ flag = True
+ else:
+ self._handle_table_cell = True
+ children = self._list_objects(cell)
+ for child in children:
+ if re.search(row_text, child.name):
+ self._grab_focus(child)
+ cell.unref()
+ return 1
+ finally:
+ if not flag:
+ self._handle_table_cell = False
elif self._match_name_to_acc(row_text, cell):
self._grab_focus(cell)
cell.unref()
@@ -211,15 +233,26 @@
cell = self._get_accessible_at_row_column(obj, row_index, column)
name = None
if cell.childCount > 0:
- children = self._list_objects(cell)
- for child in children:
- try:
- texti = child.queryText()
- except NotImplementedError:
- continue
- name = child.name
- self._grab_focus(cell)
- break
+ flag = False
+ try:
+ if self._handle_table_cell:
+ # Was externally set, let us not
+ # touch this value
+ flag = True
+ else:
+ self._handle_table_cell = True
+ children = self._list_objects(cell)
+ for child in children:
+ try:
+ texti = child.queryText()
+ except NotImplementedError:
+ continue
+ name = child.name
+ self._grab_focus(cell)
+ break
+ finally:
+ if not flag:
+ self._handle_table_cell = False
else:
name = cell.name
self._grab_focus(cell)
@@ -251,17 +284,28 @@
cell = self._get_accessible_at_row_column(obj, row_index, column)
flag = None
if cell.childCount > 0:
- children = self._list_objects(cell)
- for child in children:
- try:
- actioni = child.queryAction()
+ flag = False
+ try:
+ if self._handle_table_cell:
+ # Was externally set, let us not
+ # touch this value
flag = True
- if not self._check_state(child, pyatspi.STATE_CHECKED):
- self._click_object(child, 'toggle')
- except NotImplementedError:
- continue
- self._grab_focus(cell)
- break
+ else:
+ self._handle_table_cell = True
+ children = self._list_objects(cell)
+ for child in children:
+ try:
+ actioni = child.queryAction()
+ flag = True
+ if not self._check_state(child, pyatspi.STATE_CHECKED):
+ self._click_object(child, 'toggle')
+ except NotImplementedError:
+ continue
+ self._grab_focus(cell)
+ break
+ finally:
+ if not flag:
+ self._handle_table_cell = False
else:
try:
actioni = cell.queryAction()
@@ -299,16 +343,27 @@
cell = self._get_accessible_at_row_column(obj, row_index, column)
flag = None
if cell.childCount > 0:
- children = self._list_objects(cell)
- for child in children:
- try:
- actioni = child.queryAction()
+ flag = False
+ try:
+ if self._handle_table_cell:
+ # Was externally set, let us not
+ # touch this value
flag = True
- self._click_object(child, 'expand or contract')
- self._grab_focus(cell)
- break
- except NotImplementedError:
- continue
+ else:
+ self._handle_table_cell = True
+ children = self._list_objects(cell)
+ for child in children:
+ try:
+ actioni = child.queryAction()
+ flag = True
+ self._click_object(child, 'expand or contract')
+ self._grab_focus(cell)
+ break
+ except NotImplementedError:
+ continue
+ finally:
+ if not flag:
+ self._handle_table_cell = False
else:
try:
actioni = cell.queryAction()
@@ -345,17 +400,28 @@
cell = self._get_accessible_at_row_column(obj, row_index, column)
flag = None
if cell.childCount > 0:
- children = self._list_objects(cell)
- for child in children:
- try:
- actioni = child.queryAction()
+ flag = False
+ try:
+ if self._handle_table_cell:
+ # Was externally set, let us not
+ # touch this value
flag = True
- if self._check_state(child, pyatspi.STATE_CHECKED):
- self._click_object(child, 'toggle')
- except NotImplementedError:
- continue
- self._grab_focus(cell)
- break
+ else:
+ self._handle_table_cell = True
+ children = self._list_objects(cell)
+ for child in children:
+ try:
+ actioni = child.queryAction()
+ flag = True
+ if self._check_state(child, pyatspi.STATE_CHECKED):
+ self._click_object(child, 'toggle')
+ except NotImplementedError:
+ continue
+ self._grab_focus(cell)
+ break
+ finally:
+ if not flag:
+ self._handle_table_cell = False
else:
try:
actioni = cell.queryAction()
@@ -399,12 +465,23 @@
if not cell:
continue
if cell.childCount > 0:
- children = self._list_objects(cell)
- for child in children:
- if self._match_name_to_acc(row_text, child):
- self._grab_focus(child)
- cell.unref()
- return i
+ flag = False
+ try:
+ if self._handle_table_cell:
+ # Was externally set, let us not
+ # touch this value
+ flag = True
+ else:
+ self._handle_table_cell = True
+ children = self._list_objects(cell)
+ for child in children:
+ if self._match_name_to_acc(row_text, child):
+ self._grab_focus(child)
+ cell.unref()
+ return i
+ finally:
+ if not flag:
+ self._handle_table_cell = False
elif self._match_name_to_acc(row_text, cell):
self._grab_focus(cell)
cell.unref()
@@ -464,16 +541,27 @@
if not cell:
continue
if cell.childCount > 0:
- children = self._list_objects(cell)
- for child in children:
- if self._match_name_to_acc(row_text, child):
- self._grab_focus(child)
- size = self._get_size(cell)
- self._mouse_event(size.x + size.width / 2,
- size.y + size.height / 2,
- 'b1c')
- cell.unref()
- return i
+ flag = False
+ try:
+ if self._handle_table_cell:
+ # Was externally set, let us not
+ # touch this value
+ flag = True
+ else:
+ self._handle_table_cell = True
+ children = self._list_objects(cell)
+ for child in children:
+ if self._match_name_to_acc(row_text, child):
+ self._grab_focus(child)
+ size = self._get_size(cell)
+ self._mouse_event(size.x + size.width / 2,
+ size.y + size.height / 2,
+ 'b1c')
+ cell.unref()
+ return i
+ finally:
+ if not flag:
+ self._handle_table_cell = False
elif self._match_name_to_acc(row_text, cell):
self._grab_focus(cell)
size = self._get_size(cell)
@@ -514,16 +602,27 @@
if not cell:
continue
if cell.childCount > 0:
- children = self._list_objects(cell)
- for child in children:
- if self._match_name_to_acc(row_text, child):
- self._grab_focus(child)
- size = self._get_size(cell)
- self._mouse_event(size.x + size.width / 2,
- size.y + size.height / 2,
- 'b1d')
- cell.unref()
- return i
+ flag = False
+ try:
+ if self._handle_table_cell:
+ # Was externally set, let us not
+ # touch this value
+ flag = True
+ else:
+ self._handle_table_cell = True
+ children = self._list_objects(cell)
+ for child in children:
+ if self._match_name_to_acc(row_text, child):
+ self._grab_focus(child)
+ size = self._get_size(cell)
+ self._mouse_event(size.x + size.width / 2,
+ size.y + size.height / 2,
+ 'b1d')
+ cell.unref()
+ return i
+ finally:
+ if not flag:
+ self._handle_table_cell = False
elif self._match_name_to_acc(row_text, cell):
self._grab_focus(cell)
size = self._get_size(cell)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldtp-2.0.3/ldtpd/text.py new/ldtp-2.0.5/ldtpd/text.py
--- old/ldtp-2.0.3/ldtpd/text.py 2010-02-11 07:53:45.000000000 +0100
+++ new/ldtp-2.0.5/ldtpd/text.py 2010-03-30 08:54:20.000000000 +0200
@@ -281,7 +281,6 @@
except NotImplementedError:
raise LdtpServerException('Text cannot be entered into object.')
- print dir(texti)
texti.setTextContents('%s%s' % (texti.getText(0, texti.characterCount),
data.encode('utf-8')))
return 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldtp-2.0.3/ldtpd/utils.py new/ldtp-2.0.5/ldtpd/utils.py
--- old/ldtp-2.0.3/ldtpd/utils.py 2010-02-11 07:53:45.000000000 +0100
+++ new/ldtp-2.0.5/ldtpd/utils.py 2010-03-30 08:54:20.000000000 +0200
@@ -30,19 +30,35 @@
cached_apps = None
def __init__(self):
lazy_load = True
+ self._states = {}
+ self._state_names = {}
self._callback = {}
self._window_uptime = {}
self._callback_event = []
+ self._get_all_state_names()
+ self._handle_table_cell = False
self._desktop = pyatspi.Registry.getDesktop(0)
if Utils.cached_apps is None:
pyatspi.Registry.registerEventListener(
- self._on_window_event, 'window:create')
+ self._on_window_event, 'window')
Utils.cached_apps = list()
if lazy_load:
for app in self._desktop:
if app is None: continue
self.cached_apps.append(app)
+ def _get_all_state_names(self):
+ """
+ This is used by client internally to populate all states
+ Create a dictionary
+ """
+ for state in pyatspi.STATE_VALUE_TO_NAME.keys():
+ self._states[state.__repr__()] = state
+ # Ignore STATE_ string for LDTPv1 compatibility
+ self._state_names[state] = \
+ state.__repr__().lower().partition("state_")[2]
+ return self._states
+
def _on_window_event(self, event):
if event.host_application not in self.cached_apps:
self.cached_apps.append(event.host_application)
@@ -72,24 +88,6 @@
relationType == pyatspi.RELATION_CONTROLLED_BY:
label_acc = rel.getTarget(i)
break
- return abbreviated_roles.get(acc.getRole(), 'ukn'), \
- (label_acc or acc).name.replace(' ', '').rstrip(':.')
-
- def _glob_match(self, pattern, string):
- return bool(re_match(glob_trans(pattern), string, re.M | re.U | re.L))
-
- def _match_name_to_acc(self, name, acc):
- if acc.name == name:
- return 1
- _ldtpize_accessible_name = self._ldtpize_accessible(acc)
- _object_name = u'%s%s' % (_ldtpize_accessible_name[0],
- _ldtpize_accessible_name[1])
- if _object_name == name:
- return 1
- if self._glob_match(name, acc.name):
- return 1
- if self._glob_match(name, _object_name):
- return 1
role = acc.getRole()
if role == pyatspi.ROLE_FRAME or role == pyatspi.ROLE_DIALOG or \
role == pyatspi.ROLE_WINDOW or \
@@ -100,11 +98,42 @@
strip = '( |\n)'
else:
strip = '( |:|\.|_|\n)'
- _tmp_name = re.sub(strip, '', name)
- if self._glob_match(_tmp_name, _object_name):
- return 1
- if self._glob_match(_tmp_name, _ldtpize_accessible_name[1]):
- return 1
+ return abbreviated_roles.get(role, 'ukn'), \
+ re.sub(strip, '', (label_acc or acc).name)
+
+ def _glob_match(self, pattern, string):
+ return bool(re_match(glob_trans(pattern), string, re.M | re.U | re.L))
+
+ def _match_name_to_acc(self, name, acc):
+ try:
+ if acc.name == name:
+ return 1
+ _ldtpize_accessible_name = self._ldtpize_accessible(acc)
+ _object_name = u'%s%s' % (_ldtpize_accessible_name[0],
+ _ldtpize_accessible_name[1])
+ if _object_name == name:
+ return 1
+ if self._glob_match(name, acc.name):
+ return 1
+ if self._glob_match(name, _object_name):
+ return 1
+ role = acc.getRole()
+ if role == pyatspi.ROLE_FRAME or role == pyatspi.ROLE_DIALOG or \
+ role == pyatspi.ROLE_WINDOW or \
+ role == pyatspi.ROLE_FONT_CHOOSER or \
+ role == pyatspi.ROLE_FILE_CHOOSER or \
+ role == pyatspi.ROLE_ALERT or \
+ role == pyatspi.ROLE_COLOR_CHOOSER:
+ strip = '( |\n)'
+ else:
+ strip = '( |:|\.|_|\n)'
+ _tmp_name = re.sub(strip, '', name)
+ if self._glob_match(_tmp_name, _object_name):
+ return 1
+ if self._glob_match(_tmp_name, _ldtpize_accessible_name[1]):
+ return 1
+ except:
+ pass
return 0
def _match_name_to_appmap(self, name, appmap_name):
@@ -121,6 +150,11 @@
if obj:
yield obj
for child in obj:
+ if child and child.getRole() == pyatspi.ROLE_TABLE_CELL and \
+ not self._handle_table_cell:
+ # In OO.o navigating table cells consumes more time
+ # and resource
+ break
for c in self._list_objects(child):
yield c
@@ -129,34 +163,42 @@
This function will check for all levels and returns the first
matching LIST / MENU type
"""
- if obj:
- for child in obj:
- if not child:
- continue
- if child.childCount > 0:
- child_obj = self._get_combo_child_object_type(child)
- if child_obj:
- return child_obj
- if child.getRole() == pyatspi.ROLE_LIST:
- return child
- elif child.getRole() == pyatspi.ROLE_MENU:
- return child
+ try:
+ if obj:
+ for child in obj:
+ if not child:
+ continue
+ if child.childCount > 0:
+ child_obj = self._get_combo_child_object_type(child)
+ if child_obj:
+ return child_obj
+ if child.getRole() == pyatspi.ROLE_LIST:
+ return child
+ elif child.getRole() == pyatspi.ROLE_MENU:
+ return child
+ except:
+ pass
+ return None
def _get_child_object_type(self, obj, role_type):
"""
This function will check for all levels and returns the first
matching role_type
"""
- if obj and role_type:
- for child in obj:
- if not child:
- continue
- if child.childCount > 0:
- child_obj = self._get_child_object_type(child, role_type)
+ try:
+ if obj and role_type:
+ for child in obj:
+ if not child:
+ continue
+ if child.childCount > 0:
+ child_obj = self._get_child_object_type(child, role_type)
if child_obj:
return child_obj
- if child.getRole() == role_type:
- return child
+ if child.getRole() == role_type:
+ return child
+ except:
+ pass
+ return None
def _appmap_pairs(self, gui):
ldtpized_list = []
@@ -253,7 +295,7 @@
return gui
return None
- def _get_object(self, window_name, obj_name):
+ def _get_object_info(self, window_name, obj_name):
_window_handle = self._get_window_handle(window_name)
if not _window_handle:
raise LdtpServerException('Unable to find window "%s"' % \
@@ -262,10 +304,14 @@
if self._glob_match(obj_name, obj_index) or \
self._match_name_to_acc(obj_name, obj) or \
self._match_name_to_appmap(obj_name, name):
- return obj
+ return name, obj, obj_index
raise LdtpServerException(
'Unable to find object name "%s" in application map' % obj_name)
+ def _get_object(self, window_name, obj_name):
+ name, obj, obj_index = self._get_object_info(window_name, obj_name)
+ return obj
+
def _grab_focus(self, obj):
try:
componenti = obj.queryComponent()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldtp-2.0.3/ldtpd/value.py new/ldtp-2.0.5/ldtpd/value.py
--- old/ldtp-2.0.3/ldtpd/value.py 2009-08-26 05:41:46.000000000 +0200
+++ new/ldtp-2.0.5/ldtpd/value.py 2010-03-16 05:09:38.000000000 +0100
@@ -497,12 +497,12 @@
raise LdtpServerException('Value cannot be entered into object.')
i = 0
- max = valuei.maximumValue / 8;
+ maxValue = valuei.maximumValue / 8;
flag = False
while i < iterations:
if valuei.currentValue >= valuei.maximumValue:
raise LdtpServerException('Maximum limit reached')
- valuei.currentValue += max
+ valuei.currentValue += maxValue
time.sleep(1.0/100)
flag = True
i += 1
@@ -538,12 +538,12 @@
raise LdtpServerException('Value cannot be entered into object.')
i = 0
- min = valuei.maximumValue / 8;
+ minValue = valuei.maximumValue / 8
flag = False
while i < iterations:
if valuei.currentValue < valuei.minimumValue:
raise LdtpServerException('Minimum limit reached')
- valuei.currentValue -= min
+ valuei.currentValue -= minValue
time.sleep(1.0/100)
flag = True
i += 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldtp-2.0.3/ldtpd/waiters.py new/ldtp-2.0.5/ldtpd/waiters.py
--- old/ldtp-2.0.3/ldtpd/waiters.py 2010-02-11 07:53:45.000000000 +0100
+++ new/ldtp-2.0.5/ldtpd/waiters.py 2010-03-30 08:54:20.000000000 +0200
@@ -27,8 +27,6 @@
import pyatspi
import traceback
-_main_loop = gobject.MainLoop()
-
class Waiter(Utils):
events = []
def __init__(self, timeout):
@@ -46,12 +44,12 @@
if self.success or self.timeout == 0:
return self.success
-
+
gobject.timeout_add_seconds(1, self._timeout_cb)
if self.events:
pyatspi.Registry.registerEventListener(
self._event_cb, *self.events)
- _main_loop.run()
+ gtk.main()
if self.events:
pyatspi.Registry.deregisterEventListener(
self._event_cb, *self.events)
@@ -63,7 +61,7 @@
self._timeout_count += 1
self.poll()
if self._timeout_count >= self.timeout or self.success:
- _main_loop.quit()
+ gtk.main_quit()
return False
return True
@@ -73,7 +71,7 @@
def _event_cb(self, event):
self.event_cb(event)
if self.success:
- _main_loop.quit()
+ gtk.main_quit()
def event_cb(self, event):
pass
@@ -100,11 +98,13 @@
for w in window_list:
if self._frame_name:
current_window = w.get_name()
- if re.search( \
- fnmatch.translate(self._frame_name), current_window, re.I) \
+ if re.search(
+ fnmatch.translate(self._frame_name), current_window,
+ re.U | re.M | re.L) \
or re.search(fnmatch.translate(re.sub("(^frm)|(^dlg)", "",
self._frame_name)),
- re.sub(" *(\t*)|(\n*)", "", current_window), re.I):
+ re.sub(" *(\t*)|(\n*)", "", current_window),
+ re.U | re.M | re.L):
# If window name specified, then maximize just that window
w.maximize()
self.success = True
@@ -128,10 +128,12 @@
if self._frame_name:
current_window = w.get_name()
if re.search( \
- fnmatch.translate(self._frame_name), current_window, re.I) \
+ fnmatch.translate(self._frame_name), current_window,
+ re.U | re.M | re.L) \
or re.search(fnmatch.translate(re.sub("(^frm)|(^dlg)", "",
self._frame_name)),
- re.sub(" *(\t*)|(\n*)", "", current_window), re.I):
+ re.sub(" *(\t*)|(\n*)", "", current_window),
+ re.U | re.M | re.L):
# If window name specified, then minimize just that window
w.minimize()
self.success = True
@@ -155,10 +157,12 @@
if self._frame_name:
current_window = w.get_name()
if re.search( \
- fnmatch.translate(self._frame_name), current_window, re.I) \
+ fnmatch.translate(self._frame_name), current_window,
+ re.U | re.M | re.L) \
or re.search(fnmatch.translate(re.sub("(^frm)|(^dlg)", "",
self._frame_name)),
- re.sub(" *(\t*)|(\n*)", "", current_window), re.I):
+ re.sub(" *(\t*)|(\n*)", "", current_window),
+ re.U | re.M | re.L):
# If window name specified, then unmaximize just that window
w.unmaximize()
self.success = True
@@ -182,10 +186,12 @@
if self._frame_name:
current_window = w.get_name()
if re.search( \
- fnmatch.translate(self._frame_name), current_window, re.I) \
+ fnmatch.translate(self._frame_name), current_window,
+ re.U | re.M | re.L) \
or re.search(fnmatch.translate(re.sub("(^frm)|(^dlg)", "",
self._frame_name)),
- re.sub(" *(\t*)|(\n*)", "", current_window), re.I):
+ re.sub(" *(\t*)|(\n*)", "", current_window),
+ re.U | re.M | re.L):
# If window name specified, then unminimize just that window
w.unminimize(int(time.time()))
self.success = True
@@ -209,10 +215,12 @@
if self._frame_name:
current_window = w.get_name()
if re.search( \
- fnmatch.translate(self._frame_name), current_window, re.I) \
+ fnmatch.translate(self._frame_name), current_window,
+ re.U | re.M | re.L) \
or re.search(fnmatch.translate(re.sub("(^frm)|(^dlg)", "",
self._frame_name)),
- re.sub(" *(\t*)|(\n*)", "", current_window), re.I):
+ re.sub(" *(\t*)|(\n*)", "", current_window),
+ re.U | re.M | re.L):
# If window name specified, then activate just that window
w.activate(int(time.time()))
self.success = True
@@ -234,10 +242,12 @@
if self._frame_name:
current_window = w.get_name()
if re.search( \
- fnmatch.translate(self._frame_name), current_window, re.I) \
+ fnmatch.translate(self._frame_name), current_window,
+ re.U | re.M | re.L) \
or re.search(fnmatch.translate(re.sub("(^frm)|(^dlg)", "",
self._frame_name)),
- re.sub(" *(\t*)|(\n*)", "", current_window), re.I):
+ re.sub(" *(\t*)|(\n*)", "", current_window),
+ re.U | re.M | re.L):
# If window name specified, then close just that window
w.close(int(time.time()))
self.success = True
@@ -279,17 +289,26 @@
self.success = True
class ObjectExistsWaiter(GuiExistsWaiter):
- def __init__(self, frame_name, obj_name, timeout):
+ def __init__(self, frame_name, obj_name, timeout, state = ''):
GuiExistsWaiter.__init__(self, frame_name, timeout)
self._obj_name = obj_name
+ self._state = state
def poll(self):
try:
if re.search(';', self._obj_name):
- self._get_menu_hierarchy(self._frame_name, self._obj_name)
+ obj = self._get_menu_hierarchy(self._frame_name, self._obj_name)
else:
- self._get_object(self._frame_name, self._obj_name)
- self.success = True
+ obj = self._get_object(self._frame_name, self._obj_name)
+ if self._state:
+ _state_inst = obj.getState()
+ _obj_state = _state_inst.getStates()
+ state = 'STATE_%s' % self._state.upper()
+ if state in self._states and \
+ self._states[state] in _obj_state:
+ self.success = True
+ else:
+ self.success = True
except:
pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldtp-2.0.3/scripts/ldtp new/ldtp-2.0.5/scripts/ldtp
--- old/ldtp-2.0.3/scripts/ldtp 2010-02-11 07:54:08.000000000 +0100
+++ new/ldtp-2.0.5/scripts/ldtp 2010-03-30 08:54:05.000000000 +0200
@@ -17,7 +17,7 @@
(options, args) = parser.parse_args()
if options.version:
# Print version info and exit
- print 'ldtp-2.0.3'
+ print 'ldtp-2.0.5'
sys.exit(0)
parse_cmd_line_option()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldtp-2.0.3/setup.py new/ldtp-2.0.5/setup.py
--- old/ldtp-2.0.3/setup.py 2010-02-11 07:53:56.000000000 +0100
+++ new/ldtp-2.0.5/setup.py 2010-03-30 08:53:55.000000000 +0200
@@ -3,7 +3,7 @@
from distutils.core import setup
setup(name='ldtp',
- version='2.0.3',
+ version='2.0.5',
description='Linux Desktop Testing Project Version 2',
maintainer='Nagappan Alagappan',
maintainer_email='nagappan(a)gmail.com',
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kupdateapplet for openSUSE:Factory
checked in at Thu Apr 1 18:10:31 CEST 2010.
--------
--- KDE/kupdateapplet/kupdateapplet.changes 2010-02-26 02:32:32.000000000 +0100
+++ /mounts/work_src_done/STABLE/kupdateapplet/kupdateapplet.changes 2010-03-24 14:01:50.000000000 +0100
@@ -2 +2 @@
-Fri Feb 26 01:30:27 UTC 2010 - amolagodbole(a)gmail.com
+Wed Mar 24 13:58:27 CET 2010 - tgoettlicher(a)suse.de
@@ -4,6 +4,2 @@
-- port from KSystemTrayIcon to KStatusNotifierItem
-- fixed bnc #545517: notifications should pop up from systray
- ...code copied over from KMix applet code, needs kde 4.4
-- fixed bnc #543124: kupdateapplet shows available updates instead of update progress when "Always show detailed view" is enabled
-- added feature: show number of available updates on detailed view tab labels
-- fixed bug: show upgrades tab by default in detailed view when upgrades are available but no patches are available
+- dropped zypp plugin (bnc: 590192)
+- V 0.9.11
@@ -10,0 +7,6 @@
+-------------------------------------------------------------------
+Thu Mar 18 11:28:35 CET 2010 - tgoettlicher(a)suse.de
+
+- bnc #571482: Port to kstatusnotifieritem and a few bug fixes and enhancements
+ (patch by Amol Godbole)
+- V 0.9.10
calling whatdependson for head-i586
Old:
----
kupdateapplet-0.9.9-systraynotificationfix.patch
kupdateapplet-0.9.9.tar.bz2
New:
----
kupdateapplet-0.9.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kupdateapplet.spec ++++++
--- /var/tmp/diff_new_pack.pZ1494/_old 2010-04-01 18:09:26.000000000 +0200
+++ /var/tmp/diff_new_pack.pZ1494/_new 2010-04-01 18:09:26.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kupdateapplet (Version 0.9.9)
+# spec file for package kupdateapplet (Version 0.9.11)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,13 +23,12 @@
License: GPL
Group: System/Management
Summary: openSUSE System Updater Applet (KDE4)
-Version: 0.9.9
-Release: 2
+Version: 0.9.11
+Release: 1
Url: http://en.opensuse.org/KDE_Updater_Applet
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-Patch0: kupdateapplet-0.9.9-systraynotificationfix.patch
-Requires: kupdateapplet-plugin = 0.9.9
+Requires: kupdateapplet-plugin = 0.9.11
Requires: oxygen-icon-theme
Requires: PolicyKit-kde
Recommends: smolt
@@ -59,7 +58,6 @@
%prep
%setup -q -n %{name}-%{version}
-%patch0 -p1
%build
%cmake_kde4 -d build
@@ -85,7 +83,7 @@
%files -f kupdateapplet.lang
%defattr(-,root,root)
/usr/bin/kupdateapplet
-/usr/sbin/zypper-install
+#/usr/sbin/zypper-install
/usr/share/applications/kupdateapplet.desktop
#%dir /usr/share/icons/hicolor/24x24
#%dir /usr/share/icons/hicolor/24x24/apps
@@ -109,10 +107,13 @@
Group: System/Management
Summary: packagekit plugin for KDE updater applet
Requires: PackageKit >= 0.5.1
-Provides: kupdateapplet-plugin = 0.9.9
+Provides: kupdateapplet-plugin = 0.9.11
Provides: kde4-kupdateapplet-packagekit = 0.9.0
Obsoletes: kde4-kupdateapplet-packagekit <= 0.8.42
Recommends: polkit-gnome
+Provides: kupdateapplet-zypp
+Obsoletes: kupdateapplet-zypp
+
#Recommends: PolicyKit-kde (see: bnc# 551648)
%description packagekit
@@ -123,25 +124,26 @@
%_libdir/kde4/kupdateapplet_packagekit.so
/usr/share/kde4/services/kupdateapplet_packagekit.desktop
+#removed zypp backend (bnc #590192)
############################
-
-%package zypp
-License: GPL
-Group: System/Management
-Summary: zypp plugin for KDE updater applet
-Requires: zypper >= 0.12.11
-Provides: kupdateapplet-plugin = 0.9.9
-Provides: kde4-kupdateapplet-zypp = 0.9.0
-Obsoletes: kde4-kupdateapplet-zypp <= 0.8.42
-
-%description zypp
-zypp plugin for KDE updater applet for OpenSUSE
-
-%files zypp
-%defattr(-,root,root)
-%_libdir/kde4/kupdateapplet_zypp.so
-/usr/share/kde4/services/kupdateapplet_zypp.desktop
-
+#
+#%package zypp
+#Group: System/Management
+#Summary: zypp plugin for KDE updater applet
+#Requires: zypper >= 0.12.11
+#Provides: kupdateapplet-plugin = 0.9.11
+#Provides: kde4-kupdateapplet-zypp = 0.9.0
+#Obsoletes: kde4-kupdateapplet-zypp <= 0.8.42
+#
+#%description zypp
+#zypp plugin for KDE updater applet for OpenSUSE
+#
+#%files zypp
+#%defattr(-,root,root)
+#%_libdir/kde4/kupdateapplet_zypp.so
+#/usr/share/kde4/services/kupdateapplet_zypp.desktop
+#
+#%changelog
+#
############################
-
%changelog
++++++ kupdateapplet-0.9.9.tar.bz2 -> kupdateapplet-0.9.11.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.9/VERSION.cmake new/kupdateapplet-0.9.11/VERSION.cmake
--- old/kupdateapplet-0.9.9/VERSION.cmake 2010-02-23 14:50:18.000000000 +0100
+++ new/kupdateapplet-0.9.11/VERSION.cmake 2010-03-24 15:50:51.000000000 +0100
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "9")
-SET(VERSION_PATCH "9")
+SET(VERSION_PATCH "11")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.9/kupdateapplet.spec.in new/kupdateapplet-0.9.11/kupdateapplet.spec.in
--- old/kupdateapplet-0.9.9/kupdateapplet.spec.in 2010-02-23 14:50:18.000000000 +0100
+++ new/kupdateapplet-0.9.11/kupdateapplet.spec.in 2010-03-24 15:50:51.000000000 +0100
@@ -74,7 +74,7 @@
%files -f kupdateapplet.lang
%defattr(-,root,root)
/usr/bin/kupdateapplet
-/usr/sbin/zypper-install
+#/usr/sbin/zypper-install
/usr/share/applications/kupdateapplet.desktop
#%dir /usr/share/icons/hicolor/24x24
#%dir /usr/share/icons/hicolor/24x24/apps
@@ -102,6 +102,10 @@
Provides: kde4-kupdateapplet-packagekit = 0.9.0
Obsoletes: kde4-kupdateapplet-packagekit <= 0.8.42
Recommends: polkit-gnome
+Provides: kupdateapplet-zypp
+Obsoletes: kupdateapplet-zypp
+
+
#Recommends: PolicyKit-kde (see: bnc# 551648)
%description packagekit
@@ -113,25 +117,26 @@
/usr/share/kde4/services/kupdateapplet_packagekit.desktop
+#removed zypp backend (bnc #590192)
############################
-
-%package zypp
-Group: System/Management
-Summary: zypp plugin for KDE updater applet
-Requires: zypper >= 0.12.11
-Provides: kupdateapplet-plugin = @VERSION@
-Provides: kde4-kupdateapplet-zypp = 0.9.0
-Obsoletes: kde4-kupdateapplet-zypp <= 0.8.42
-
-%description zypp
-zypp plugin for KDE updater applet for OpenSUSE
-
-%files zypp
-%defattr(-,root,root)
-%_libdir/kde4/kupdateapplet_zypp.so
-/usr/share/kde4/services/kupdateapplet_zypp.desktop
-
-%changelog
-
+#
+#%package zypp
+#Group: System/Management
+#Summary: zypp plugin for KDE updater applet
+#Requires: zypper >= 0.12.11
+#Provides: kupdateapplet-plugin = @VERSION@
+#Provides: kde4-kupdateapplet-zypp = 0.9.0
+#Obsoletes: kde4-kupdateapplet-zypp <= 0.8.42
+#
+#%description zypp
+#zypp plugin for KDE updater applet for OpenSUSE
+#
+#%files zypp
+#%defattr(-,root,root)
+#%_libdir/kde4/kupdateapplet_zypp.so
+#/usr/share/kde4/services/kupdateapplet_zypp.desktop
+#
+#%changelog
+#
############################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.9/package/kupdateapplet.changes new/kupdateapplet-0.9.11/package/kupdateapplet.changes
--- old/kupdateapplet-0.9.9/package/kupdateapplet.changes 2010-02-23 14:50:18.000000000 +0100
+++ new/kupdateapplet-0.9.11/package/kupdateapplet.changes 2010-03-24 15:50:51.000000000 +0100
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Wed Mar 24 13:58:27 CET 2010 - tgoettlicher(a)suse.de
+
+- dropped zypp plugin (bnc: 590192)
+- V 0.9.11
+
+-------------------------------------------------------------------
+Thu Mar 18 11:28:35 CET 2010 - tgoettlicher(a)suse.de
+
+- bnc #571482: Port to kstatusnotifieritem and a few bug fixes and enhancements
+ (patch by Amol Godbole)
+- V 0.9.10
+
+-------------------------------------------------------------------
Mon Feb 22 16:29:05 CET 2010 - tgoettlicher(a)suse.de
- fixed packagekit transaction id errors while installation of a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.9/src/CMakeLists.txt new/kupdateapplet-0.9.11/src/CMakeLists.txt
--- old/kupdateapplet-0.9.9/src/CMakeLists.txt 2010-02-23 14:50:18.000000000 +0100
+++ new/kupdateapplet-0.9.11/src/CMakeLists.txt 2010-03-24 15:50:51.000000000 +0100
@@ -8,7 +8,6 @@
${KDE4_INCLUDES}
)
-add_subdirectory( zypp )
#add_subdirectory( interactive )
add_subdirectory( packagekit )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.9/src/mainwindow.cpp new/kupdateapplet-0.9.11/src/mainwindow.cpp
--- old/kupdateapplet-0.9.9/src/mainwindow.cpp 2010-02-23 14:50:18.000000000 +0100
+++ new/kupdateapplet-0.9.11/src/mainwindow.cpp 2010-03-24 15:50:51.000000000 +0100
@@ -50,7 +50,7 @@
#include "updater.h"
#include "trayicon.h"
#include "configwidget.h"
-#include "ksystemtrayicon.h"
+#include "kstatusnotifieritem.h"
#include "logics.h"
#include "updater.h"
@@ -307,17 +307,17 @@
tabwidget->removeTab(tabwidget->indexOf(packageWidget));
tabwidget->removeTab(tabwidget->indexOf(patchWidget));
- tabwidget->addTab( patchWidget, i18n( "Patches" ) );
- tabwidget->addTab( packageWidget, i18n( "Upgrades" ) );
- tabwidget->setCurrentIndex( 1 );
- tabwidget->setCurrentIndex( 0 );
+ tabwidget->addTab( patchWidget, i18n( "Patches (" ) + i18n( QString::number( patchList->topLevelItemCount() ).toUtf8().constData() ) + i18n( ")" ) );
+ tabwidget->addTab( packageWidget, i18n( "Upgrades (" ) + i18n( QString::number( packageList->topLevelItemCount() ).toUtf8().constData() ) + i18n( ")" ) );
+
+ if ( ( patchList->topLevelItemCount() == 0 ) && ( packageList->topLevelItemCount() != 0 ) ) tabwidget->setCurrentWidget( packageWidget );
}
else
{
tabwidget->removeTab(tabwidget->indexOf(packageWidget));
tabwidget->removeTab(tabwidget->indexOf(patchWidget));
- tabwidget->addTab( patchWidget, i18n( "Patches" ) );
+ tabwidget->addTab( patchWidget, i18n( "Patches (" ) + i18n( QString::number( patchList->topLevelItemCount() ).toUtf8().constData() ) + i18n( ")" ) );
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.9/src/mainwindow.h new/kupdateapplet-0.9.11/src/mainwindow.h
--- old/kupdateapplet-0.9.9/src/mainwindow.h 2010-02-23 14:50:18.000000000 +0100
+++ new/kupdateapplet-0.9.11/src/mainwindow.h 2010-03-24 15:50:51.000000000 +0100
@@ -27,7 +27,7 @@
#include <QLabel>
#include <QTabWidget>
-#include <KSystemTrayIcon>
+#include <KStatusNotifierItem>
#include <KXmlGuiWindow>
#include <KConfigDialog>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.9/src/trayicon.cpp new/kupdateapplet-0.9.11/src/trayicon.cpp
--- old/kupdateapplet-0.9.9/src/trayicon.cpp 2010-02-23 14:50:18.000000000 +0100
+++ new/kupdateapplet-0.9.11/src/trayicon.cpp 2010-03-24 15:50:51.000000000 +0100
@@ -21,7 +21,7 @@
#include <QLabel>
-#include <QMenu>
+#include <KMenu>
#include <QMouseEvent>
#include <kdialog.h>
#include <qtimer.h>
@@ -41,16 +41,13 @@
TrayIcon::TrayIcon( Logics* l )
- : KSystemTrayIcon( 0 )
+ : KStatusNotifierItem( 0 )
, logics( l )
{
kDebug() << "loading tray..." << endl;
- setIcon( KIconLoader::global()->loadIcon( TRAY_ICON_GREEN, KIconLoader::Panel ) );
-
- connect(this, SIGNAL( activated( QSystemTrayIcon::ActivationReason ) ),
- this, SLOT( trayActivated( QSystemTrayIcon::ActivationReason ) ) );
+ setIconByPixmap( KIconLoader::global()->loadIcon( TRAY_ICON_GREEN, KIconLoader::Panel ) );
// add menu items to tray icon menu
_edit_sources_action = new KAction( i18n( "Add/Remove Update Sources..." ), 0 );
@@ -70,7 +67,7 @@
connect( _start_distroupgrade_action, SIGNAL( triggered() ),
this, SLOT( slotStartDistroUpgrade() ) );
- QMenu* cm = this->contextMenu();
+ KMenu* cm = this->contextMenu();
cm->addAction( _edit_sources_action );
cm->addAction( _configure_applet_action );
cm->addAction( _check_updates_action );
@@ -79,7 +76,7 @@
slotStateChanged();
- show();
+ // show();
}
@@ -124,29 +121,34 @@
{
case APPLET_CHECKING:
_check_updates_action->setEnabled( false );
- setIcon( KIconLoader::global()->loadIcon( TRAY_ICON_CHECKING, KIconLoader::Panel ) );
- setToolTip( i18n( "Checking for updates..." ) );
+ setIconByPixmap( KIconLoader::global()->loadIcon( TRAY_ICON_CHECKING, KIconLoader::Panel ) );
+ setToolTip( iconPixmap(), i18n( "Checking for updates..." ), "" );
+ setStatus(KStatusNotifierItem::Active);
break;
case APPLET_PROBLEM:
- setIcon( KIconLoader::global()->loadIcon( "dialog-warning", KIconLoader::Panel ) );
- setToolTip( "<qt>" + i18n( "Error:\n" ) + logics->stateDescription() + "</qt>" );
+ setIconByPixmap( KIconLoader::global()->loadIcon( "dialog-warning", KIconLoader::Panel ) );
+ setToolTip( iconPixmap(), "<qt>" + i18n( "Error:\n" ) + logics->stateDescription() + "</qt>", "" );
+ setStatus(KStatusNotifierItem::NeedsAttention);
break;
case APPLET_NO_UPDATES:
- setIcon( KIconLoader::global()->loadIcon( TRAY_ICON_GREEN, KIconLoader::Panel ) );
- setToolTip( i18n( "No Updates Available" ) );
+ setIconByPixmap( KIconLoader::global()->loadIcon( TRAY_ICON_GREEN, KIconLoader::Panel ) );
+ setToolTip( iconPixmap(), i18n( "No Updates Available" ), "" );
+ setStatus(KStatusNotifierItem::Passive);
break;
case APPLET_UPDATES:
- setToolTip( i18n( "New software updates are available." ) );
- setIcon( KIconLoader::global()->loadIcon( TRAY_ICON_YELLOW, KIconLoader::Panel ) );
+ setIconByPixmap( KIconLoader::global()->loadIcon( TRAY_ICON_YELLOW, KIconLoader::Panel ) );
+ setToolTip( iconPixmap(), i18n( "New software updates are available." ), "" );
+ setStatus(KStatusNotifierItem::Active);
break;
case APPLET_ONLY_OPTIONAL_UPDATES:
- setToolTip( i18n( "New software updates are available." ) );
- setIcon( KIconLoader::global()->loadIcon( TRAY_ICON_OPTIONAL, KIconLoader::Panel ) );
- break;
+ setIconByPixmap( KIconLoader::global()->loadIcon( TRAY_ICON_OPTIONAL, KIconLoader::Panel ) );
+ setToolTip( iconPixmap(), i18n( "New software updates are available." ), "" );
+ setStatus(KStatusNotifierItem::Active);
+ break;
case APPLET_NO_NETWORK:
case APPLET_SYSTEM_IS_ON_BATTERY_WHILE_CHECK:
@@ -154,45 +156,44 @@
case APPLET_SYSTEM_BUSY_WHILE_CHECK:
case APPLET_SYSTEM_BUSY_WHILE_INSTALL:
_check_updates_action->setEnabled( false );
- setToolTip( i18n( "Unable to check whether updates are available." ) );
- setIcon( KIconLoader::global()->loadIcon( TRAY_ICON_GRAY, KIconLoader::Panel ) );
+ setIconByPixmap( KIconLoader::global()->loadIcon( TRAY_ICON_GRAY, KIconLoader::Panel ) );
+ setToolTip( iconPixmap(), i18n( "Unable to check whether updates are available." ), "" );
+ setStatus(KStatusNotifierItem::Active);
break;
case APPLET_PKGMGR_UPDATES:
case APPLET_CRITICAL_UPDATES:
- setToolTip( i18n( "New software updates are available." ) );
- setIcon( KIconLoader::global()->loadIcon( TRAY_ICON_RED, KIconLoader::Panel ) );
+ setIconByPixmap( KIconLoader::global()->loadIcon( TRAY_ICON_RED, KIconLoader::Panel ) );
+ setToolTip( iconPixmap(), i18n( "New software updates are available." ), "" );
+ setStatus(KStatusNotifierItem::NeedsAttention);
break;
case APPLET_INSTALLING:
_check_updates_action->setEnabled( false );
- setIcon( KIconLoader::global()->loadIcon( TRAY_ICON_INSTALLING, KIconLoader::Panel ) );
- setToolTip( i18n( "Updating..." ) );
+ setIconByPixmap( KIconLoader::global()->loadIcon( TRAY_ICON_INSTALLING, KIconLoader::Panel ) );
+ setToolTip( iconPixmap(), i18n( "Updating..." ), "" );
+ setStatus(KStatusNotifierItem::Active);
break;
case APPLET_NO_UPDATE_REPO:
- setToolTip( i18n( "Unable to check whether updates are available." ) );
- setIcon( KIconLoader::global()->loadIcon( TRAY_ICON_NO_UPDATE_REPO, KIconLoader::Panel ) );
+ setIconByPixmap( KIconLoader::global()->loadIcon( TRAY_ICON_NO_UPDATE_REPO, KIconLoader::Panel ) );
+ setToolTip( iconPixmap(), i18n( "Unable to check whether updates are available." ), "" );
+ setStatus(KStatusNotifierItem::Active);
break;
case APPLET_NEW_HARDWARE:
- setToolTip( i18n( "New hardware has been attached." ) );
- setIcon( KIconLoader::global()->loadIcon( TRAY_ICON_HARDWARE, KIconLoader::Panel ) );
- break;
+ setIconByPixmap( KIconLoader::global()->loadIcon( TRAY_ICON_HARDWARE, KIconLoader::Panel ) );
+ setToolTip( iconPixmap(), i18n( "New hardware has been attached." ), "" );
+ setStatus(KStatusNotifierItem::NeedsAttention);
+ break;
default:
- setToolTip( QString() );
+ setToolTip("", "", "");
+ setStatus(KStatusNotifierItem::Passive);
break;
}
}
-void TrayIcon::trayActivated( ActivationReason reason )
-{
- if ( reason == QSystemTrayIcon::Trigger )
- emit trayClicked();
-}
-
-
#include "trayicon.moc"
// vim:tabstop=2:noet:sw=2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.9/src/trayicon.h new/kupdateapplet-0.9.11/src/trayicon.h
--- old/kupdateapplet-0.9.9/src/trayicon.h 2010-02-23 14:50:18.000000000 +0100
+++ new/kupdateapplet-0.9.11/src/trayicon.h 2010-03-24 15:50:51.000000000 +0100
@@ -24,13 +24,13 @@
#define _TRAY_ICON_H_
#include <QMouseEvent>
-#include <ksystemtrayicon.h>
+#include <kstatusnotifieritem.h>
#include "kupdateapplet_export.h"
class Logics;
class KAction;
-class KUPDATEAPPLET_EXPORT TrayIcon : public KSystemTrayIcon
+class KUPDATEAPPLET_EXPORT TrayIcon : public KStatusNotifierItem
{
Q_OBJECT
@@ -39,7 +39,6 @@
~TrayIcon();
private slots:
- void trayActivated(QSystemTrayIcon::ActivationReason);
void slotConfigurePlugin();
void slotConfigureApplet();
void slotCheck();
@@ -63,7 +62,6 @@
void moveEvent(QMoveEvent* event);
signals:
- void trayClicked();
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.9/src/updater.h new/kupdateapplet-0.9.11/src/updater.h
--- old/kupdateapplet-0.9.9/src/updater.h 2010-02-23 14:50:18.000000000 +0100
+++ new/kupdateapplet-0.9.11/src/updater.h 2010-03-24 15:50:51.000000000 +0100
@@ -30,7 +30,7 @@
#include <kdemacros.h>
#include "constants.h"
-#include "ksystemtrayicon.h"
+#include "kstatusnotifieritem.h"
#include "updatererror.h"
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.9/src/updaterapplication.cpp new/kupdateapplet-0.9.11/src/updaterapplication.cpp
--- old/kupdateapplet-0.9.9/src/updaterapplication.cpp 2010-02-23 14:50:18.000000000 +0100
+++ new/kupdateapplet-0.9.11/src/updaterapplication.cpp 2010-03-24 15:50:51.000000000 +0100
@@ -25,8 +25,10 @@
#include <kdebug.h>
#include <kservice.h>
#include <klocale.h>
+#include <kwindowsystem.h>
#include <qtimer.h>
#include <qmessagebox.h>
+#include <QDesktopWidget>
#include "notification.h"
#include "trayicon.h"
@@ -72,7 +74,7 @@
_main, SLOT( slotGotDescription( const QString&, int ) ));
- // connect simplie view
+ // connect simple view
connect ( _logics, SIGNAL( selectionChanged() ),
_simple, SLOT( slotSelectionChanged()));
connect ( _logics, SIGNAL( stateChanged() ),
@@ -99,8 +101,8 @@
_notify, SLOT( slotSystemProfile() ));
// connect tray icon
- connect ( _tray, SIGNAL( trayClicked() ) ,
- this, SLOT( slotTrayClicked() ));
+ connect ( _tray, SIGNAL( activateRequested (bool, const QPoint&) ) ,
+ this, SLOT( slotTrayClicked(bool, const QPoint&) ));
connect ( _logics, SIGNAL( stateChanged() ),
_tray, SLOT( slotStateChanged() ));
@@ -330,9 +332,9 @@
}
-void UpdaterApplication::slotTrayClicked()
+void UpdaterApplication::slotTrayClicked(bool active, const QPoint &pos)
{
- // logic for showing and hinding the view
+ // logic for showing and hiding the view
if (_main->isVisible() || _simple->isVisible() )
{
@@ -340,18 +342,79 @@
_simple->hide();
return;
}
-
- // if no update repo is defined don't show detailed view but simple view
- if ( _logics->state() == APPLET_NO_UPDATE_REPO )
+
+ if ( UpdaterSettings::self()->noSimpleView() &&
+ ( ( _logics->state() == APPLET_UPDATES) || ( _logics->state() == APPLET_CRITICAL_UPDATES) ||
+ ( _logics->state() == APPLET_PKGMGR_UPDATES) || ( _logics->state() == APPLET_ONLY_OPTIONAL_UPDATES) ) )
{
- _simple->show();
- return;
- }
+ _main->adjustSize();
+ int h = _main->height();
+ int x = pos.x() - _main->width()/2;
+ int y = pos.y() - h;
+
+ if ( y < 0 )
+ {
+ y = pos.y();
+ }
+
+ _main->move(x, y); // so that the mouse is outside of the widget
+ kDebug() << "moving to" << _main->size() << x << y;
+
+ // Now handle Multihead displays. And also make sure that the dialog is not moved out-of-the screen on the right
+ const QDesktopWidget* vdesktop = QApplication::desktop();
+ const QRect& vScreenSize = vdesktop->screenGeometry(_main);
+
+ if ( (x+_main->width()) > (vScreenSize.width() + vScreenSize.x()) )
+ {
+ // move horizontally, so that it is completely visible
+ _main->move(vScreenSize.width() + vScreenSize.x() - _main->width() -1 , y);
+ }
+ else if ( x < vScreenSize.x() )
+ {
+ // horizontally out-of bound
+ _main->move(vScreenSize.x(), y);
+ }
+ // the above stuff could also be implemented vertically
- if ( UpdaterSettings::self()->noSimpleView() )
+ KWindowSystem::setState( _main->winId(), NET::KeepAbove);
+
_main->show();
+ }
else
+ {
+ _simple->adjustSize();
+ int h = _simple->height();
+ int x = pos.x() - _simple->width()/2;
+ int y = pos.y() - h;
+
+ if ( y < 0 )
+ {
+ y = pos.y();
+ }
+
+ _simple->move(x, y); // so that the mouse is outside of the widget
+ kDebug() << "moving to" << _simple->size() << x << y;
+
+ // Now handle Multihead displays. And also make sure that the dialog is not moved out-of-the screen on the right
+ const QDesktopWidget* vdesktop = QApplication::desktop();
+ const QRect& vScreenSize = vdesktop->screenGeometry(_simple);
+
+ if ( (x+_simple->width()) > (vScreenSize.width() + vScreenSize.x()) )
+ {
+ // move horizontally, so that it is completely visible
+ _simple->move(vScreenSize.width() + vScreenSize.x() - _simple->width() -1 , y);
+ }
+ else if ( x < vScreenSize.x() )
+ {
+ // horizontally out-of bound
+ _simple->move(vScreenSize.x(), y);
+ }
+ // the above stuff could also be implemented vertically
+
+ KWindowSystem::setState( _simple->winId(), NET::KeepAbove);
+
_simple->show();
+ }
}
#include "updaterapplication.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.9/src/updaterapplication.h new/kupdateapplet-0.9.11/src/updaterapplication.h
--- old/kupdateapplet-0.9.9/src/updaterapplication.h 2010-02-23 14:50:18.000000000 +0100
+++ new/kupdateapplet-0.9.11/src/updaterapplication.h 2010-03-24 15:50:51.000000000 +0100
@@ -72,7 +72,7 @@
void slotConfigChanged();
private slots:
- void slotTrayClicked();
+ void slotTrayClicked(bool, const QPoint&);
};
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package latencytop for openSUSE:Factory
checked in at Thu Apr 1 18:09:12 CEST 2010.
--------
--- latencytop/latencytop.changes 2009-06-18 14:01:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/latencytop/latencytop.changes 2010-03-10 11:36:17.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Mar 10 11:20:40 CET 2010 - hpj(a)urpla.net
+
+- relocate gtk version of latencytop to xlatencytop
+- restore console build
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ latencytop.spec ++++++
--- /var/tmp/diff_new_pack.X5MA7K/_old 2010-04-01 18:08:30.000000000 +0200
+++ /var/tmp/diff_new_pack.X5MA7K/_new 2010-04-01 18:08:30.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package latencytop (Version 0.5)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,11 +20,11 @@
Name: latencytop
BuildRequires: gtk2-devel ncurses-devel
-License: GPL v2 only
+License: GPLv2
Group: System/Monitoring
Summary: Kernel latency measuring tool
Version: 0.5
-Release: 1
+Release: 2
Source: latencytop-%{version}.tar.bz2
Patch: latencytop-warning-fixes.diff
Url: http://www.latencytop.org/
@@ -35,7 +35,7 @@
userspace), aimed at identifying where in the system latency is
happening, and what kind of operation/action is causing the latency to
happen so that the code can be changed to avoid the worst latency
-hiccups.
+hiccups. A version with graphic interface is available as xlatencytop.
@@ -50,10 +50,15 @@
%build
export CFLAGS="$RPM_OPT_FLAGS"
make %{?jobs:-j %jobs}
+mv latencytop xlatencytop
+make clean
+sed -i 's|HAS_GTK_GUI = 1|#HAS_GTK_GUI = 1|' Makefile
+make %{?jobs:-j %jobs}
%install
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
make DESTDIR=$RPM_BUILD_ROOT install
+install -m 0755 xlatencytop $RPM_BUILD_ROOT%{_sbindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
install -c -m 0644 *.8 $RPM_BUILD_ROOT%{_mandir}/man8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package patterns-openSUSE for openSUSE:Factory
checked in at Thu Apr 1 18:08:17 CEST 2010.
--------
--- patterns-openSUSE/patterns-openSUSE.changes 2010-03-22 15:44:24.000000000 +0100
+++ /mounts/work_src_done/STABLE/patterns-openSUSE/patterns-openSUSE.changes 2010-04-01 09:55:22.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Apr 1 07:53:33 UTC 2010 - coolo(a)novell.com
+
+4c3c16a moved claws to main LXDE pattern; removed polkit-gnome from pattern
+78a70a5 recommend the openSUSE branding for gnome
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ patterns-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.s82lcs/_old 2010-04-01 18:03:16.000000000 +0200
+++ /var/tmp/diff_new_pack.s82lcs/_new 2010-04-01 18:03:16.000000000 +0200
@@ -24,7 +24,7 @@
AutoReqProv: on
Summary: Patterns for Installation (full ftp tree)
Version: 11.3
-Release: 8
+Release: 9
Url: http://en.opensuse.org/Patterns
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: patterns-openSUSE-data.tar.bz2
@@ -1071,6 +1071,7 @@
Recommends: gconf2-branding-openSUSE
Recommends: gdb
Recommends: gedit
+Recommends: glib2-branding-openSUSE
Recommends: gnome-audio
Recommends: gnome-control-center
Recommends: gnome-desktop
@@ -1081,6 +1082,7 @@
Recommends: gnome-mag
Recommends: gnome-media
Recommends: gnome-menus
+Recommends: gnome-menus-branding-openSUSE
Recommends: gnome-mount
Recommends: gnome-nettool
Recommends: gnome-power-manager
@@ -1099,6 +1101,9 @@
Recommends: gstreamer-0_10-plugins-good
Recommends: gtk2
Recommends: gtk2-branding-openSUSE
+%ifarch ix86
+Recommends: gtk2-branding-openSUSE
+%endif
Recommends: gtk2-engine-murrine
Recommends: gtk2-engines
Recommends: gtk2-metatheme-sonar
@@ -1770,6 +1775,7 @@
%endif
Recommends: beaver
Recommends: cheese
+Recommends: claws-mail
Recommends: desktop-data-openSUSE
Recommends: droid-fonts
Recommends: galculator
@@ -1805,7 +1811,6 @@
Recommends: pcmanfm
Recommends: pidgin
Recommends: pinentry-gtk2
-Recommends: polkit-gnome
Recommends: preload
Recommends: samba
Recommends: smolt
@@ -1846,7 +1851,6 @@
Group: Metapackages
Summary: Meta package for pattern lxde_office
Recommends: abiword
-Recommends: claws-mail
Recommends: epdfview
Recommends: gnumeric
Recommends: goffice
++++++ patterns-openSUSE-data.tar.bz2 ++++++
++++ 6801 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package lxrandr for openSUSE:Factory
checked in at Thu Apr 1 18:05:57 CEST 2010.
--------
--- lxrandr/lxrandr.changes 2009-12-15 19:02:08.000000000 +0100
+++ /mounts/work_src_done/STABLE/lxrandr/lxrandr.changes 2010-03-31 11:30:35.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Mar 31 09:30:37 UTC 2010 - andrea(a)opensuse.org
+
+- Fixed desktop icon Categories
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lxrandr.spec ++++++
--- /var/tmp/diff_new_pack.UgcYpO/_old 2010-04-01 18:04:51.000000000 +0200
+++ /var/tmp/diff_new_pack.UgcYpO/_new 2010-04-01 18:04:51.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package lxrandr (Version 0.1.1)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Name: lxrandr
Version: 0.1.1
-Release: 1
+Release: 2
Summary: Lightweight Monitor Config Tool
Group: System/X11/Utilities
License: GPL
++++++ lxrandr-0.1.1-desktop-icon.patch ++++++
--- /var/tmp/diff_new_pack.UgcYpO/_old 2010-04-01 18:04:51.000000000 +0200
+++ /var/tmp/diff_new_pack.UgcYpO/_new 2010-04-01 18:04:51.000000000 +0200
@@ -17,4 +17,4 @@
Encoding=UTF-8
Type=Application
-Categories=Settings;
-+Categories=GTK;System;HardwareSettings;Settings;Utility;
++Categories=Settings;DesktopSettings;HardwareSettings;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package mplus-fonts for openSUSE:Factory
checked in at Thu Apr 1 18:04:38 CEST 2010.
--------
--- mplus-fonts/mplus-fonts.changes 2009-12-08 09:47:17.000000000 +0100
+++ /mounts/work_src_done/STABLE/mplus-fonts/mplus-fonts.changes 2010-03-31 18:11:07.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Mar 31 18:07:43 CEST 2010 - tiwai(a)suse.de
+
+- updated to testflight 029
+- removed unneeded depenency on xorg-x11-devel
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
mplus-TESTFLIGHT-027.tar.bz2
New:
----
mplus-TESTFLIGHT-029.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mplus-fonts.spec ++++++
--- /var/tmp/diff_new_pack.6CpK1e/_old 2010-04-01 18:02:49.000000000 +0200
+++ /var/tmp/diff_new_pack.6CpK1e/_new 2010-04-01 18:02:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package mplus-fonts (Version 1.0.25)
+# spec file for package mplus-fonts (Version 1.0.29)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,22 +17,17 @@
# norootforbuild
-%define mplusname mplus-TESTFLIGHT-027
+%define mplusname mplus-TESTFLIGHT-029
Name: mplus-fonts
-BuildRequires: xorg-x11-devel
-%if "%(xft-config --prefix)" == "/usr"
%define fontdir /usr/share/fonts/truetype
-%else
-%define fontdir /usr/X11R6/lib/X11/fonts/truetype
-%endif
License: mplus font license (freely distributable)
Group: System/X11/Fonts
AutoReqProv: on
PreReq: %suseconfig_fonts_prereq
#Provides: locale(vi)
-Version: 1.0.25
-Release: 2
+Version: 1.0.29
+Release: 1
Url: http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html
Source0: %{mplusname}.tar.bz2
BuildArch: noarch
++++++ mplus-TESTFLIGHT-027.tar.bz2 -> mplus-TESTFLIGHT-029.tar.bz2 ++++++
mplus-fonts/mplus-TESTFLIGHT-027.tar.bz2 /mounts/work_src_done/STABLE/mplus-fonts/mplus-TESTFLIGHT-029.tar.bz2 differ: char 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package plasma-addons for openSUSE:Factory
checked in at Thu Apr 1 18:01:58 CEST 2010.
--------
--- plasma-addons/plasma-addons.changes 2010-02-26 20:57:32.000000000 +0100
+++ /mounts/work_src_done/STABLE/plasma-addons/plasma-addons.changes 2010-03-26 19:36:45.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Mar 26 19:36:33 CET 2010 - dmueller(a)suse.de
+
+- update to 4.4.2
+ * bugfixes over 4.4.1
+ * see http://kde.org/announcements/changelogs/changelog4_4_1to4_4_2.php for details
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdeplasma-addons-4.4.1.tar.bz2
New:
----
kdeplasma-addons-4.4.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma-addons.spec ++++++
--- /var/tmp/diff_new_pack.7qdOgl/_old 2010-04-01 18:01:54.000000000 +0200
+++ /var/tmp/diff_new_pack.7qdOgl/_new 2010-04-01 18:01:54.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package plasma-addons (Version 4.4.1)
+# spec file for package plasma-addons (Version 4.4.2)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -30,7 +30,7 @@
Group: System/GUI/KDE
Summary: Additional Plasmoids for KDE Desktop
Url: http://www.kde.org/
-Version: 4.4.1
+Version: 4.4.2
Release: 1
Source0: kdeplasma-addons-%{version}.tar.bz2
Patch0: 4_4_BRANCH.diff
++++++ kdeplasma-addons-4.4.1.tar.bz2 -> kdeplasma-addons-4.4.2.tar.bz2 ++++++
++++ 2175 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package qtcurve-gtk2 for openSUSE:Factory
checked in at Thu Apr 1 18:01:41 CEST 2010.
--------
--- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2010-03-01 21:01:41.000000000 +0100
+++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2010-03-19 11:52:16.000000000 +0100
@@ -1,0 +2,35 @@
+Fri Mar 19 11:36:26 CET 2010 - dimstar(a)opensuse.org
+
+- Update to version 1.2.0:
+ + Draw etch effect on radios if using a button effect, and not
+ using button-like check/radios.
+ + If drawing square non-gtk style scrollviews, use a dark/light
+ borders.
+ + If drawing square scrollviews, set frame width to 1 if using
+ thin scrollbar groove.
+ + Add options to draw square progress and entry fields when
+ rounding.
+ + Add option to control whether progressbars have a border on all
+ sides, or just top/bottom.
+ + Add option to colour default buttons using highlight colour.
+ + Expand selected check/radio colour option so as to be able to
+ specift colour.
+ + Add circular slider style.
+ + Add glow to mouse over of slider handles (not scrollbars).
+ + Add option to draw stripes on scrollbar sliders.
+ + Add a 'faded' style porgressbar stripe option.
+ + Add option to draw agua shine on custom gradients.
+ + Improve appearance of button style check and radio buttons.
+ + Add option to control whether scrollbar groove has a border or
+ not.
+ + Dont use pixmaps to draw rounded slider, or radio buttons.
+ + Add option to increase size of check/radios - default is now
+ 15pixels. (For Mozilla apps, the old 13pixel size will be used).
+ + Fix calculation of alpha values for square rings.
+ + Fix progressbar glow central position.
+ + Draw more frames.
+ + Fix image/gradient background issues with wxWidgets
+ applications. (Use gtk_widget_translate_coordinates to
+ translate widgets coordinates relative to window.)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
QtCurve-Gtk2-1.1.1.tar.bz2
New:
----
QtCurve-Gtk2-1.2.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-gtk2.spec ++++++
--- /var/tmp/diff_new_pack.1ouybA/_old 2010-04-01 18:01:31.000000000 +0200
+++ /var/tmp/diff_new_pack.1ouybA/_new 2010-04-01 18:01:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package qtcurve-gtk2 (Version 1.1.1)
+# spec file for package qtcurve-gtk2 (Version 1.2.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,7 @@
Name: qtcurve-gtk2
-Version: 1.1.1
+Version: 1.2.0
Release: 1
License: GPLv2+
Summary: QtCurve style for Gtk2
++++++ QtCurve-Gtk2-1.1.1.tar.bz2 -> QtCurve-Gtk2-1.2.0.tar.bz2 ++++++
++++ 2664 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0