diff --git a/awesome-branding-openSUSE-3.4.15-v0.1.tar.xz b/awesome-branding-openSUSE-3.4.15-v0.1.tar.xz deleted file mode 100644 index 9f4b517..0000000 --- a/awesome-branding-openSUSE-3.4.15-v0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c6ec2c5cc4ee753e78c20bba050883b8a3f9ee11be939d5fc7e6d3e4f13a210 -size 716096 diff --git a/awesome-branding-openSUSE-3.5-v0.3.tar.xz b/awesome-branding-openSUSE-3.5-v0.3.tar.xz new file mode 100644 index 0000000..946f24a --- /dev/null +++ b/awesome-branding-openSUSE-3.5-v0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2db30b26f455793ee1cbc1e85309f885987f50009223bdb90862b22a0463c976 +size 717272 diff --git a/awesome-branding-openSUSE-systemctl.patch b/awesome-branding-openSUSE-systemctl.patch deleted file mode 100644 index b5bd6b4..0000000 --- a/awesome-branding-openSUSE-systemctl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7af68ceb7be0a0d5881f1119dcfdc5cc338ddea6 Mon Sep 17 00:00:00 2001 -From: Gary Ching-Pang Lin -Date: Thu, 15 May 2014 16:46:15 +0800 -Subject: [PATCH] Use systemctl to shutdown and reboot - -By default, systemd allows the local user to shutdown and reboot the -system, so we can use systemctl to do that without typing the password. - -Signed-off-by: Gary Ching-Pang Lin ---- - rc.lua | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/rc.lua b/rc.lua -index dc12186..c277fc8 100644 ---- a/rc.lua -+++ b/rc.lua -@@ -129,8 +129,8 @@ end - mysystem_menu = { - { 'Lock Screen', 'xscreensaver-command -lock', freedesktop.utils.lookup_icon({ icon = 'system-lock-screen' }) }, - { 'Logout', awesome.quit, freedesktop.utils.lookup_icon({ icon = 'system-log-out' }) }, -- { 'Reboot System', 'xdg-su -c "shutdown -r now"', freedesktop.utils.lookup_icon({ icon = 'reboot-notifier' }) }, -- { 'Shutdown System', 'xdg-su -c "shutdown -h now"', freedesktop.utils.lookup_icon({ icon = 'system-shutdown' }) } -+ { 'Reboot System', 'systemctl reboot', freedesktop.utils.lookup_icon({ icon = 'reboot-notifier' }) }, -+ { 'Shutdown System', 'systemctl poweroff', freedesktop.utils.lookup_icon({ icon = 'system-shutdown' }) } - } - - myawesome_menu = { --- -1.8.4.5 - diff --git a/awesome-branding-openSUSE.changes b/awesome-branding-openSUSE.changes index 78f810f..eb9e3cf 100644 --- a/awesome-branding-openSUSE.changes +++ b/awesome-branding-openSUSE.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Nov 10 14:07:23 UTC 2015 - sor.alexei@meowr.ru + +- Update to 3.5-v0.3: + * awesome 3.5 compatibility (boo#953503). + * Use Adwaita icon theme instead of GNOME icon theme. + * Use light-locker instead of xscreensaver. +- Remove awesome-branding-openSUSE-systemctl.patch. + ------------------------------------------------------------------- Thu May 15 05:56:09 UTC 2014 - glin@suse.com @@ -24,7 +33,6 @@ Wed Jan 30 12:26:41 UTC 2013 - toganm@opensuse.org * Provide option to use personal theme if available * Use local in prepartion for awesome 3.5 migration - ------------------------------------------------------------------- Fri Dec 7 17:35:17 UTC 2012 - toganm@opensuse.org @@ -33,4 +41,3 @@ Fri Dec 7 17:35:17 UTC 2012 - toganm@opensuse.org xscreensaver to the required packages. awesome-shifty is recommended * keydoc.lua and calendar2.lua are added as modules - diff --git a/awesome-branding-openSUSE.spec b/awesome-branding-openSUSE.spec index 5b95336..8677e5d 100644 --- a/awesome-branding-openSUSE.spec +++ b/awesome-branding-openSUSE.spec @@ -1,7 +1,7 @@ # # spec file for package awesome-branding-openSUSE # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Togan Muftuoglu # # All modifications and additions to the file contributed by third parties @@ -17,59 +17,52 @@ # -%define git_version 3.4.15-v0.1 -%define main_pack awesome +%define _version 3.5-v0.3 +%define _name awesome Name: awesome-branding-openSUSE -Version: 3.4.15 +Version: 3.5 Release: 0 -Url: https://github.com/madanyang/awesome-branding-opensuse.git Summary: openSUSE Branding for awesome License: GPL-2.0+ Group: System/GUI/Other -Supplements: packageand(%{main_pack}:branding-openSUSE) -Provides: %{main_pack}-branding = %{version} -Conflicts: otherproviders(%main_pack-branding) -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %name-%git_version.tar.xz -# PATCH-FIX-UPSTREAM awesome-branding-openSUSE-systemctl.patch glin@suse.com -- Use systemctl to allow the local user to reboot and shutdown the system without typing the password -Patch0: awesome-branding-openSUSE-systemctl.patch +Url: https://github.com/madanyang/awesome-branding-opensuse +Source: %{name}-%{_version}.tar.xz +Requires: adwaita-icon-theme Requires: awesome-freedesktop Requires: awesome-vicious -Requires: gnome-icon-theme -Requires: nitrogen +Requires: light-locker Requires: wallpaper-branding-openSUSE -Requires: xscreensaver Recommends: awesome-shifty +Supplements: packageand(%{_name}:branding-openSUSE) +Conflicts: otherproviders(%{_name}-branding) +Provides: %{_name}-branding = %{version} +BuildArch: noarch %description -This package provides the openSUSE specific additions both for functions and -look and feel for awesome window manager. - +This package provides the openSUSE specific additions both for +functions and look and feel for awesome window manager. %prep -%setup -q -n %name-%git_version -%patch0 -p1 +%setup -q -n %{name}-%{_version} %build +# Nothing to build. %install -install -d %{buildroot}%{_sysconfdir}/xdg/awesome -install -d %{buildroot}%{_datadir}/awesome/lib -install -d %{buildroot}%{_datadir}/awesome/themes +install -Dm 0644 rc.lua %{buildroot}%{_sysconfdir}/xdg/awesome/rc.lua +install -Dm 0644 calendar2.lua %{buildroot}%{_datadir}/awesome/lib/calendar2.lua +install -Dm 0644 keydoc.lua %{buildroot}%{_datadir}/awesome/lib/keydoc.lua -install -m 644 calendar2.lua %{buildroot}%{_datadir}/awesome/lib/. -install -m 644 keydoc.lua %{buildroot}%{_datadir}/awesome/lib/. -cp -ar themes/ %{buildroot}%{_datadir}/awesome/ -install -m 644 rc.lua %{buildroot}%{_sysconfdir}/xdg/awesome/rc.lua +mkdir -p %{buildroot}%{_datadir}/awesome/ +cp -a themes/ %{buildroot}%{_datadir}/awesome/ %files -%defattr(-,root,root,-) +%defattr(-,root,root) %doc README.openSUSE -%dir %{_sysconfdir}/xdg/awesome +%dir %{_sysconfdir}/xdg/awesome/ %config(noreplace) %{_sysconfdir}/xdg/awesome/rc.lua -%dir %{_datadir}/awesome -%{_datadir}/awesome/lib -%{_datadir}/awesome/themes +%dir %{_datadir}/awesome/ +%{_datadir}/awesome/lib/ +%{_datadir}/awesome/themes/ %changelog