X-Git-Url: https://git.pld-linux.org/?p=packages%2Fawesome.git;a=blobdiff_plain;f=awesome.spec;h=f8bb350c07e90d512551fb14ce7d0d43662d2666;hp=7b8e4fbdcbb5ab7b1e70b841aaaa4ad8e00f3df0;hb=e8a472705e02970bd708568243420aa0bc1c3820;hpb=cbe1475682ff93cbfef90c3b03d8f71c422b22fc

diff --git a/awesome.spec b/awesome.spec
index 7b8e4fb..f8bb350 100644
--- a/awesome.spec
+++ b/awesome.spec
@@ -2,15 +2,17 @@ Summary:	awesome window manager
 Summary(hu.UTF-8):	awesome ablakkezelő
 Summary(pl.UTF-8):	Zarządca okien X - Awesome
 Name:		awesome
-Version:	3.2.1
-Release:	1
+Version:	3.3.1
+Release:	3
 License:	GPL v2
 Group:		X11/Window Managers
 Source0:	http://awesome.naquadah.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	9bae1fface6b4cbbcd4380066845269f
+# Source0-md5:	4d3508b7c72bedc38cab4b6f9d2f68cf
 Source1:	%{name}-xsession.desktop
 Patch0:		%{name}-3.0-lua-files.patch
+Patch1:		%{name}-client-bashizm.patch
 URL:		http://awesome.naquadah.org/
+BuildRequires:	ImageMagick-coder-png
 BuildRequires:	asciidoc
 BuildRequires:	cairo-devel
 BuildRequires:	cmake >= 2.6
@@ -21,6 +23,7 @@ BuildRequires:	glib2-devel
 BuildRequires:	gperf
 BuildRequires:	imlib2-devel
 BuildRequires:	libev-devel
+BuildRequires:	libxdg-basedir-devel >= 1.0.1
 BuildRequires:	lua-doc
 BuildRequires:	lua51-devel
 BuildRequires:	pango-devel
@@ -28,13 +31,17 @@ BuildRequires:	pkgconfig >= 0.9.0
 BuildRequires:	readline-devel
 BuildRequires:	rpmbuild(macros) >= 1.293
 BuildRequires:	sed >= 4.0
-BuildRequires:	xcb-util-devel >= 0.3.3
+BuildRequires:	startup-notification-devel >= 0.10
+BuildRequires:	xcb-util-devel >= 0.3.5
 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}
+Requires:	startup-notification >= 0.10
+Requires:	xcb-util >= 0.3.5
 Suggests:	%{name}-plugin-awful = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -63,6 +70,27 @@ myślą o bardziej zaawansowanych użytkownikach: programistach oraz
 innych pracujących na codzień 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
@@ -107,7 +135,7 @@ jest dobrym punktem wyjścia dla osób nie używających wcześniej awesome
 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
+Group:		X11/Window Managers/Tools
 Requires:	%{name} = %{version}-%{release}
 
 %description plugin-awful
@@ -125,7 +153,7 @@ awesome.
 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
+Group:		X11/Window Managers/Tools
 Requires:	%{name} = %{version}-%{release}
 Suggests:	WallpaperChanger
 
@@ -142,7 +170,7 @@ Biblioteka styli dla zarządcy okien awesome.
 Summary:	Awesome Invaders game
 Summary(hu.UTF-8):	Awesome Invaders játék
 Summary(pl.UTF-8):	Gra Awesome Invaders
-Group:		X11/Window Managers
+Group:		X11/Window Managers/Tools
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-plugin-awful = %{version}-%{release}
 Requires:	%{name}-plugin-beautiful = %{version}-%{release}
@@ -164,10 +192,11 @@ Lua zarządcy okien awesome 3.
 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
+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
 Naughty is a lua library that implements popup notifications for
@@ -181,38 +210,11 @@ awesome3-ban.
 Biblioteka lua dla zarządcy okien awesome 3 implementująca
 powiadomienia w formie wyskakujących okienek.
 
-%package plugin-revelation
-Summary:	Plugin that allows to bring a view of all your open clients
-Summary(hu.UTF-8):	Revelation egy nézetet hoz létre az összes megnyitott kliensről
-Summary(pl.UTF-8):	Wtyczka do awesome 3 dająca widok wszystkich otwartych okien
-Group:		X11/Window Managers
-Requires:	%{name} = %{version}-%{release}
-
-%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.
-
-%description plugin-revelation -l pl.UTF-8
-Revelation umożliwia podgląd wszystkich otwartych okien. Kliknięcie
-prawym przyciskiem myszy na okienko przełącza na pierwszy znacznik, na
-którym okno jest widoczne i przywołuje okno na pierwszy plan.
-Dodatkowo klawisz Enter przełącza fokus mięszy oknami a klawisz Esc
-przerywa podgląd okien.
-
 %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
-Group:		X11/Window Managers
+Group:		X11/Window Managers/Tools
 Requires:	%{name} = %{version}-%{release}
 
 %description plugin-tabulous
@@ -227,7 +229,8 @@ Zakładki 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
-Group:		X11/Window Managers
+Summary(pl.UTF-8):	Biblioteka pozwlająca ustawić tapetę w głównym oknie
+Group:		X11/Window Managers/Tools
 Requires:	%{name} = %{version}-%{release}
 Requires:	lua-socket
 
@@ -237,10 +240,14 @@ Root window image display library.
 %description plugin-telak -l hu.UTF-8
 Root ablak kezeléséhez könyvtár.
 
+%description plugin-telak -l pl.UTF-8
+Biblioteka pozwalająca ustawić tapetę wyświetlaną na głównym oknie.
+
 %package themes
 Summary:	Themes for awesome window manager
 Summary(hu.UTF-8):	Témák az awesome ablakkezelőhöz
-Group:		X11/Window Managers
+Summary(pl.UTF-8):	Tematy dla zarządcy okien awesome
+Group:		X11/Window Managers/Tools
 Requires:	%{name} = %{version}-%{release}
 
 %description themes
@@ -249,9 +256,13 @@ Themes for awesome window manager.
 %description themes -l hu.UTF-8
 Témák az awesome ablakkezelőhöz.
 
+%description themes -l pl.UTF-8
+Dodatkowe "tematy" (definicje wyglądu) zarządcy okien awesome.
+
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %cmake \
@@ -264,13 +275,13 @@ Témák az awesome ablakkezelőhöz.
 
 %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
@@ -280,22 +291,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS README STYLE
+%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}
 %dir %{_datadir}/%{name}/lib
 %{_datadir}/%{name}/lib/capi.lua
-%dir %{_datadir}/%{name}
 %{_datadir}/%{name}/icons
 %{_datadir}/xsessions/%{name}.desktop
-%{_mandir}/man1/%{name}*
-%{_mandir}/man1/awsetbg*
-%{_mandir}/man5/%{name}*
+%{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/awsetbg.1*
+%{_mandir}/man5/awesomerc.5*
+
+%files client
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/%{name}-client
+%{_mandir}/man1/%{name}-client.1*
 
 %files doc
 %defattr(644,root,root,755)
-%{_docdir}/%{name}-doc-%{version}
+%doc %{_docdir}/%{name}-%{version}/luadoc
 
 %files example-config
 %defattr(644,root,root,755)
@@ -308,6 +324,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/awesome/lib/awful
 %{_datadir}/awesome/lib/awful/*.lua
 %{_datadir}/awesome/lib/awful/layout
+%{_datadir}/awesome/lib/awful/widget
 
 %files plugin-beautiful
 %defattr(644,root,root,755)
@@ -330,10 +347,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_datadir}/awesome/lib/naughty.lua
 
-# %files plugin-revelation
-# %defattr(644,root,root,755)
-# %{_datadir}/awesome/lib/revelation.lua
-
 %files plugin-tabulous
 %defattr(644,root,root,755)
 %{_datadir}/awesome/lib/tabulous.lua