rdieter pushed to kde-print-manager (master). "15.03.95-2 (..more)"

[notifications at fedoraproject.org]

>From c01ca4916dc2b983202f8e8ed89503a07c9e1df3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 31 Mar 2015 12:50:20 -0500
Subject: 15.03.95-2

- restore kde-print-manager-libs (upgrade path, multilib'ness)
- omit 01-fedora-print-manager.js for now, needswork.

diff --git a/kde-print-manager.spec b/kde-print-manager.spec
index f3b8769..c4d7897 100644
--- a/kde-print-manager.spec
+++ b/kde-print-manager.spec
@@ -1,7 +1,7 @@
 Name:    kde-print-manager
 Summary: Printer management for KDE
 Version: 15.03.95
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+ and LGPLv2+
 URL:     https://projects.kde.org/projects/kde/kdeutils/print-manager
@@ -41,6 +41,7 @@ BuildRequires: cups-devel >= 1.5.0
 
 Requires: plasma-workspace
 
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # currently requires local cups for majority of proper function
 Requires: cups
 # required for the com.redhat.NewPrinterNotification D-Bus service
@@ -49,6 +50,12 @@ Requires: system-config-printer-libs
 %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}
 
@@ -65,30 +72,40 @@ make %{?_smp_mflags} -C %{_target_platform}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # show print-manager plasmoid by default
-install -m644 -p -D %{SOURCE1} %{buildroot}%{_datadir}/plasma/init/01-fedora-print-manager.js
-mkdir %{buildroot}%{_datadir}/plasma/updates
-ln %{buildroot}%{_datadir}/plasma/init/01-fedora-print-manager.js %{buildroot}%{_datadir}/plasma/updates/01-fedora-print-manager.js
+#install -m644 -p -D %{SOURCE1} %{buildroot}%{_datadir}/plasma/shells/org.kde.plasma.desktop/updates/01-fedora-print-manager.js
+
+## not sure if ldconfig is still needed for unversioned libs -- rex
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %{_bindir}/kde-add-printer
 %{_bindir}/kde-print-queue
 %{_bindir}/configure-printer
 %{_qt5_prefix}/qml/org/kde/plasma/printmanager/
-%{_kf5_qtplugindir}/kcm_printer_manager.so
-%{_kf5_qtplugindir}/kded_printmanager.so
 %{_kf5_datadir}/kservices5/kcm_printer_manager.desktop
 %{_kf5_datadir}/kservices5/kded/printmanager.desktop
 %{_kf5_datadir}/kservices5/plasma-applet-org.kde.plasma.printmanager.desktop
 %{_datadir}/plasma/plasmoids/org.kde.plasma.printmanager/
 %{_datadir}/printmanager/
 %{_datadir}/applications/*.desktop
-%{_datadir}/plasma/*/01-fedora-print-manager.js
+#{_datadir}/plasma/shells/org.kde.plasma.desktop/updates/01-fedora-print-manager.js
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%files libs
+# private unversioned library
 %{_libdir}/libkcupslib.so
+%{_kf5_qtplugindir}/kcm_printer_manager.so
+%{_kf5_qtplugindir}/kded_printmanager.so
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
 %changelog
+* Tue Mar 31 2015 Rex Dieter <rdieter at fedoraproject.org> - 15.03.95-2
+- restore kde-print-manager-libs (upgrade path, multilib'ness)
+- omit 01-fedora-print-manager.js for now, needswork.
+
 * Wed Mar 25 2015 Jan Grulich <jgrulich at redhat.com> - 15.03.95-1
 - 15.03.95
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kde-print-manager.git/commit/?h=master&id=c01ca4916dc2b983202f8e8ed89503a07c9e1df3