[kde-print-manager] 4.9.90

[Rex Dieter]

commit 4d5530fdb89b5b4293c306ecb5d4c6f2f21930a3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Dec 14 09:09:44 2012 -0600

    4.9.90

 .gitignore                                      |    1 +
 0001-fix-excessive-renew-related-log-spam.patch |   35 +++++++++++++++++++++
 kde-print-manager.spec                          |   37 ++++++++++++-----------
 print-manager-0.2.0-cups_renew_spam.patch       |   21 -------------
 sources                                         |    2 +-
 5 files changed, 56 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0317860..8534645 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /print-manager-0.2.0.tar.bz2
+/print-manager-4.9.90.tar.xz
diff --git a/0001-fix-excessive-renew-related-log-spam.patch b/0001-fix-excessive-renew-related-log-spam.patch
new file mode 100644
index 0000000..8fb741a
--- /dev/null
+++ b/0001-fix-excessive-renew-related-log-spam.patch
@@ -0,0 +1,35 @@
+From 89443d898b58043dc6a7060ddd6a87a7cab84a2b Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+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 b2c23d1..3db22f3 100644
--- a/kde-print-manager.spec
+++ b/kde-print-manager.spec
@@ -1,8 +1,4 @@
 
-%if 0%{?fedora} > 18
-%global cups16 -DCUPS_1_6:BOOL=ON
-%endif
-
 %if 0%{?fedora} > 17
 # whether to make this the default printer manager in KDE Plasma Desktop
 %global makedefault 1
@@ -10,22 +6,27 @@
 
 Summary: Printer management for KDE
 Name:    kde-print-manager
-Version: 0.2.0
-Release: 8%{?dist}
+Version: 4.9.90
+Release: 1%{?dist}
 
 License: GPLv2+
-URL:     https://projects.kde.org/projects/playground/base/print-manager
-Source0: http://download.kde.org/stable/print-manager/%{version}/src/print-manager-%{version}.tar.bz2
+URL:     https://projects.kde.org/projects/kde/kdeutils/print-manager
+%global revision %(echo %{version} | cut -d. -f3)
+%if %{revision} >= 50
+%global stable unstable
+%else
+%global stable stable
+%endif
+Source0: http://download.kde.org/%{stable}/%{version}/src/print-manager-%{version}.tar.xz
 # Plasma init/upgrade script
 Source1: 01-fedora-print-manager.js
 
-## upstreamable patches
-# http://bugzilla.redhat.com/885541
-Patch50:  print-manager-0.2.0-cups_renew_spam.patch
+## upstream patches
+Patch100: 0001-fix-excessive-renew-related-log-spam.patch
 
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel
-BuildRequires: cups-devel%{?cups16: >= 1:1.6}%{!?cups16: < 1:1.6}
+BuildRequires: cups-devel
 
 Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
 # currently requires local cups for majority of proper function
@@ -46,7 +47,7 @@ Printer management for KDE.
 %prep
 %setup -q -n print-manager-%{version}
 
-%patch50 -p1 -b .cups_renew_spam
+%patch100 -p1 -b .cups_renew_spam
 
 %build
 if [ -x %{_bindir}/plasma-dataengine-depextractor ] ; then
@@ -55,8 +56,7 @@ fi
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} .. \
-  %{?cups16}
+%{cmake_kde4} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -72,10 +72,8 @@ mkdir %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates
 ln %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-print-manager.js %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/01-fedora-print-manager.js
 %endif
 
-%find_lang %{name} --all-name --with-kde
 
-
-%files -f %{name}.lang
+%files
 %{_kde4_libdir}/kde4/kcm_printer_manager.so
 %{_kde4_libdir}/kde4/kded_printmanager.so
 %{_kde4_libexecdir}/add-printer
@@ -103,6 +101,9 @@ ln %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-print-manager.js %
 
 
 %changelog
+* Fri Dec 14 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.90-1
+- 4.9.90
+
 * Fri Dec 14 2012 Rex Dieter <rdieter at fedoraproject.org> 0.2.0-8
 - Requires: cups
 
diff --git a/sources b/sources
index 6562dc0..8b53555 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-183c22e91021b0357c2a27146c931de0  print-manager-0.2.0.tar.bz2
+13d2b480905875c38f76368e9cf51d90  print-manager-4.9.90.tar.xz