From c83d2a2f2841e926a7d70b3e7a251704a860c0f1 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Sep 05 2013 18:22:35 +0000
Subject: Merge branch 'master' into f19


---

diff --git a/.gitignore b/.gitignore
index 83c7ea3..1c61930 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,8 @@
 /print-manager-4.10.2.tar.xz
 /print-manager-4.10.3.tar.xz
 /print-manager-4.10.4.tar.xz
+/print-manager-4.10.90.tar.xz
+/print-manager-4.10.95.tar.xz
+/print-manager-4.10.97.tar.xz
+/print-manager-4.11.0.tar.xz
+/print-manager-4.11.1.tar.xz
diff --git a/kde-print-manager.spec b/kde-print-manager.spec
index fa1832e..7ffb4df 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.10.4
+Version: 4.11.1
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -27,6 +27,7 @@ BuildRequires: gettext
 BuildRequires: kdelibs4-devel
 BuildRequires: cups-devel >= 1.5.0
 
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
 # currently requires local cups for majority of proper function
 Requires: cups
@@ -42,6 +43,12 @@ Obsoletes: kde-printer-applet < 4.10
 %description
 Printer management for KDE.
 
+%package  libs
+Summary:  Runtime files for %{name}
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
 
 %prep
 %setup -q -n print-manager-%{version}
@@ -49,7 +56,7 @@ Printer management for KDE.
 
 %build
 if [ -x %{_bindir}/plasma-dataengine-depextractor ] ; then
-  plasma-dataengine-depextractor plasmoid-package
+  plasma-dataengine-depextractor plasmoid/package
 fi
 
 mkdir -p %{_target_platform}
@@ -72,33 +79,47 @@ ln %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-print-manager.js %
 
 
 %files
+%{_kde4_bindir}/kde-add-printer
+%{_kde4_bindir}/kde-print-queue
 %{_kde4_libdir}/kde4/kcm_printer_manager.so
 %{_kde4_libdir}/kde4/kded_printmanager.so
-%{_kde4_libexecdir}/add-printer
 %{_kde4_libexecdir}/configure-printer
-%{_kde4_libexecdir}/print-queue
-%{_kde4_libdir}/kde4/plasma_engine_printers.so
-%{_kde4_libdir}/kde4/plasma_engine_printjobs.so
-# private unversioned library
-%{_kde4_libdir}/libkcupslib.so
-%{_kde4_appsdir}/plasma/plasmoids/printmanager/
-%{_kde4_appsdir}/plasma/services/org.kde.printers.operations
-%{_kde4_appsdir}/plasma/services/org.kde.printjobs.operations
+%{_kde4_libdir}/kde4/imports/org/kde/printmanager/
+%{_kde4_appsdir}/plasma/plasmoids/org.kde.printmanager/
 %{_kde4_appsdir}/printmanager/
 %{_kde4_datadir}/kde4/services/kcm_printer_manager.desktop
 %{_kde4_datadir}/kde4/services/kded/printmanager.desktop
 %{_kde4_datadir}/kde4/services/plasma-applet-printmanager.desktop
-%{_kde4_datadir}/kde4/services/plasma-engine-printers.desktop
-%{_kde4_datadir}/kde4/services/plasma-engine-printjobs.desktop
-%{_datadir}/dbus-1/services/org.kde.AddPrinter.service
 %{_datadir}/dbus-1/services/org.kde.ConfigurePrinter.service
-%{_datadir}/dbus-1/services/org.kde.PrintQueue.service
 %if 0%{?makedefault}
 %{_kde4_appsdir}/plasma-desktop/*/01-fedora-print-manager.js
 %endif
 
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files libs
+# private unversioned library
+%{_kde4_libdir}/libkcupslib.so
+%{_kde4_libdir}/kde4/plugins/designer/printmanagerwidget.so
+
 
 %changelog
+* Wed Sep 04 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.11.1-1
+- 4.11.1
+
+* Thu Aug 08 2013 Than Ngo <than@redhat.com> - 4.11.0-1
+- 4.11.0
+
+* Thu Jul 25 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.10.97-1
+- 4.10.97
+
+* Wed Jul 24 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.10.95-1
+- 4.10.95
+
+* Fri Jun 28 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.10.90-1
+- 4.10.90
+
 * Sat Jun 01 2013 Rex Dieter <rdieter@fedoraproject.org> - 4.10.4-1
 - 4.10.4
 
diff --git a/sources b/sources
index cf1f790..c697fd8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d322cff87bd8914de116e656d724244e  print-manager-4.10.4.tar.xz
+728b6ee227f712a3dfad676397851e43  print-manager-4.11.1.tar.xz