Ondřej Súkup 2015-11-11 07:50:35 +00:00 committed by Git OBS Bridge
parent 517dae68f8
commit fbafd0992a
5 changed files with 38 additions and 69 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0c6ec2c5cc4ee753e78c20bba050883b8a3f9ee11be939d5fc7e6d3e4f13a210
size 716096

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2db30b26f455793ee1cbc1e85309f885987f50009223bdb90862b22a0463c976
size 717272

View File

@ -1,31 +0,0 @@
From 7af68ceb7be0a0d5881f1119dcfdc5cc338ddea6 Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <glin@suse.com>
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 <glin@suse.com>
---
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

View File

@ -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 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 * Provide option to use personal theme if available
* Use local in prepartion for awesome 3.5 migration * Use local in prepartion for awesome 3.5 migration
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 7 17:35:17 UTC 2012 - toganm@opensuse.org 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 xscreensaver to the required packages. awesome-shifty is
recommended recommended
* keydoc.lua and calendar2.lua are added as modules * keydoc.lua and calendar2.lua are added as modules

View File

@ -1,7 +1,7 @@
# #
# spec file for package awesome-branding-openSUSE # 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 <toganm@opensuse.org> # Copyright (c) 2012 Togan Muftuoglu <toganm@opensuse.org>
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -17,59 +17,52 @@
# #
%define git_version 3.4.15-v0.1 %define _version 3.5-v0.3
%define main_pack awesome %define _name awesome
Name: awesome-branding-openSUSE Name: awesome-branding-openSUSE
Version: 3.4.15 Version: 3.5
Release: 0 Release: 0
Url: https://github.com/madanyang/awesome-branding-opensuse.git
Summary: openSUSE Branding for awesome Summary: openSUSE Branding for awesome
License: GPL-2.0+ License: GPL-2.0+
Group: System/GUI/Other Group: System/GUI/Other
Supplements: packageand(%{main_pack}:branding-openSUSE) Url: https://github.com/madanyang/awesome-branding-opensuse
Provides: %{main_pack}-branding = %{version} Source: %{name}-%{_version}.tar.xz
Conflicts: otherproviders(%main_pack-branding) Requires: adwaita-icon-theme
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
Requires: awesome-freedesktop Requires: awesome-freedesktop
Requires: awesome-vicious Requires: awesome-vicious
Requires: gnome-icon-theme Requires: light-locker
Requires: nitrogen
Requires: wallpaper-branding-openSUSE Requires: wallpaper-branding-openSUSE
Requires: xscreensaver
Recommends: awesome-shifty Recommends: awesome-shifty
Supplements: packageand(%{_name}:branding-openSUSE)
Conflicts: otherproviders(%{_name}-branding)
Provides: %{_name}-branding = %{version}
BuildArch: noarch
%description %description
This package provides the openSUSE specific additions both for functions and This package provides the openSUSE specific additions both for
look and feel for awesome window manager. functions and look and feel for awesome window manager.
%prep %prep
%setup -q -n %name-%git_version %setup -q -n %{name}-%{_version}
%patch0 -p1
%build %build
# Nothing to build.
%install %install
install -d %{buildroot}%{_sysconfdir}/xdg/awesome install -Dm 0644 rc.lua %{buildroot}%{_sysconfdir}/xdg/awesome/rc.lua
install -d %{buildroot}%{_datadir}/awesome/lib install -Dm 0644 calendar2.lua %{buildroot}%{_datadir}/awesome/lib/calendar2.lua
install -d %{buildroot}%{_datadir}/awesome/themes install -Dm 0644 keydoc.lua %{buildroot}%{_datadir}/awesome/lib/keydoc.lua
install -m 644 calendar2.lua %{buildroot}%{_datadir}/awesome/lib/. mkdir -p %{buildroot}%{_datadir}/awesome/
install -m 644 keydoc.lua %{buildroot}%{_datadir}/awesome/lib/. cp -a themes/ %{buildroot}%{_datadir}/awesome/
cp -ar themes/ %{buildroot}%{_datadir}/awesome/
install -m 644 rc.lua %{buildroot}%{_sysconfdir}/xdg/awesome/rc.lua
%files %files
%defattr(-,root,root,-) %defattr(-,root,root)
%doc README.openSUSE %doc README.openSUSE
%dir %{_sysconfdir}/xdg/awesome %dir %{_sysconfdir}/xdg/awesome/
%config(noreplace) %{_sysconfdir}/xdg/awesome/rc.lua %config(noreplace) %{_sysconfdir}/xdg/awesome/rc.lua
%dir %{_datadir}/awesome %dir %{_datadir}/awesome/
%{_datadir}/awesome/lib %{_datadir}/awesome/lib/
%{_datadir}/awesome/themes %{_datadir}/awesome/themes/
%changelog %changelog