From 9ce85d731f3a9c6223c012a9efb4929b1e413a4876d30811ff3e45debb8966a7 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Fri, 26 Sep 2014 13:51:44 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinfocenter5?expand=0&rev=16 --- kinfocenter-5.0.1.tar.xz | 3 --- kinfocenter-5.0.95.tar.xz | 3 +++ kinfocenter5-rpmlintrc | 2 ++ kinfocenter5.changes | 11 +++++++++++ kinfocenter5.spec | 20 ++++++++++++++------ 5 files changed, 30 insertions(+), 9 deletions(-) delete mode 100644 kinfocenter-5.0.1.tar.xz create mode 100644 kinfocenter-5.0.95.tar.xz create mode 100644 kinfocenter5-rpmlintrc diff --git a/kinfocenter-5.0.1.tar.xz b/kinfocenter-5.0.1.tar.xz deleted file mode 100644 index 3be9502..0000000 --- a/kinfocenter-5.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4f1cb4c6b250208edbd78b19839e6a871797d8f99d8c82a82a1a2f7698684df -size 1061508 diff --git a/kinfocenter-5.0.95.tar.xz b/kinfocenter-5.0.95.tar.xz new file mode 100644 index 0000000..e94a029 --- /dev/null +++ b/kinfocenter-5.0.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59baaf31ceab9e485539cc3fd0e564160789f1a49492cad278bffb4e915865ec +size 1061404 diff --git a/kinfocenter5-rpmlintrc b/kinfocenter5-rpmlintrc new file mode 100644 index 0000000..cc4ae51 --- /dev/null +++ b/kinfocenter5-rpmlintrc @@ -0,0 +1,2 @@ +# 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/kinfocenter5.changes b/kinfocenter5.changes index 8604b78..40244fa 100644 --- a/kinfocenter5.changes +++ b/kinfocenter5.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Sep 26 13:45:30 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.0.95: + * Ported Wayland KCM to KWayland, instead of using Wayland directly +- Install translations +- Add rpmlintrc file for file-not-in-%lang warnings: we don't use + find_lang macro as it doesn't searches in subdirectories +- Swap pkgconfig(wayland-client) for kwayland-devel >= 5.0.95 +- Drop kwindowsystem-devel BuildRequires, no longer used + ------------------------------------------------------------------- Mon Aug 11 21:16:54 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/kinfocenter5.spec b/kinfocenter5.spec index f6dbe4a..0f7f4ac 100644 --- a/kinfocenter5.spec +++ b/kinfocenter5.spec @@ -17,13 +17,14 @@ Name: kinfocenter5 -Version: 5.0.1 +Version: 5.0.95 Release: 0 Summary: Utility that provides information about a computer system License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org/ -Source: http://download.kde.org/stable/plasma/%{version}/kinfocenter-%{version}.tar.xz +Source: kinfocenter-%{version}.tar.xz +Source99: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE opensuse-kinfocenter.diff (created by Alin M. Elena to have some openSUSE distro info in kinfocenter) Patch0: opensuse-kinfocenter.diff BuildRequires: extra-cmake-modules @@ -35,7 +36,6 @@ BuildRequires: kdoctools-devel BuildRequires: kf5-filesystem BuildRequires: ki18n-devel BuildRequires: kio-devel -BuildRequires: kwindowsystem-devel BuildRequires: kxmlgui-devel BuildRequires: libraw1394-devel BuildRequires: pciutils-devel @@ -52,7 +52,9 @@ BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(gl) %endif BuildRequires: pkgconfig(glu) -BuildRequires: pkgconfig(wayland-client) +%if 0%{?suse_version} > 1310 +BuildRequires: kwayland-devel >= 5.0.95 +%endif Conflicts: kdebase4-workspace # /etc/xdg/menus/kde-information.menu Conflicts: kdebase3 @@ -61,12 +63,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description KDE Utility that provides information about a computer system. +%lang_package %prep %setup -q -n kinfocenter-%{version} %patch0 -p1 %build - %cmake_kf5 -d build -- -DBUILD_po=OFF + %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 %make_jobs %install @@ -89,8 +92,13 @@ KDE Utility that provides information about a computer system. %{_kf5_sharedir}/kcmview1394/ %{_kf5_servicesdir}/ %{_kf5_servicetypesdir}/ -%{_kf5_sharedir}/kinfocenter/ +%{_kf5_sharedir}/kxmlgui5/ %{_kf5_configdir}/menus/kinfocenter.menu %{_kf5_sharedir}/desktop-directories/ +%files lang +%defattr(-,root,root) +%doc COPYING* +%{_kf5_localedir}/ + %changelog