rdieter pushed to bluedevil (f22). "Plasma 5.2.95"

notifications at fedoraproject.org notifications at fedoraproject.org
Sat Apr 25 18:00:45 UTC 2015


>From 75501fcd12d588a0c80e884e7d588ba4ff993543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil at redhat.com>
Date: Thu, 23 Apr 2015 17:41:49 +0200
Subject: Plasma 5.2.95


diff --git a/.gitignore b/.gitignore
index a2d10ca..f85c26d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /bluedevil-5.2.0.tar.xz
 /bluedevil-5.2.1.tar.xz
 /bluedevil-5.2.2.tar.xz
+/bluedevil-5.2.95.tar.xz
diff --git a/bluedevil.spec b/bluedevil.spec
index 43afdda..a76c2ff 100644
--- a/bluedevil.spec
+++ b/bluedevil.spec
@@ -1,6 +1,6 @@
 Name:           bluedevil
 Summary:        Bluetooth stack for KDE
-Version:        5.2.2
+Version:        5.2.95
 Release:        1%{?dist}
 
 License:        GPLv2+
@@ -18,16 +18,19 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-rpm-macros
 BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt5-qtdeclarative-devel
 
 BuildRequires:  kf5-kcoreaddons-devel
 BuildRequires:  kf5-kwidgetsaddons-devel
 BuildRequires:  kf5-kdbusaddons-devel
 BuildRequires:  kf5-knotifications-devel
 BuildRequires:  kf5-kiconthemes-devel
+BuildRequires:  kf5-plasma-devel
 BuildRequires:  kf5-ki18n-devel
 BuildRequires:  kf5-kio-devel
+BuildRequires:  kf5-bluez-qt-devel >= %{version}
+BuildRequires:  kf5-kded-devel
 
-BuildRequires:  libbluedevil-devel >= %{version}
 BuildRequires:  shared-mime-info
 
 BuildRequires:  desktop-file-utils
@@ -36,19 +39,17 @@ Provides:       dbus-bluez-pin-helper
 
 Obsoletes:      kbluetooth < 0.4.2-3
 Obsoletes:      bluedevil-devel < 2.0.0-0.10
+
 Requires:       pulseaudio-module-bluetooth
+Requires:       kf5-kded
+
+# When -autostart was removed
+Obsoletes:      bluedevil-autostart < 5.2.95
+Provides:       bluedevil-autostart = %{name}-%{version}
 
 %description
 BlueDevil is the bluetooth stack for KDE.
 
-
-%package        autostart
-Summary:        Autostart support for non-KDE desktops
-Requires:       %{name} = %{version}-%{release}
-%description    autostart
-%{summary}.
-
-
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -64,17 +65,11 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang %{name} --with-qt --with-kde
-
-desktop-file-install \
-  --dir=%{buildroot}%{_sysconfdir}/xdg/autostart/ \
-  --add-not-show-in=KDE \
-  %{buildroot}%{_kf5_datadir}/applications/bluedevil-monolithic.desktop
+%find_lang bluedevil5  --with-qt --with-kde --all-name
 
 %check
-desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/bluedevil-monolithic.desktop
-desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/bluedevil-sendfile.desktop
-desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/bluedevil-wizard.desktop
+desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.bluedevilsendfile.desktop
+desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.bluedevilwizard.desktop
 
 
 %post
@@ -91,27 +86,28 @@ fi
 update-desktop-database -q &> /dev/null
 update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
-%files -f %{name}.lang
+%files -f bluedevil5.lang
 %doc README
 %{_kf5_bindir}/bluedevil-*
 %{_libexecdir}/bluedevil-*
 %{_kf5_qtplugindir}/kcm_*.so
 %{_kf5_qtplugindir}/kio_*.so
-%{_kf5_qtplugindir}/kded_*.so
+%{_kf5_plugindir}/kded/*.so
 %{_kf5_qtplugindir}/bluetoothfileitemaction.so
+%{_kf5_datadir}/remoteview/bluetooth-network.desktop
 %{_kf5_datadir}/kservices5/*.desktop
 %{_kf5_datadir}/kservices5/*.protocol
-%{_kf5_datadir}/kservices5/kded/*.desktop
-%{_kf5_datadir}/knotifications5
+%{_kf5_datadir}/knotifications5/bluedevil.notifyrc
 %{_kf5_datadir}/applications/*.desktop
 %{_kf5_datadir}/bluedevilwizard
+%{_kf5_datadir}/plasma/plasmoids/org.kde.plasma.bluetooth
+%{_kf5_qmldir}/org/kde/plasma/private/bluetooth
 %{_datadir}/mime/packages/*.xml
 
-%files autostart
-%{_sysconfdir}/xdg/autostart/bluedevil-monolithic.desktop
-
-
 %changelog
+* Wed Apr 22 2015 Daniel Vrátil <dvratil at redhat.com> - 5.2.95-1
+- Plasma 5.2.95
+
 * Fri Mar 20 2015 Daniel Vrátil <dvratil at redhat.com> - 5.2.2-1
 - Plasma 5.2.2
 
diff --git a/sources b/sources
index 1716f11..d063f99 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-007f7755d4b2f827323d1d379aa55f13  bluedevil-5.2.2.tar.xz
+85953cbefdec95e0fb97c0fdc873b0e5  bluedevil-5.2.95.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/bluedevil.git/commit/?h=f22&id=75501fcd12d588a0c80e884e7d588ba4ff993543


More information about the scm-commits mailing list