From 4713c403605caefe9326cef90a8c08c3a035c251 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Dec 21 2012 14:04:33 +0000 Subject: 4.9.95 --- diff --git a/.gitignore b/.gitignore index 8534645..dd9af33 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /print-manager-0.2.0.tar.bz2 /print-manager-4.9.90.tar.xz +/print-manager-4.9.95.tar.xz diff --git a/0001-fix-excessive-renew-related-log-spam.patch b/0001-fix-excessive-renew-related-log-spam.patch deleted file mode 100644 index 8fb741a..0000000 --- a/0001-fix-excessive-renew-related-log-spam.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 89443d898b58043dc6a7060ddd6a87a7cab84a2b Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Fri, 14 Dec 2012 08:51:53 -0600 -Subject: [PATCH] fix excessive renew-related log spam - -BUG: 311528 ---- - libkcups/KCupsConnection.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libkcups/KCupsConnection.cpp b/libkcups/KCupsConnection.cpp -index a0ab6f7..43e9f7d 100644 ---- a/libkcups/KCupsConnection.cpp -+++ b/libkcups/KCupsConnection.cpp -@@ -247,7 +247,7 @@ void KCupsConnection::run() - - // Creates the timer that will renew the DBus subscription - m_renewTimer = new QTimer; -- m_renewTimer->setInterval(RENEW_INTERVAL); -+ m_renewTimer->setInterval(RENEW_INTERVAL*1000); - m_renewTimer->moveToThread(this); - connect(m_renewTimer, SIGNAL(timeout()), this, SLOT(renewDBusSubscription()), Qt::DirectConnection); - -@@ -485,7 +485,7 @@ int KCupsConnection::renewDBusSubscription(int subscriptionId, int leaseDuration - return renewDBusSubscription(-1, leaseDuration, events); - #endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6 - } else { -- kWarning() << "Request failed" << lastError(); -+ kDebug() << "Request failed" << lastError(); - // When the server stops/restarts we will have some error so ignore it - ret = subscriptionId; - } --- -1.8.0.2 - diff --git a/kde-print-manager.spec b/kde-print-manager.spec index 3db22f3..457064c 100644 --- a/kde-print-manager.spec +++ b/kde-print-manager.spec @@ -6,7 +6,7 @@ Summary: Printer management for KDE Name: kde-print-manager -Version: 4.9.90 +Version: 4.9.95 Release: 1%{?dist} License: GPLv2+ @@ -22,7 +22,6 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/print-manager-%{versio Source1: 01-fedora-print-manager.js ## upstream patches -Patch100: 0001-fix-excessive-renew-related-log-spam.patch BuildRequires: gettext BuildRequires: kdelibs4-devel @@ -47,7 +46,6 @@ Printer management for KDE. %prep %setup -q -n print-manager-%{version} -%patch100 -p1 -b .cups_renew_spam %build if [ -x %{_bindir}/plasma-dataengine-depextractor ] ; then @@ -101,6 +99,9 @@ ln %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-print-manager.js % %changelog +* Fri Dec 21 2012 Rex Dieter 4.9.95-1 +- 4.9.95 + * Fri Dec 14 2012 Rex Dieter 4.9.90-1 - 4.9.90 diff --git a/sources b/sources index 8b53555..ce25ad7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13d2b480905875c38f76368e9cf51d90 print-manager-4.9.90.tar.xz +d8a9bcf2792c128579979b6269a19b64 print-manager-4.9.95.tar.xz