From 25d1863fe60425a323f5150ee7d9f5d5f7a72b445bd14dab66c7b6643f51e7c8 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 15 Sep 2016 09:14:28 +0000 Subject: [PATCH] osc copypac from project:KDE:Unstable:Frameworks package:kscreenlocker revision:52 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/kscreenlocker?expand=0&rev=1 --- _service | 12 ++ ...r-5.7.90git~20160915T101206~77dd491.tar.xz | 3 + _service:set_version:kscreenlocker.spec | 144 ++++++++++++++++++ fix-wayland-version-requirement.diff | 2 +- kscreenlocker-5.5.1.tar.xz | 3 + kscreenlocker-5.7.4.tar.xz | 3 - kscreenlocker.changes | 85 ----------- kscreenlocker.spec | 11 +- 8 files changed, 168 insertions(+), 95 deletions(-) create mode 100644 _service create mode 100644 _service:recompress:tar_scm:kscreenlocker-5.7.90git~20160915T101206~77dd491.tar.xz create mode 100644 _service:set_version:kscreenlocker.spec create mode 100644 kscreenlocker-5.5.1.tar.xz delete mode 100644 kscreenlocker-5.7.4.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..8826059 --- /dev/null +++ b/_service @@ -0,0 +1,12 @@ + + + git://anongit.kde.org/kscreenlocker.git + git + 5.7.90git~%ci~%h + + + *.tar + xz + + + diff --git a/_service:recompress:tar_scm:kscreenlocker-5.7.90git~20160915T101206~77dd491.tar.xz b/_service:recompress:tar_scm:kscreenlocker-5.7.90git~20160915T101206~77dd491.tar.xz new file mode 100644 index 0000000..adbbdba --- /dev/null +++ b/_service:recompress:tar_scm:kscreenlocker-5.7.90git~20160915T101206~77dd491.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c2021b1b98a6c4f68f1af64bc439aa67066bb92cef9f09f520e3db408f3d8f8 +size 72504 diff --git a/_service:set_version:kscreenlocker.spec b/_service:set_version:kscreenlocker.spec new file mode 100644 index 0000000..92ba576 --- /dev/null +++ b/_service:set_version:kscreenlocker.spec @@ -0,0 +1,144 @@ +# +# spec file for package kscreenlocker +# +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%bcond_without lang +Name: kscreenlocker +Version: 5.7.90git~20160915T101206~77dd491 +Release: 0 +Summary: Library and components for secure lock screen architecture +License: GPL-2.0+ +Group: System/GUI/KDE +Url: https://projects.kde.org/kscreenlocker +Source: %{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE fix-wayland-version-requirement.diff -- Changes wayland requirement from 1.3 to 1.2.1 +Patch0: fix-wayland-version-requirement.diff +BuildRequires: cmake >= 2.8.12 +BuildRequires: extra-cmake-modules >= 1.8.0 +BuildRequires: kf5-filesystem +BuildRequires: pam-config +BuildRequires: pam-devel +BuildRequires: cmake(KF5Crash) >= 5.15.0 +BuildRequires: cmake(KF5Declarative) >= 5.15.0 +BuildRequires: cmake(KF5GlobalAccel) >= 5.15.0 +BuildRequires: cmake(KF5I18n) >= 5.15.0 +BuildRequires: cmake(KF5IdleTime) >= 5.15.0 +BuildRequires: cmake(KF5KCMUtils) >= 5.15.0 +BuildRequires: cmake(KF5Notifications) >= 5.15.0 +BuildRequires: cmake(KF5Solid) >= 5.15.0 +BuildRequires: cmake(KF5TextWidgets) >= 5.15.0 +BuildRequires: cmake(KF5Wayland) +BuildRequires: cmake(KF5WindowSystem) >= 5.15.0 +BuildRequires: cmake(KF5XmlGui) >= 5.15.0 +BuildRequires: cmake(Qt5Quick) >= 5.5.0 +BuildRequires: cmake(Qt5QuickWidgets) >= 5.5.0 +BuildRequires: cmake(Qt5Test) >= 5.5.0 +BuildRequires: cmake(Qt5Widgets) >= 5.5.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.5.0 +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-server) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-keysyms) +BuildRequires: pkgconfig(xcursor) +BuildRequires: pkgconfig(xi) +Requires(post): pam-config +%if %{with lang} +Recommends: %{name}-lang +%else +Obsoletes: %{name}-lang +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Library and components for secure lock screen architecture. + +%package -n libKScreenLocker5 +Summary: Library and components for secure lock screen architecture +Group: System/GUI/KDE + +%description -n libKScreenLocker5 +Library and components for secure lock screen architecture. + +%package devel +Summary: Library and components for secure lock screen architecture - development files +Group: Development/Libraries/C and C++ +Requires: libKScreenLocker5 = %{version} +Requires: cmake(Qt5Core) >= 5.5.0 +Requires: cmake(Qt5X11Extras) >= 5.5.0 + +%description devel +Development files for Library and components for secure lock screen architecture. + +%lang_package +%prep +%setup -q -n %{name}-%{version} +%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} +# SLE12 has a patched 1.2.1 wayland with all features KDE needs from up to 1.7.0 +%patch0 -p1 +%endif + +%build + %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 + %make_jobs + +%install + %kf5_makeinstall -C build + +%post +# boo#931296 +/usr/sbin/pam-config -d --unix2 || : +/usr/sbin/pam-config -a --unix || : +/sbin/ldconfig + +%post -n libKScreenLocker5 -p /sbin/ldconfig + +%postun -n libKScreenLocker5 -p /sbin/ldconfig + +%if %{with lang} +%files lang +%defattr(-,root,root) +%doc COPYING* +%{_kf5_localedir}/ +%endif + +%files +%defattr(-,root,root) +%doc COPYING* +%{_kf5_libdir}/libexec/kcheckpass +%{_kf5_libdir}/libexec/kscreenlocker_greet +%{_kf5_servicesdir}/ +%{_kf5_sharedir}/kconf_update/ +%{_kf5_plugindir}/ +%{_kf5_notifydir}/ +%{_kf5_sharedir}/ksmserver/ + +%files -n libKScreenLocker5 +%defattr(-,root,root) +%doc COPYING* +%{_kf5_libdir}/libKScreenLocker.so.* + +%files devel +%defattr(-,root,root) +%doc COPYING* +%{_kf5_libdir}/libKScreenLocker.so +%{_kf5_prefix}/include/KScreenLocker/ +%{_kf5_libdir}/cmake/ScreenSaverDBusInterface/ +%{_kf5_libdir}/cmake/KScreenLocker/ +%{_kf5_sharedir}/dbus-1/interfaces/ + +%changelog diff --git a/fix-wayland-version-requirement.diff b/fix-wayland-version-requirement.diff index 9c9972b..8a86b95 100644 --- a/fix-wayland-version-requirement.diff +++ b/fix-wayland-version-requirement.diff @@ -2,7 +2,7 @@ Index: kscreenlocker-5.5.0/CMakeLists.txt =================================================================== --- kscreenlocker-5.5.0.orig/CMakeLists.txt +++ kscreenlocker-5.5.0/CMakeLists.txt -@@ -38,7 +38,7 @@ set_package_properties(KF5Wayland PROPER +@@ -56,7 +56,7 @@ set_package_properties(KF5Wayland PROPERTIES TYPE REQUIRED PURPOSE "Required for building screenlocker") find_package(WaylandScanner) diff --git a/kscreenlocker-5.5.1.tar.xz b/kscreenlocker-5.5.1.tar.xz new file mode 100644 index 0000000..7e30118 --- /dev/null +++ b/kscreenlocker-5.5.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a1850a8cfc210a6c0fdff56b34481577eb697aa40982208df102f1dd1e02418 +size 97432 diff --git a/kscreenlocker-5.7.4.tar.xz b/kscreenlocker-5.7.4.tar.xz deleted file mode 100644 index 255da36..0000000 --- a/kscreenlocker-5.7.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d86c954973c3f9d474a0e44275e6cfec596a217f1516cecd6f2b04df5df1f10d -size 101828 diff --git a/kscreenlocker.changes b/kscreenlocker.changes index 32b5718..aa4723c 100644 --- a/kscreenlocker.changes +++ b/kscreenlocker.changes @@ -1,88 +1,3 @@ -------------------------------------------------------------------- -Fri Aug 26 20:36:41 UTC 2016 - fabian@ritter-vogt.de - -- Update to 5.7.4 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.4.php - -------------------------------------------------------------------- -Tue Aug 2 11:35:57 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.3 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.3.php - -------------------------------------------------------------------- -Wed Jul 20 08:54:24 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.2 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.2.php - -------------------------------------------------------------------- -Wed Jul 13 06:13:28 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.1 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.1.php - -------------------------------------------------------------------- -Tue Jul 5 20:32:40 UTC 2016 - wbauer@tmo.at - -- Use the new %kf5_find_lang macro to create the file list for the - lang package - -------------------------------------------------------------------- -Thu Jun 30 12:02:23 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.0 - * New feature release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.0.php - -------------------------------------------------------------------- -Sun May 15 16:50:16 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.4 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.4.php - -------------------------------------------------------------------- -Tue Apr 19 20:45:42 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.3 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.3.php - -------------------------------------------------------------------- -Tue Apr 5 15:53:47 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.2 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.2.php -- Drop upstreamed Workaround-problems-with-QtQueuedConnection.patch - -------------------------------------------------------------------- -Mon Apr 4 14:02:00 UTC 2016 - hrvoje.senjan@gmail.com - -- Added Workaround-problems-with-QtQueuedConnection.patch - (kde#361007, kde#361008) - -------------------------------------------------------------------- -Tue Mar 29 16:20:51 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.1 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.1.php - ------------------------------------------------------------------- Sun Mar 20 09:19:52 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/kscreenlocker.spec b/kscreenlocker.spec index 5f41b42..5adfe2b 100644 --- a/kscreenlocker.spec +++ b/kscreenlocker.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: kscreenlocker -Version: 5.7.4 +Version: 5.6.0 Release: 0 Summary: Library and components for secure lock screen architecture License: GPL-2.0+ @@ -93,14 +93,11 @@ Development files for Library and components for secure lock screen architecture %endif %build - %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} + %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 %make_jobs %install %kf5_makeinstall -C build -%if %{with lang} - %kf5_find_lang -%endif %post # boo#931296 @@ -113,8 +110,10 @@ Development files for Library and components for secure lock screen architecture %postun -n libKScreenLocker5 -p /sbin/ldconfig %if %{with lang} -%files lang -f %{name}.lang +%files lang +%defattr(-,root,root) %doc COPYING* +%{_kf5_localedir}/ %endif %files