X-Git-Url: https://git.pld-linux.org/?p=packages%2Fawesome.git;a=blobdiff_plain;f=awesome.spec;h=6fb979c8275ca1b43e74b4d9b260d6bd8559717b;hp=2607f388fb0494c723d3ca090e00c13014daf6ba;hb=4e24a21049929e90de9ad85dff8d48fe815e9a68;hpb=b6bb55761c6ee597f96dd80372b222822133aca5

diff --git a/awesome.spec b/awesome.spec
index 2607f38..6fb979c 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.1.1
-Release:	1
+Version:	3.3
+Release:	5
 License:	GPL v2
 Group:		X11/Window Managers
 Source0:	http://awesome.naquadah.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	98de84b418c7646ae4c4aa44c3e6e149
+# Source0-md5:	0dc5574dc551c6356d8cddc6ce91739c
 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,19 @@ 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:	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:	dbus
+Requires:	rlwrap
+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)
 
 %define		_sysconfdir	/etc/X11
@@ -66,7 +75,7 @@ kontrolę nad swoim środowiskiem graficznym.
 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.
@@ -81,14 +90,17 @@ Dokumentacja API zarządcy okien awesome.
 Summary:	Example config for awesome window manager
 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:		X11/Window Managers
-Requires:	awesome-plugin-awful = %{version}-%{release}
-Requires:	awesome-plugin-beautiful = %{version}-%{release}
-Requires:	awesome-plugin-tabulous = %{version}-%{release}
+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
-Example config for awesome window manager. If you had never used
-awesome 3.x window manager before, 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
@@ -96,14 +108,15 @@ használtál awesome 3.x ablakkezelőt, jó kiindulópont lehet.
 
 %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.
+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
+Requires:	%{name} = %{version}-%{release}
 
 %description plugin-awful
 AWesome Functions very UsefuL: awful plugin for awesome window
@@ -121,6 +134,7 @@ 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
+Requires:	%{name} = %{version}-%{release}
 Suggests:	WallpaperChanger
 
 %description plugin-beautiful
@@ -137,6 +151,7 @@ Summary:	Awesome Invaders game
 Summary(hu.UTF-8):	Awesome Invaders játék
 Summary(pl.UTF-8):	Gra Awesome Invaders
 Group:		X11/Window Managers
+Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-plugin-awful = %{version}-%{release}
 Requires:	%{name}-plugin-beautiful = %{version}-%{release}
 Requires:	ImageMagick
@@ -158,6 +173,7 @@ Summary:	Naughty is a lua library that implements popup notifications for awesom
 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
+Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-plugin-awful = %{version}-%{release}
 Requires:	%{name}-plugin-beautiful = %{version}-%{release}
 
@@ -173,37 +189,12 @@ 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
-
-%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
+Requires:	%{name} = %{version}-%{release}
 
 %description plugin-tabulous
 Fabulous tabs for awesome.
@@ -214,9 +205,43 @@ Tab-ok awesome-hoz.
 %description plugin-tabulous -l pl.UTF-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
+Summary(pl.UTF-8):	Biblioteka pozwlająca ustawić tapetę w głównym oknie
+Group:		X11/Window Managers
+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 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
+Summary(pl.UTF-8):	Tematy dla zarządcy okien awesome
+Group:		X11/Window Managers
+Requires:	%{name} = %{version}-%{release}
+
+%description themes
+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 \
@@ -229,28 +254,30 @@ Zakładki dla zarządcy okien awesome.
 
 %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 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}/lib
 %{_datadir}/%{name}/lib/capi.lua
 %dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/icons
-%dir %{_datadir}/%{name}/icons
 %{_datadir}/%{name}/icons
 %{_datadir}/xsessions/%{name}.desktop
 %{_mandir}/man1/%{name}*
@@ -259,7 +286,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(644,root,root,755)
-%{_docdir}/%{name}-doc-%{version}
+%doc %{_docdir}/%{name}-%{version}/luadoc
 
 %files example-config
 %defattr(644,root,root,755)
@@ -271,13 +298,20 @@ rm -rf $RPM_BUILD_ROOT
 %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
 %defattr(644,root,root,755)
-%dir %{_datadir}/awesome/themes/*
 %{_datadir}/awesome/lib/beautiful.lua
 %{_datadir}/awesome/themes
 
+%files themes
+%defattr(644,root,root,755)
+%dir %{_datadir}/awesome/themes
+%{_datadir}/awesome/themes/default
+%{_datadir}/awesome/themes/sky
+
 %files plugin-invaders
 %defattr(644,root,root,755)
 %{_datadir}/awesome/lib/invaders.lua
@@ -288,10 +322,10 @@ 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
+
+%files plugin-telak
+%defattr(644,root,root,755)
+%{_datadir}/awesome/lib/telak.lua