X-Git-Url: https://git.pld-linux.org/?p=packages%2Fawesome.git;a=blobdiff_plain;f=awesome.spec;h=f7d3732d42d84cc2d2a06e97d36a40c2230204d1;hp=8b16bbb7caccfd48de78ebc54f3727fdfb143951;hb=HEAD;hpb=dc71363eb2095d319364cb3821ed34eaed2154ff

diff --git a/awesome.spec b/awesome.spec
index 8b16bbb..f7d3732 100644
--- a/awesome.spec
+++ b/awesome.spec
@@ -1,52 +1,59 @@
+
 Summary:	awesome window manager
 Summary(hu.UTF-8):	awesome ablakkezelő
 Summary(pl.UTF-8):	Zarządca okien X - Awesome
 Name:		awesome
-Version:	3.3.3
-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:	528e059e77655bd28f259b1379412a1e
+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}-client-bashizm.patch
-Patch2:		%{name}-xmlto.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:	startup-notification-devel >= 0.10
-BuildRequires:	xcb-util-devel >= 0.3.6
+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
-Requires:	%{name}-client = %{version}-%{release}
+BuildRequires:	xorg-proto-xproto-devel >= 7.0.15
+Requires:	pango >= 1:1.19.3
 Requires:	startup-notification >= 0.10
-Requires:	xcb-util >= 0.3.5
+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
@@ -67,7 +74,7 @@ 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 codzień z komputerami, którzy chcą mieć dużą
+innych pracujących na co dzień z komputerami, którzy chcą mieć dużą
 kontrolę nad swoim środowiskiem graficznym.
 
 %package client
@@ -112,10 +119,7 @@ Summary(hu.UTF-8):	Egy alap/példa konfig az awesome ablakkezelőhöz
 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}
+Requires:	%{name}-themes-default = %{version}-%{release}
 
 %description example-config
 Example config for awesome window manager. It can be a good starting
@@ -131,71 +135,12 @@ 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-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
@@ -210,60 +155,78 @@ awesome3-ban.
 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):	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 plugin-tabulous
-Fabulous tabs for awesome.
+%description themes-default
+Default theme for awesome window manager.
 
-%description plugin-tabulous -l hu.UTF-8
-Tab-ok awesome-hoz.
+%description themes-default -l hu.UTF-8
+Alapértelmezett téma az awesome ablakkezelőhöz.
 
-%description plugin-tabulous -l pl.UTF-8
-Zakładki dla zarządcy okien awesome.
+%description themes-default -l pl.UTF-8
+Domyślny motyw dla 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-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}
-Requires:	lua-socket
 
-%description plugin-telak
-Root window image display library.
+%description themes-sky
+Sky theme for awesome window manager.
 
-%description plugin-telak -l hu.UTF-8
-Root ablak kezeléséhez könyvtár.
+%description themes-sky -l hu.UTF-8
+Sky téma az awesome ablakkezelőhöz.
 
-%description plugin-telak -l pl.UTF-8
-Biblioteka pozwalająca ustawić tapetę wyświetlaną na głównym oknie.
+%description themes-sky -l pl.UTF-8
+Motyw Sky dla zarządcy okien awesome.
 
-%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-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
-Themes for awesome window manager.
+%description themes-zenburn
+Zenburn theme for awesome window manager.
 
-%description themes -l hu.UTF-8
-Témák az awesome ablakkezelőhöz.
+%description themes-zenburn -l hu.UTF-8
+Zenburn téma az awesome ablakkezelőhöz.
 
-%description themes -l pl.UTF-8
-Dodatkowe "tematy" (definicje wyglądu) zarządcy okien awesome.
+%description themes-zenburn -l pl.UTF-8
+Motyw Zenburn dla zarządcy okien awesome.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+# %patch2 -p1
+# %patch3 -p1
 
 %build
 %cmake \
@@ -298,17 +261,53 @@ rm -rf $RPM_BUILD_ROOT
 %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*
+# 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)
 %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 doc
 %defattr(644,root,root,755)
@@ -316,42 +315,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files example-config
 %defattr(644,root,root,755)
-%dir %{_sysconfdir}/xdg
-%dir %{_sysconfdir}/xdg/awesome
-%{_sysconfdir}/xdg/awesome/*
+%config(noreplace) %verify(not md5 mtime size) %{_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