packages: awesome/awesome.spec, awesome/awesome-magnifier.patch, awesome/aw...

pawelz pawelz at pld-linux.org
Tue Oct 20 21:23:40 CEST 2009 

Author: pawelz                       Date: Tue Oct 20 19:23:40 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged DEVEL
- up to 3.4
- rel 1

---- Files affected:
packages/awesome:
   awesome.spec (1.77 -> 1.78) , awesome-magnifier.patch (1.1 -> 1.2) , awesome-client-bashizm.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/awesome/awesome.spec
diff -u packages/awesome/awesome.spec:1.77 packages/awesome/awesome.spec:1.78
--- packages/awesome/awesome.spec:1.77	Mon Sep  7 12:59:42 2009
+++ packages/awesome/awesome.spec	Tue Oct 20 21:23:34 2009
@@ -1,18 +1,19 @@
 # $Revision$, $Date$
+
 Summary:	awesome window manager
 Summary(hu.UTF-8):	awesome ablakkezelő
 Summary(pl.UTF-8):	Zarządca okien X - Awesome
 Name:		awesome
-Version:	3.3.4
+Version:	3.4
 Release:	1
 License:	GPL v2
 Group:		X11/Window Managers
 Source0:	http://awesome.naquadah.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	a8e20a5af2cb07191416c2b8198b450c
+# Source0-md5:	2c4cba2fb7a791c77d17506e51067155
 Source1:	%{name}-xsession.desktop
 Patch0:		%{name}-3.0-lua-files.patch
-Patch1:		%{name}-client-bashizm.patch
-Patch2:		%{name}-xmlto.patch
+Patch1:		%{name}-xmlto.patch
+Patch2:		%{name}-magnifier.patch
 URL:		http://awesome.naquadah.org/
 BuildRequires:	ImageMagick-coder-png
 BuildRequires:	asciidoc
@@ -25,6 +26,7 @@
 BuildRequires:	gperf
 BuildRequires:	imlib2-devel
 BuildRequires:	libev-devel
+BuildRequires:	libxcb-devel >= 1.4
 BuildRequires:	libxdg-basedir-devel >= 1.0.1
 BuildRequires:	lua-doc
 BuildRequires:	lua51-devel
@@ -41,9 +43,13 @@
 BuildRequires:	xorg-lib-libXft-devel
 BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXrandr-devel
-Requires:	%{name}-client = %{version}-%{release}
+BuildRequires:	xorg-proto-xproto-devel >= 7.0.15
 Requires:	startup-notification >= 0.10
 Requires:	xcb-util >= 0.3.6
+Provides:	awesome-plugin-awful
+Provides:	awesome-plugin-beautiful
+Obsoletes:	awesome-plugin-awful
+Obsoletes:	awesome-plugin-beautiful
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/X11
@@ -113,9 +119,6 @@
 Summary(pl.UTF-8):	Przykładowy plik konfiguracyjny dla zarządcy okien awesome
 Group:		Documentation
 Requires:	%{name} = %{version}-%{release}
-Requires:	%{name}-plugin-awful = %{version}-%{release}
-Requires:	%{name}-plugin-beautiful = %{version}-%{release}
-Requires:	%{name}-plugin-tabulous = %{version}-%{release}
 Requires:	%{name}-themes = %{version}-%{release}
 
 %description example-config
@@ -132,71 +135,12 @@
 jest dobrym punktem wyjścia dla osób nie używających wcześniej awesome
 3.x.
 
-%package plugin-awful
-Summary:	awful plugin for awesome window manager
-Summary(hu.UTF-8):	awful plugin az awesome ablakkezelőhöz
-Summary(pl.UTF-8):	Wtyczka awful dla zarządcy okien awesome
-Group:		X11/Window Managers/Tools
-Requires:	%{name} = %{version}-%{release}
-
-%description plugin-awful
-AWesome Functions very UsefuL: awful plugin for awesome window
-manager.
-
-%description plugin-awful -l hu.UTF-8
-AWesome Functions very UsefuL: awful plugin az awesome ablakkezelőhöz.
-
-%description plugin-awful -l pl.UTF-8
-AWesome Functions very UsefuL: wtyczka awful dla zarządcy okien
-awesome.
-
-%package plugin-beautiful
-Summary:	Theme library for awesome window manager
-Summary(hu.UTF-8):	Theme könyvtár az awesome ablakkezelőhöz
-Summary(pl.UTF-8):	Biblioteka styli dla zarządcy okien awesome
-Group:		X11/Window Managers/Tools
-Requires:	%{name} = %{version}-%{release}
-Suggests:	WallpaperChanger
-
-%description plugin-beautiful
-Theme library for awesome window manager.
-
-%description plugin-beautiful -l hu.UTF-8
-Theme könyvtár az awesome ablakkezelőhöz.
-
-%description plugin-beautiful -l pl.UTF-8
-Biblioteka styli dla zarządcy okien awesome.
-
-%package plugin-invaders
-Summary:	Awesome Invaders game
-Summary(hu.UTF-8):	Awesome Invaders játék
-Summary(pl.UTF-8):	Gra Awesome Invaders
-Group:		X11/Window Managers/Tools
-Requires:	%{name} = %{version}-%{release}
-Requires:	%{name}-plugin-awful = %{version}-%{release}
-Requires:	%{name}-plugin-beautiful = %{version}-%{release}
-Requires:	ImageMagick
-
-%description plugin-invaders
-Awesome Invaders is, as the name says, an implementation of Space
-Invaders using awesome 3's Lua interface.
-
-%description plugin-invaders -l hu.UTF-8
-Awesome Invaders, ahogy a neve is mutatja, a Space Invaders
-megvalósítása az awesome 3 lua interfészét használva.
-
-%description plugin-invaders -l pl.UTF-8
-Awesome Invaders jest grą Space Invaders zaimplementowaną w intefejsie
-Lua zarządcy okien awesome 3.
-
 %package plugin-naughty
 Summary:	Naughty is a lua library that implements popup notifications for awesome 3
 Summary(hu.UTF-8):	Naughty egy lua-könyvtár, amely felugró értesítéseket tesz lehetővé awesome3-ban
 Summary(pl.UTF-8):	Powiadomienia w postaci wyskakujących okienek dla awesome 3
 Group:		X11/Window Managers/Tools
 Requires:	%{name} = %{version}-%{release}
-Requires:	%{name}-plugin-awful = %{version}-%{release}
-Requires:	%{name}-plugin-beautiful = %{version}-%{release}
 Provides:	dbus(org.freedesktop.Notifications)
 
 %description plugin-naughty
@@ -211,57 +155,60 @@
 Biblioteka lua dla zarządcy okien awesome 3 implementująca
 powiadomienia w formie wyskakujących okienek.
 
-%package plugin-tabulous
-Summary:	Fabulous tabs for awesome window manager
-Summary(hu.UTF-8):	Tab-ok awesome-hoz
-Summary(pl.UTF-8):	Zakładki dla zarządcy okien awesome
+%package themes
+Summary:	Themes for awesome window manager (metapackage)
+Summary(hu.UTF-8):	Témák az awesome ablakkezelőhöz (metacsomag)
+Summary(pl.UTF-8):	Tematy dla zarządcy okien awesome
 Group:		X11/Window Managers/Tools
 Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-themes-default = %{version}-%{release}
+Requires:	%{name}-themes-sky = %{version}-%{release}
+Requires:	%{name}-themes-zenburn = %{version}-%{release}
 
-%description plugin-tabulous
-Fabulous tabs for awesome.
+%description themes
+Themes for awesome window manager (metapackage).
 
-%description plugin-tabulous -l hu.UTF-8
-Tab-ok awesome-hoz.
+%description themes -l hu.UTF-8
+Témák az awesome ablakkezelőhöz (metacsomag).
 
-%description plugin-tabulous -l pl.UTF-8
-Zakładki dla zarządcy okien awesome.
+%description themes -l pl.UTF-8
+Dodatkowe "tematy" (definicje wyglądu) zarządcy okien awesome.
 
-%package plugin-telak
-Summary:	Root window image display library
-Summary(hu.UTF-8):	Root ablak kezeléséhez könyvtár
-Summary(pl.UTF-8):	Biblioteka pozwlająca ustawić tapetę w głównym oknie
+%package themes-default
+Summary:	Default theme for awesome window manager
+Summary(hu.UTF-8):	Alapértelmezett téma az awesome ablakkezelőhöz
 Group:		X11/Window Managers/Tools
-Requires:	%{name} = %{version}-%{release}
-Requires:	lua-socket
-
-%description plugin-telak
-Root window image display library.
 
-%description plugin-telak -l hu.UTF-8
-Root ablak kezeléséhez könyvtár.
+%description themes-default
+Default theme for awesome window manager.
 
-%description plugin-telak -l pl.UTF-8
-Biblioteka pozwalająca ustawić tapetę wyświetlaną na głównym oknie.
+%description themes-default -l hu.UTF-8
+Alapértelmezett téma az awesome ablakkezelőhöz.
 
-%package themes
-Summary:	Themes for awesome window manager
-Summary(hu.UTF-8):	Témák az awesome ablakkezelőhöz
-Summary(pl.UTF-8):	Tematy dla zarządcy okien awesome
+%package themes-sky
+Summary:	Sky theme for awesome window manager
+Summary(hu.UTF-8):	Sky téma az awesome ablakkezelőhöz
 Group:		X11/Window Managers/Tools
-Requires:	%{name} = %{version}-%{release}
 
-%description themes
-Themes for awesome window manager.
+%description themes-sky
+Sky theme for awesome window manager.
 
-%description themes -l hu.UTF-8
-Témák az awesome ablakkezelőhöz.
+%description themes-sky -l hu.UTF-8
+Sky téma az awesome ablakkezelőhöz.
 
-%description themes -l pl.UTF-8
-Dodatkowe "tematy" (definicje wyglądu) zarządcy okien awesome.
+%package themes-zenburn
+Summary:	Zenburn theme for awesome window manager
+Summary(hu.UTF-8):	Zenburn téma az awesome ablakkezelőhöz
+Group:		X11/Window Managers/Tools
+
+%description themes-zenburn
+Zenburn theme for awesome window manager.
+
+%description themes-zenburn -l hu.UTF-8
+Zenburn téma az awesome ablakkezelőhöz.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -299,13 +246,23 @@
 %attr(755,root,root) %{_bindir}/awsetbg
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/lib
-%{_datadir}/%{name}/lib/capi.lua
 %{_datadir}/%{name}/icons
 %{_datadir}/xsessions/%{name}.desktop
 %{_mandir}/man1/%{name}.1*
 %{_mandir}/man1/awsetbg.1*
 %{_mandir}/man5/awesomerc.5*
 
+# plugin-awful
+%dir %{_datadir}/awesome/lib/awful
+%{_datadir}/awesome/lib/awful/*.lua
+%{_datadir}/awesome/lib/awful/layout
+%{_datadir}/awesome/lib/awful/mouse
+%{_datadir}/awesome/lib/awful/widget
+
+# plugin-beautiful
+%dir %{_datadir}/awesome/themes
+%{_datadir}/awesome/lib/beautiful.lua
+
 %files client
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{name}-client
@@ -321,48 +278,88 @@
 %dir %{_sysconfdir}/xdg/awesome
 %{_sysconfdir}/xdg/awesome/*
 
-%files plugin-awful
+%files themes
 %defattr(644,root,root,755)
-%dir %{_datadir}/awesome/lib/awful
-%{_datadir}/awesome/lib/awful/*.lua
-%{_datadir}/awesome/lib/awful/layout
-%{_datadir}/awesome/lib/awful/widget
 
-%files plugin-beautiful
+%files themes-default
 %defattr(644,root,root,755)
-%{_datadir}/awesome/lib/beautiful.lua
-%{_datadir}/awesome/themes
+%{_datadir}/awesome/themes/default
 
-%files themes
+%files themes-sky
 %defattr(644,root,root,755)
-%dir %{_datadir}/awesome/themes
-%{_datadir}/awesome/themes/default
 %{_datadir}/awesome/themes/sky
 
-%files plugin-invaders
+%files themes-zenburn
 %defattr(644,root,root,755)
-%{_datadir}/awesome/lib/invaders.lua
-%dir %{_datadir}/awesome/icons/invaders
-%{_datadir}/awesome/icons/invaders/*.png
+%{_datadir}/awesome/themes/zenburn
 
 %files plugin-naughty
 %defattr(644,root,root,755)
 %{_datadir}/awesome/lib/naughty.lua
 
-%files plugin-tabulous
-%defattr(644,root,root,755)
-%{_datadir}/awesome/lib/tabulous.lua
-
-%files plugin-telak
-%defattr(644,root,root,755)
-%{_datadir}/awesome/lib/telak.lua
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78  2009/10/20 19:23:34  pawelz
+- merged DEVEL
+- up to 3.4
+- rel 1
+
+Revision 1.77.2.12  2009/10/14 20:06:33  pawelz
+- added magnifier patch
+- rel 0.%{_rc}.3
+
+Revision 1.77.2.11  2009/10/14 18:15:06  uzsolt
+- remove awesome-client R
+
+Revision 1.77.2.10  2009/10/11 15:39:09  pawelz
+- added P: awesome-plugin-awful, awesome-plugin-beautiful for external plugins
+- fixed last commit log
+
+Revision 1.77.2.9  2009/10/11 15:22:10  pawelz
+- awful and beautiful merged into main awesome package. They are integral
+  parts of awesome. There is no better way to avoid dependency loop and
+  splitting them is pointless.
+- rel 0.%{_rc}.2
+
+Revision 1.77.2.8  2009/10/09 15:36:17  uzsolt
+- themes-X subpackages
+
+Revision 1.77.2.7  2009/10/09 15:27:47  uzsolt
+- awesome/themes dir fix
+- awful requires beautiful
+
+Revision 1.77.2.6  2009/10/09 14:35:30  pawelz
+- up to 3.4-rc3
+- inverted deps: let main package requires plugin-awful and plugin-beautiful
+- dropped magnifier patch (aplied upstream)
+
+Revision 1.77.2.5  2009/09/29 08:13:52  pawelz
+- added magnifier patch (de facto updated to git master)
+- rel 2
+
+Revision 1.77.2.4  2009/09/28 13:07:54  pawelz
+- example config no longer requires tabulous package. (in fact tabulous no
+  longer exists)
+
+Revision 1.77.2.3  2009/09/28 12:58:33  pawelz
+- up to 3.4-rc2
+
+Revision 1.77.2.2  2009/09/12 13:01:54  pawelz
+- BR: xorg-proto-xproto-devel >= 7.0.15
+- BR: libxcb-devel >= 1.4
+
+Revision 1.77.2.1  2009/09/11 16:28:44  pawelz
+- up to 3.4-rc1
+- dropped plugins: invaders, telak, tabulous (dropped upstream)
+- dropped awesome-client-bashizm patch (aplied upstream)
+- resequenced patches
+- new awful sublibrary: awful/mouse
+- capi.lua disappeared (?!?!?!)
+
 Revision 1.77  2009/09/07 10:59:42  pawelz
 - up to 3.3.4
 

================================================================
Index: packages/awesome/awesome-magnifier.patch
diff -u /dev/null packages/awesome/awesome-magnifier.patch:1.2
--- /dev/null	Tue Oct 20 21:23:40 2009
+++ packages/awesome/awesome-magnifier.patch	Tue Oct 20 21:23:34 2009
@@ -0,0 +1,36 @@
+diff --git a/lib/awful/layout/suit/magnifier.lua.in b/lib/awful/layout/suit/magnifier.lua.in
+index 2d4a526..74a2398 100644
+--- a/lib/awful/layout/suit/magnifier.lua.in
++++ b/lib/awful/layout/suit/magnifier.lua.in
+@@ -34,6 +34,11 @@ function arrange(p)
+         fidx = 1
+     end
+ 
++    -- If focused window is floating, value of focus will change. We want to
++    -- save original value of focus and raise() it after seting geometry of
++    -- other clients.
++    local originalfocus = focus
++
+     -- If focused window is not tiled, take the first one which is tiled.
+     if client.floating.get(focus) then
+         focus = cls[1]
+@@ -56,7 +61,6 @@ function arrange(p)
+         geometry.height = area.height
+     end
+     focus:geometry(geometry)
+-    focus:raise()
+ 
+     if #cls > 1 then
+         geometry.x = area.x
+@@ -87,6 +91,11 @@ function arrange(p)
+             geometry.y = geometry.y + geometry.height
+         end
+     end
++
++    -- Raise primary tiled window and then the originally focused window. If
++    -- there was no floating window it is the same window.
++    focus:raise()
++    originalfocus:raise()
+ end
+ 
+ name = "magnifier"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/awesome/awesome.spec?r1=1.77&r2=1.78&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/awesome/awesome-magnifier.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list