X-Git-Url: https://git.pld-linux.org/?p=packages%2Fawesome.git;a=blobdiff_plain;f=awesome.spec;h=cb8638a8862c1110e82db8c42b04856234006449;hp=3597aad0aa61a649284507c5889f134e6d03d475;hb=f9e570df29091baf6dd92b0e57a830a3e380934e;hpb=8fccf021a2eb11f6bfc1c19846a7c54b79d8c7c0

diff --git a/awesome.spec b/awesome.spec
index 3597aad..cb8638a 100644
--- a/awesome.spec
+++ b/awesome.spec
@@ -3,12 +3,12 @@ Summary:	awesome window manager
 Summary(hu.UTF-8):	awesome ablakkezelő
 Summary(pl.UTF-8):	Zarządca okien X - Awesome
 Name:		awesome
-Version:	3.4
-Release:	1
+Version:	3.4.4
+Release:	2
 License:	GPL v2
 Group:		X11/Window Managers
 Source0:	http://awesome.naquadah.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	2c4cba2fb7a791c77d17506e51067155
+# Source0-md5:	8c2537ad898d7f58a0f3ba92e6a561a1
 Source1:	%{name}-xsession.desktop
 Patch0:		%{name}-3.0-lua-files.patch
 Patch1:		%{name}-xmlto.patch
@@ -19,8 +19,7 @@ BuildRequires:	asciidoc
 BuildRequires:	cairo-devel
 BuildRequires:	cmake >= 2.6
 BuildRequires:	dbus-devel
-BuildRequires:	doxygen
-BuildRequires:	glib-devel
+BuildRequires:	docbook-dtd45-xml
 BuildRequires:	glib2-devel
 BuildRequires:	gperf
 BuildRequires:	imlib2-devel
@@ -35,13 +34,10 @@ BuildRequires:	readline-devel
 BuildRequires:	rpmbuild(macros) >= 1.293
 BuildRequires:	sed >= 4.0
 BuildRequires:	startup-notification-devel >= 0.10
+BuildRequires:	which
 BuildRequires:	xcb-util-devel >= 0.3.6
 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:	startup-notification >= 0.10
 Requires:	xcb-util >= 0.3.6
@@ -51,8 +47,6 @@ Obsoletes:	awesome-plugin-awful
 Obsoletes:	awesome-plugin-beautiful
 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
@@ -118,7 +112,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}-themes = %{version}-%{release}
+Requires:	%{name}-themes-default = %{version}-%{release}
 
 %description example-config
 Example config for awesome window manager. It can be a good starting
@@ -159,7 +153,6 @@ 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}
@@ -177,6 +170,7 @@ Dodatkowe "tematy" (definicje wyglądu) zarządcy okien awesome.
 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}
 
 %description themes-default
 Default theme for awesome window manager.
@@ -188,6 +182,7 @@ Alapértelmezett téma az awesome ablakkezelőhöz.
 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-sky
 Sky theme for awesome window manager.
@@ -199,6 +194,7 @@ Sky téma az awesome ablakkezelőhöz.
 Summary:	Zenburn theme for awesome window manager
 Summary(hu.UTF-8):	Zenburn téma az awesome ablakkezelőhöz
 Group:		X11/Window Managers/Tools
+Requires:	%{name} = %{version}-%{release}
 
 %description themes-zenburn
 Zenburn theme for awesome window manager.
@@ -207,7 +203,7 @@ Zenburn theme for awesome window manager.
 Zenburn téma az awesome ablakkezelőhöz.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -273,9 +269,7 @@ 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 themes
 %defattr(644,root,root,755)