From e0c8f73a6acc34f00e81f9e60394836630a012b2d0fd96fcef32019004139fef Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Wed, 6 Jul 2016 16:37:19 +0000 Subject: [PATCH] osc copypac from project:home:wolfi323:test package:bluedevil5 revision:10 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/bluedevil5?expand=0&rev=80 --- bluedevil5-rpmlintrc | 2 -- bluedevil5.changes | 7 +++++++ bluedevil5.spec | 10 +++++----- 3 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 bluedevil5-rpmlintrc diff --git a/bluedevil5-rpmlintrc b/bluedevil5-rpmlintrc deleted file mode 100644 index cc4ae51..0000000 --- a/bluedevil5-rpmlintrc +++ /dev/null @@ -1,2 +0,0 @@ -# we don't use find_lang macro as it doesn't searches in subdirectories -addFilter("file-not-in-%lang .*") \ No newline at end of file diff --git a/bluedevil5.changes b/bluedevil5.changes index cb1c70a..cd0e3ff 100644 --- a/bluedevil5.changes +++ b/bluedevil5.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 5 11:08:22 UTC 2016 - wbauer@tmo.at + +- Use the new %kf5_find_lang macro to create the file list for the + lang package +- Remove rpmlintrc file, it is not needed any more now + ------------------------------------------------------------------- Thu Jun 30 12:02:16 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/bluedevil5.spec b/bluedevil5.spec index 710d3ac..5f8cff0 100644 --- a/bluedevil5.spec +++ b/bluedevil5.spec @@ -26,7 +26,6 @@ License: GPL-2.0+ Group: Hardware/Other Url: http://www.kde.org/ Source: bluedevil-%{version}.tar.xz -Source99: %{name}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem @@ -68,11 +67,14 @@ Bluetooth daemon for KDE, handling connections. %setup -q -n bluedevil-%{version} %build -%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 +%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} %make_jobs %install %kf5_makeinstall -C build +%if %{with lang} +%kf5_find_lang +%endif %post %mime_database_post @@ -95,9 +97,7 @@ Bluetooth daemon for KDE, handling connections. %{_kf5_plasmadir}/ %if %{with lang} -%files lang -%defattr(-,root,root) -%{_kf5_localedir}/ +%files lang -f %{name}.lang %endif %changelog