dvratil pushed to kf5-bluez-qt (f20). "Plasma 5.3.0"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Jun 11 12:46:12 UTC 2015


From adcfb452f9d49a3c0e682ff0420985c9c864490d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil at redhat.com>
Date: Mon, 27 Apr 2015 13:07:23 +0200
Subject: Plasma 5.3.0


diff --git a/kf5-bluez-qt.spec b/kf5-bluez-qt.spec
index 4796b3e..0c2c9f4 100644
--- a/kf5-bluez-qt.spec
+++ b/kf5-bluez-qt.spec
@@ -1,5 +1,5 @@
 %global framework bluez-qt
-%global plasma_version 5.3.0
+%global plasma_version 5.2.95
 
 Name:           kf5-%{framework}
 Summary:        A Qt wrapper for Bluez
@@ -17,6 +17,8 @@ URL:            https://projects.kde.org/projects/kde/workspace/bluez-qt
 %endif
 Source0: http://download.kde.org/%{stable}/plasma/%{plasma_version}/%{framework}-%{version}.tar.xz
 
+Source1: 61-kde-bluetooth-rfkill.rules
+
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-rpm-macros
 BuildRequires:  qt5-qtbase-devel
@@ -28,15 +30,14 @@ BuildRequires:  systemd
 Requires:       kf5-filesystem
 Requires:       bluez >= 5
 
-## libbluedevil 5.2.2 was the last release
-Obsoletes:      libbluedevil < 5.2.90
+# 5.2 was the last release of libbluedevil
+Obsoletes:      libbluedevil <= 5.2
 
 %description
 BluezQt is Qt-based library written handle all Bluetooth functionality.
 
 %package        devel
 Summary:        Development files for %{name}
-Obsoletes:      libbluedevil-devel < 5.2.90
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       qt5-qtbase-devel
 %description    devel
@@ -48,10 +49,9 @@ Development files for %{name}.
 
 
 %build
-mkdir %{_target_platform}
+mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kf5} .. \
-  -DUDEV_RULES_INSTALL_DIR:PATH="%{_udevrulesdir}"
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -60,6 +60,8 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+# Install udev rules
+install -D %{SOURCE1} %{buildroot}/%{_udevrulesdir}/61-kde-bluetooth-rfkill.rules
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -67,7 +69,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %files
 %doc COPYING.LIB README.md
 %{_libdir}/libKF5BluezQt.so.*
-%{_kf5_qmldir}/org/kde/bluezqt/
+%{_kf5_qmldir}/org/kde/bluezqt
 %{_udevrulesdir}/61-kde-bluetooth-rfkill.rules
 
 %files devel
@@ -77,13 +79,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %{_kf5_libdir}/cmake/KF5BluezQt
 %{_qt5_archdatadir}/mkspecs/modules/qt_BluezQt.pri
 
-
 %changelog
-* Sat Apr 25 2015 Rex Dieter <rdieter at fedoraproject.org> 5.3.0-1
-- 5.3.0, %%build: explicitly set -DUDEV_RULES_INSTALL_DIR=%%_udevrulesdir
-
-* Sat Apr 25 2015 Rex Dieter <rdieter at fedoraproject.org> 5.2.95-3
-- Fix libbluedevil Obsoletes (including -devel), .spec cosmetics
+* Mon Apr 27 2015 Daniel Vrátil <dvratil at redhat.com> - 5.3.0-1
+- Plasma 5.3.0
 
 * Wed Apr 22 2015 Daniel Vrátil <dvratil at redhat.com> - 5.2.95-2
 - install %%doc
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kf5-bluez-qt.git/commit/?h=f20&id=adcfb452f9d49a3c0e682ff0420985c9c864490d


More information about the scm-commits mailing list