X-Git-Url: https://git.pld-linux.org/?p=packages%2Fawesome.git;a=blobdiff_plain;f=awesome.spec;h=f7d3732d42d84cc2d2a06e97d36a40c2230204d1;hp=dc62bba55197e6a94a9e92986ed138dd2f804e1c;hb=da585cc49b4d63b278cf500b131c4a0d28ca8115;hpb=489fc5b215966dead3b6eab0d309ef8745f36e42

diff --git a/awesome.spec b/awesome.spec
index dc62bba..f7d3732 100644
--- a/awesome.spec
+++ b/awesome.spec
@@ -1,45 +1,59 @@
-#
-Summary:	Awesome Window Manager
+
+Summary:	awesome window manager
 Summary(hu.UTF-8):	awesome ablakkezelő
 Summary(pl.UTF-8):	Zarządca okien X - Awesome
 Name:		awesome
-Version:	3.1
-Release:	0.1
+Version:	3.4.12
+Release:	4
 License:	GPL v2
 Group:		X11/Window Managers
-Source0:	http://awesome.naquadah.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	e687a9c0056437207cbdba2f64412624
+Source0:	http://awesome.naquadah.org/download/%{name}-%{version}.tar.xz
+# Source0-md5:	2c3490b820a19c044290027e6f2eb6c8
 Source1:	%{name}-xsession.desktop
 Patch0:		%{name}-3.0-lua-files.patch
+Patch1:		%{name}-magnifier.patch
+Patch2:		normalize-icon-path-names.patch
+Patch3:		xcb-util.patch
 URL:		http://awesome.naquadah.org/
+BuildRequires:	ImageMagick-coder-png
 BuildRequires:	asciidoc
 BuildRequires:	cairo-devel
-BuildRequires:	cmake >= 2.6
+BuildRequires:	cmake >= 2.8.0
 BuildRequires:	dbus-devel
-BuildRequires:	doxygen
-BuildRequires:	glib-devel
+BuildRequires:	docbook-dtd45-xml
 BuildRequires:	glib2-devel
 BuildRequires:	gperf
 BuildRequires:	imlib2-devel
-BuildRequires:	libev-devel
+BuildRequires:	libev-devel >= 4.0
+BuildRequires:	libxdg-basedir-devel >= 1.0.1
 BuildRequires:	lua-doc
 BuildRequires:	lua51-devel
-BuildRequires:	pango-devel
+BuildRequires:	pango-devel >= 1:1.19.3
 BuildRequires:	pkgconfig >= 0.9.0
-BuildRequires:	readline-devel
 BuildRequires:	rpmbuild(macros) >= 1.293
 BuildRequires:	sed >= 4.0
-BuildRequires:	xcb-util-devel >= 0.3
+BuildRequires:	startup-notification-devel >= 0.10
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	which
+BuildRequires:	xcb-util-image-devel >= 0.3.8
+BuildRequires:	xcb-util-keysyms-devel >= 0.3.8
+BuildRequires:	xcb-util-wm-devel >= 0.3.8
 BuildRequires:	xmlto
-BuildRequires:	xorg-lib-libICE-devel
 BuildRequires:	xorg-lib-libXext-devel
-BuildRequires:	xorg-lib-libXft-devel
-BuildRequires:	xorg-lib-libXinerama-devel
-BuildRequires:	xorg-lib-libXrandr-devel
+BuildRequires:	xorg-proto-xproto-devel >= 7.0.15
+Requires:	pango >= 1:1.19.3
+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
+Obsoletes:	awesome-plugin-invaders
+Obsoletes:	awesome-plugin-revelation
+Obsoletes:	awesome-plugin-tabulous
+Obsoletes:	awesome-plugin-telak
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc/X11
-
 %description
 awesome is a highly configurable, next generation framework window
 manager for X. It is very fast, light and extensible. It is primarly
@@ -55,19 +69,40 @@ számítógéppel dolgozik és teljeskörű irányítást akar a grafikus
 felületén.
 
 %description -l pl.UTF-8
-awesome jest menedżerem okien charakteryzującym się bardzo dużymi
-możliwościami konfiguracji i rozszerzania fnkcjonalności, pozostając
-przy tym szybki i lekki. Cel ten został osiągnięty dzięki wbudowaniu w
-program języka skryptowego lua. Awesome został zaprojektowany z myślą
-o bardziej zaawansowanych użytkonikach: programistach oraz innych
-ludziach pracujących na codzień z komputerami, którzy chcą mieć dużą
+awesome jest zarządcą okien charakteryzującym się bardzo dużymi
+możliwościami konfiguracji i rozszerzania funkcjonalności, pozostając
+przy tym szybkim i lekkim. Cel ten został osiągnięty dzięki wbudowaniu
+w program języka skryptowego lua. Awesome został zaprojektowany z
+myślą o bardziej zaawansowanych użytkownikach: programistach oraz
+innych pracujących na co dzień z komputerami, którzy chcą mieć dużą
 kontrolę nad swoim środowiskiem graficznym.
 
+%package client
+Summary:	awesome window manager command line client
+Summary(hu.UTF-8):	Parancssoros kliens az awesome ablakkezelőhöz
+Summary(pl.UTF-8):	Klient zarządcy okien awesome
+Group:		X11/Window Managers/Tools
+Requires:	dbus
+Requires:	rlwrap
+
+%description client
+awesome-client is command line utility (in fact shell script) for
+executing an arbitrary lua code in working awesome window manager
+instance.
+
+%description client -l hu.UTF-8
+awesome-client egy parancssoros eszköz (lényegében egy shell script)
+tetszőleges lua kód futtatásához egy működő awesome ablakkezelőben.
+
+%description client -l pl.UTF-8
+awesome-client to skrypt powłoki pozwalający wykonać dowolny kod lua w
+działającej instancji zarządcy okien awesome.
+
 %package doc
 Summary:	awesome window manager API documentation
 Summary(hu.UTF-8):	awesome ablakkezelő API dokumentációja
 Summary(pl.UTF-8):	Dokumentacja API awesome
-Group:		X11/Window Managers
+Group:		Documentation
 
 %description doc
 awesome window manager API documentation.
@@ -76,70 +111,37 @@ awesome window manager API documentation.
 awesome ablakkezelő API dokumentációja.
 
 %description doc -l pl.UTF-8
-Dokumentacja API menedżera okien awesome.
+Dokumentacja API zarządcy okien awesome.
 
 %package example-config
 Summary:	Example config for awesome window manager
 Summary(hu.UTF-8):	Egy alap/példa konfig az awesome ablakkezelőhöz
-Group:		X11/Window Managers
-Requires:	awesome-plugin-awful
-Requires:	awesome-plugin-beautiful
-Requires:	awesome-plugin-tabulous
+Summary(pl.UTF-8):	Przykładowy plik konfiguracyjny dla zarządcy okien awesome
+Group:		Documentation
+Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-themes-default = %{version}-%{release}
 
 %description example-config
-Example config for awesome window manager. If you never used before
-awesome 3.x window manager, it can be a good starting point.
+Example config for awesome window manager. It can be a good starting
+point for those people, who have never used awesome window manager
+before.
 
 %description example-config -l hu.UTF-8
 Egy alap/példa konfig az awesome ablakkezelőhöz. Ha még sose
 használtál awesome 3.x ablakkezelőt, jó kiindulópont lehet.
 
-%package plugin-awful
-Summary:	awful plugin for awesome window manager
-Summary(hu.UTF-8):	awful plugin az awesome ablakkezelőhöz
-Group:		X11/Window Managers
-
-%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
-
-%package plugin-beautiful
-Summary:	theme library for awesome window manager
-Summary(hu.UTF-8):	theme könyvtár az awesome ablakkezelőhöz
-Group:		X11/Window Managers
-Requires:	Esetroot
-Requires:	habak
-
-%description plugin-beautiful
-Theme library for awesome window manager
-
-%description plugin-beautiful
-Theme könyvtár az awesome ablakkezelőhöz
-
-%package plugin-invaders
-Summary:	Awesome Invaders game
-Summary(hu.UTF-8):	Awesome Invaders játék
-Group:		X11/Window Managers
-Requires:	%{name}-plugin-awful
-Requires:	%{name}-plugin-beautiful
-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 example-config -l pl.UTF-8
+Przykładowy plik konfiguracyjny dla zarządcy okien awesome. Ten plik
+jest dobrym punktem wyjścia dla osób nie używających wcześniej awesome
+3.x.
 
 %package plugin-naughty
-Summary:	Naughty is a lua library that implements popup notifications for awesome3
+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
-Group:		X11/Window Managers
-Requires:	%{name}-plugin-awful
-Requires:	%{name}-plugin-beautiful
+Summary(pl.UTF-8):	Powiadomienia w postaci wyskakujących okienek dla awesome 3
+Group:		X11/Window Managers/Tools
+Requires:	%{name} = %{version}-%{release}
+Provides:	dbus(org.freedesktop.Notifications)
 
 %description plugin-naughty
 Naughty is a lua library that implements popup notifications for
@@ -149,38 +151,82 @@ awesome3.
 Naughty egy lua-könyvtár, amely felugró értesítéseket tesz lehetővé
 awesome3-ban.
 
-%package plugin-revelation
-Summary:	Revelation brings up a view of all your open clients
-Summary(hu.UTF-8):	Revelation egy nézetet hoz létre az összes megnyitott kliensről
-Group:		X11/Window Managers
+%description plugin-naughty -l pl.UTF-8
+Biblioteka lua dla zarządcy okien awesome 3 implementująca
+powiadomienia w formie wyskakujących okienek.
 
-%description plugin-revelation
-Revelation brings up a view of all your open clients; left-clicking a
-client pops to the first tag that client is visible on and
-raises/focuses the client. In addition, the Enter key pops to the
-currently focused client, and Escape aborts.
-
-%description plugin-revelation -l hu.UTF-8
-Revelation egy nézetet hoz létre az összes megnyitott kliensről; egy
-kliensre bal gombbal kattintva az első olyan cimkére ugorhatsz, ahol a
-kliens látható, és fókuszba hozza a klienst. Az Enter billentyűre a
-fókuszban levő kliensre ugrik, és az Escape billentyűvel megszakítható
-a művelet.
-
-%package plugin-tabulous
-Summary:	Fabulous tabs for awesome
-Summary(hu.UTF-8):	Tab-ok awesome-hoz
-Group:		X11/Window Managers
+%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):	Motywy dla zarządcy okien awesome
+Group:		X11/Window Managers/Tools
+Requires:	%{name}-themes-default = %{version}-%{release}
+Requires:	%{name}-themes-sky = %{version}-%{release}
+Requires:	%{name}-themes-zenburn = %{version}-%{release}
+
+%description themes
+Themes for awesome window manager (metapackage).
+
+%description themes -l hu.UTF-8
+Témák az awesome ablakkezelőhöz (metacsomag).
+
+%description themes -l pl.UTF-8
+Dodatkowe motywy (definicje wyglądu) zarządcy okien awesome.
+
+%package themes-default
+Summary:	Default theme for awesome window manager
+Summary(hu.UTF-8):	Alapértelmezett téma az awesome ablakkezelőhöz
+Summary(pl.UTF-8):	Domyślny motyw dla zarządcy okien awesome
+Group:		X11/Window Managers/Tools
+Requires:	%{name} = %{version}-%{release}
+
+%description themes-default
+Default theme for awesome window manager.
+
+%description themes-default -l hu.UTF-8
+Alapértelmezett téma az awesome ablakkezelőhöz.
 
-%description plugin-tabulous
-Fabulous tabs for awesome
+%description themes-default -l pl.UTF-8
+Domyślny motyw dla zarządcy okien awesome.
 
-%description plugin-tabulous -l hu.UTF-8
-Tab-ok awesome-hoz
+%package themes-sky
+Summary:	Sky theme for awesome window manager
+Summary(hu.UTF-8):	Sky téma az awesome ablakkezelőhöz
+Summary(pl.UTF-8):	Motyw Sky dla zarządcy okien awesome
+Group:		X11/Window Managers/Tools
+Requires:	%{name} = %{version}-%{release}
+
+%description themes-sky
+Sky theme for awesome window manager.
+
+%description themes-sky -l hu.UTF-8
+Sky téma az awesome ablakkezelőhöz.
+
+%description themes-sky -l pl.UTF-8
+Motyw Sky dla 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
+Summary(pl.UTF-8):	Motyw Zenburn dla zarządcy okien awesome
+Group:		X11/Window Managers/Tools
+Requires:	%{name} = %{version}-%{release}
+
+%description themes-zenburn
+Zenburn theme for awesome window manager.
+
+%description themes-zenburn -l hu.UTF-8
+Zenburn téma az awesome ablakkezelőhöz.
+
+%description themes-zenburn -l pl.UTF-8
+Motyw Zenburn dla zarządcy okien awesome.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+# %patch2 -p1
+# %patch3 -p1
 
 %build
 %cmake \
@@ -193,69 +239,99 @@ Tab-ok awesome-hoz
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_docdir}/%{name}-doc-%{version}}
+install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_docdir}/%{name}-%{version}}
+install AUTHORS BUGS README STYLE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
 
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/luadoc $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}/luadoc
+for file in $(%{__find} $RPM_BUILD_ROOT%{_datadir}/%{name} -iname "*.in"); do
+	%{__rm} ${file}
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc %{_docdir}/%{name}-%{version}
+%exclude %{_docdir}/%{name}-%{version}/luadoc
 %attr(755,root,root) %{_bindir}/%{name}
-%attr(755,root,root) %{_bindir}/%{name}-client
 %attr(755,root,root) %{_bindir}/awsetbg
-%dir %{_datadir}/%{name}/lib
-%{_datadir}/%{name}/lib/capi.lua
 %dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/icons
-%dir %{_datadir}/%{name}/icons
+%dir %{_datadir}/%{name}/lib
 %{_datadir}/%{name}/icons
 %{_datadir}/xsessions/%{name}.desktop
-%{_mandir}/man1/%{name}*
-%{_mandir}/man1/awsetbg*
-%{_mandir}/man5/%{name}*
-%doc AUTHORS BUGS README STYLE
 
-%files doc
+%{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/awsetbg.1*
+%{_mandir}/man5/awesomerc.5*
+# de
+%lang(de) %{_mandir}/de/man1/awesome.1*
+%lang(de) %{_mandir}/de/man1/awsetbg.1*
+%lang(de) %{_mandir}/de/man5/awesomerc.5*
+# es
+%lang(es) %{_mandir}/es/man1/awesome.1*
+%lang(es) %{_mandir}/es/man1/awsetbg.1*
+%lang(es) %{_mandir}/es/man5/awesomerc.5*
+# fr
+%lang(fr) %{_mandir}/fr/man1/awesome.1*
+%lang(fr) %{_mandir}/fr/man1/awsetbg.1*
+%lang(fr) %{_mandir}/fr/man5/awesomerc.5*
+# it
+%lang(it) %{_mandir}/it/man1/awesome.1*
+%lang(it) %{_mandir}/it/man1/awsetbg.1*
+%lang(it) %{_mandir}/it/man5/awesomerc.5*
+# ru
+%lang(ru) %{_mandir}/ru/man1/awesome.1*
+%lang(ru) %{_mandir}/ru/man1/awsetbg.1*
+%lang(ru) %{_mandir}/ru/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)
-%{_docdir}/%{name}-doc-%{version}
+%attr(755,root,root) %{_bindir}/%{name}-client
+%{_mandir}/man1/%{name}-client.1*
+%lang(de) %{_mandir}/de/man1/awesome-client.1*
+%lang(es) %{_mandir}/es/man1/awesome-client.1*
+%lang(fr) %{_mandir}/fr/man1/awesome-client.1*
+%lang(it) %{_mandir}/it/man1/awesome-client.1*
+%lang(ru) %{_mandir}/ru/man1/awesome-client.1*
 
-%files example-config
+%files doc
 %defattr(644,root,root,755)
-%dir %{_sysconfdir}/xdg
-%dir %{_sysconfdir}/xdg/awesome
-%{_sysconfdir}/xdg/awesome/*
+%doc %{_docdir}/%{name}-%{version}/luadoc
 
-%files plugin-awful
+%files example-config
 %defattr(644,root,root,755)
-%dir %{_datadir}/awesome/lib/awful
-%{_datadir}/awesome/lib/awful/*.lua
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/awesome
 
-%files plugin-beautiful
+%files themes
 %defattr(644,root,root,755)
-%dir %{_datadir}/awesome/themes/*
-%{_datadir}/awesome/lib/beautiful.lua
-%{_datadir}/awesome/themes
 
-%files plugin-invaders
+%files themes-default
 %defattr(644,root,root,755)
-%{_datadir}/awesome/lib/invaders.lua
-%dir %{_datadir}/awesome/icons/invaders
-%{_datadir}/awesome/icons/invaders/*.png
+%{_datadir}/awesome/themes/default
 
-%files plugin-naughty
+%files themes-sky
 %defattr(644,root,root,755)
-%{_datadir}/awesome/lib/naughty.lua
+%{_datadir}/awesome/themes/sky
 
-%files plugin-revelation
+%files themes-zenburn
 %defattr(644,root,root,755)
-%{_datadir}/awesome/lib/revelation.lua
+%{_datadir}/awesome/themes/zenburn
 
-%files plugin-tabulous
+%files plugin-naughty
 %defattr(644,root,root,755)
-%{_datadir}/awesome/lib/tabulous.lua
+%{_datadir}/awesome/lib/naughty.lua