diff --git a/kf5-bluez-qt.spec b/kf5-bluez-qt.spec index 0c2c9f4..4796b3e 100644 --- a/kf5-bluez-qt.spec +++ b/kf5-bluez-qt.spec @@ -1,5 +1,5 @@ %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 @@ -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 @@ -30,14 +28,15 @@ BuildRequires: systemd Requires: kf5-filesystem Requires: bluez >= 5 -# 5.2 was the last release of libbluedevil -Obsoletes: libbluedevil <= 5.2 +## libbluedevil 5.2.2 was the last release +Obsoletes: libbluedevil < 5.2.90 %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 @@ -49,9 +48,10 @@ Development files for %{name}. %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kf5} .. +%{cmake_kf5} .. \ + -DUDEV_RULES_INSTALL_DIR:PATH="%{_udevrulesdir}" popd make %{?_smp_mflags} -C %{_target_platform} @@ -60,8 +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 @@ -69,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 @@ -79,9 +77,13 @@ install -D %{SOURCE1} %{buildroot}/%{_udevrulesdir}/61-kde-bluetooth-rfkill.rule %{_kf5_libdir}/cmake/KF5BluezQt %{_qt5_archdatadir}/mkspecs/modules/qt_BluezQt.pri + %changelog -* Mon Apr 27 2015 Daniel Vrátil - 5.3.0-1 -- Plasma 5.3.0 +* Sat Apr 25 2015 Rex Dieter 5.3.0-1 +- 5.3.0, %%build: explicitly set -DUDEV_RULES_INSTALL_DIR=%%_udevrulesdir + +* Sat Apr 25 2015 Rex Dieter 5.2.95-3 +- Fix libbluedevil Obsoletes (including -devel), .spec cosmetics * Wed Apr 22 2015 Daniel Vrátil - 5.2.95-2 - install %%doc