jgrulich pushed to kde-print-manager (f22). "Update to 15.03.95 (beta2)"

Wed Mar 25 13:40:33 UTC 2015

>From 70a1db18904aa94c913ca301d2aa6d1c17fb30a3 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich at redhat.com>
Date: Wed, 25 Mar 2015 14:38:23 +0100
Subject: Update to 15.03.95 (beta2)

diff --git a/.gitignore b/.gitignore
index 627856e..de521fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /print-manager-14.12.1.tar.xz
 /print-manager-14.12.2.tar.xz
 /print-manager-14.12.3.tar.xz
+/print-manager-15.03.95.tar.xz
diff --git a/kde-print-manager.spec b/kde-print-manager.spec
index b9edba9..f3b8769 100644
--- a/kde-print-manager.spec
+++ b/kde-print-manager.spec
@@ -1,15 +1,9 @@
-
-#if 0%{?fedora} > 17
-# whether to make this the default printer manager in KDE Plasma Desktop
-%global makedefault 1
-#endif
-
-Summary: Printer management for KDE
 Name:    kde-print-manager
-Version: 14.12.3
+Summary: Printer management for KDE
+Version: 15.03.95
 Release: 1%{?dist}
 
-License: GPLv2+
+License: GPLv2+ and LGPLv2+
 URL:     https://projects.kde.org/projects/kde/kdeutils/print-manager
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
@@ -21,44 +15,47 @@ Source0: http://download.kde.org/%{stable}/applications/%{version}/src/print-man
 # Plasma init/upgrade script
 Source1: 01-fedora-print-manager.js
 
+BuildRequires: cmake
 BuildRequires: gettext
-BuildRequires: kdelibs4-devel
+BuildRequires: extra-cmake-modules
+BuildRequires: kf5-rpm-macros
+BuildRequires: kf5-kconfig-devel
+BuildRequires: kf5-kconfigwidgets-devel
+BuildRequires: kf5-kcoreaddons-devel
+BuildRequires: kf5-kdbusaddons-devel
+BuildRequires: kf5-kiconthemes-devel
+BuildRequires: kf5-kcmutils-devel
+BuildRequires: kf5-kio-devel
+BuildRequires: kf5-knotifications-devel
+BuildRequires: kf5-plasma-devel
+BuildRequires: kf5-kwidgetsaddons-devel
+BuildRequires: kf5-kwindowsystem-devel
+BuildRequires: kf5-kitemviews-devel
+
+BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-qtdeclarative-devel
+# required because of Qt5Designer - should be removed in final release
+BuildRequires: qt5-qttools-devel
+
 BuildRequires: cups-devel >= 1.5.0
 
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%{?kde_runtime_requires}
+Requires: plasma-workspace
+
 # currently requires local cups for majority of proper function
 Requires: cups
 # required for the com.redhat.NewPrinterNotification D-Bus service
 Requires: system-config-printer-libs
 
-%if 0%{?makedefault}
-# Fedora 17 will only get upgraded to 4.9.x, Fedora 18 will not ship these.
-Obsoletes: system-config-printer-kde < 7:4.10
-Obsoletes: kde-printer-applet < 4.10
-%endif
-
 %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}
 
 %build
-if [ -x %{_bindir}/plasma-dataengine-depextractor ] ; then
-  plasma-dataengine-depextractor plasmoid/package
-fi
-
-mkdir %{_target_platform}
+mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -67,41 +64,34 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%if 0%{?makedefault}
 # show print-manager plasmoid by default
-install -m644 -p -D %{SOURCE1} %{buildroot}%{_kde4_appsdir}/plasma-desktop/init/01-fedora-print-manager.js
-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
-
+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
 
 %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}/configure-printer
-%{_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
-%{_datadir}/dbus-1/services/org.kde.ConfigurePrinter.service
-%if 0%{?makedefault}
-%{_kde4_appsdir}/plasma-desktop/*/01-fedora-print-manager.js
-%endif
+%{_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
+%{_libdir}/libkcupslib.so
 
 %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 Mar 25 2015 Jan Grulich <jgrulich at redhat.com> - 15.03.95-1
+- 15.03.95
+
 * Sun Mar 01 2015 Rex Dieter <rdieter at fedoraproject.org> - 14.12.3-1
 - 14.12.3
 
diff --git a/sources b/sources
index 66d5a75..6f881aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6464c1716e6d9b105053f6bf7d48a7de  print-manager-14.12.3.tar.xz
+6de683b8f9443382a99db96413fedf98  print-manager-15.03.95.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kde-print-manager.git/commit/?h=f22&id=70a1db18904aa94c913ca301d2aa6d1c17fb30a3

--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390
