rdieter pushed to kf5-bluez-qt (master). "5.3.0, %build: explicitly set -DUDEV_RULES_INSTALL_DIR=%_udevrulesdir"

notifications at fedoraproject.org notifications at fedoraproject.org
Sat Apr 25 17:55:34 UTC 2015


>From f54f750dac56954809972ae56336202620f3846d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 25 Apr 2015 12:55:26 -0500
Subject: 5.3.0, %build: explicitly set -DUDEV_RULES_INSTALL_DIR=%_udevrulesdir


diff --git a/.gitignore b/.gitignore
index 7462325..9be6603 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/bluez-qt-5.2.95.tar.xz
+/bluez-qt-5.3.0.tar.xz
diff --git a/61-kde-bluetooth-rfkill.rules b/61-kde-bluetooth-rfkill.rules
deleted file mode 100644
index c6c4b3d..0000000
--- a/61-kde-bluetooth-rfkill.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-# Get access to /dev/rfkill for users
-# See https://bugzilla.redhat.com/show_bug.cgi?id=514798
-#
-# Simplified by Kay Sievers
-# https://bugzilla.redhat.com/show_bug.cgi?id=733326
-
-KERNEL=="rfkill", SUBSYSTEM=="misc", TAG+="uaccess"
-
diff --git a/kf5-bluez-qt.spec b/kf5-bluez-qt.spec
index db84460..c313145 100644
--- a/kf5-bluez-qt.spec
+++ b/kf5-bluez-qt.spec
@@ -1,10 +1,10 @@
 %global framework bluez-qt
-%global plasma_version 5.2.95
+%global plasma_version 5.3.0
 
 Name:           kf5-%{framework}
 Summary:        A Qt wrapper for Bluez
-Version:        5.2.95
-Release:        3%{?dist}
+Version:        5.3.0
+Release:        0.1%{?dist}
 
 License:        LGPLv2+
 URL:            https://projects.kde.org/projects/kde/workspace/bluez-qt
@@ -17,8 +17,6 @@ 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
@@ -52,7 +50,8 @@ Development files for %{name}.
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kf5} ..
+%{cmake_kf5} .. \
+  -DUDEV_RULES_INSTALL_DIR:PATH="%{_udevrulesdir}"
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -61,9 +60,6 @@ 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
@@ -71,7 +67,7 @@ install -D %{SOURCE1} %{buildroot}/%{_udevrulesdir}/61-kde-bluetooth-rfkill.rule
 %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
@@ -81,7 +77,11 @@ install -D %{SOURCE1} %{buildroot}/%{_udevrulesdir}/61-kde-bluetooth-rfkill.rule
 %{_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
 
diff --git a/sources b/sources
index 7d11e25..a8c4572 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1a103003b00381764bb8785f92ea0a65  bluez-qt-5.2.95.tar.xz
+e5ece42a1c25b10e751e7334c8420de0  bluez-qt-5.3.0.tar.xz
-- 
cgit v0.10.2


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


More information about the scm-commits mailing list