X-Git-Url: https://git.pld-linux.org/?p=packages%2Fawesome.git;a=blobdiff_plain;f=awesome.spec;h=bc6d556db590c65e9f12a2d2808a2f5a4ee50dff;hp=6be3d91f043931ed47479cb1648ad14daaa65eea;hb=3d00bab1c4eecad337576c32d8f33a8cf0946feb;hpb=ba2b0e1c60424c3beea7c96f5de55614174c8636

diff --git a/awesome.spec b/awesome.spec
index 6be3d91..bc6d556 100644
--- a/awesome.spec
+++ b/awesome.spec
@@ -1,25 +1,30 @@
-## Todo: lua-doc
-%define _MainVersion 3.0
-%define _RC rc6
+# TODO
+# - lua-doc: spec file is created - OK
+# - add luadoc and doxygen to BRs
+# - move the generated html files (with luadoc) to correct place
+# - split two subpackage: awesome and awesome-doc (htmls)
+# - correct xsession.desktop file to appear in *dm
+%define	subver	rc6
+%define	rel		2
 Summary:	Awesome Window Manager
 Summary(hu.UTF-8):	awesome ablakkezelő
 Summary(pl.UTF-8):	Zarządca okien X - Awesome
 Name:		awesome
-Version:	%{_MainVersion}%{_RC}
-Release:	0.1
+Version:	3.0
+Release:	1
 License:	GPL v2
 Group:		X11/Window Managers
-Source0:	http://awesome.naquadah.org/download/%{name}-%{_MainVersion}-%{_RC}.tar.bz2
+Source0:	http://awesome.naquadah.org/download/%{name}-%{version}.tar.bz2
+# Source0-md5:	32bb9e94a63f421a7a8500f1041b6add
 Source1:	%{name}-xsession.desktop
-Patch0:		%{name}-lua-files.patch
-# Source0-md5:	cc5588184a3f77f21af3deb5180f704f
+Patch0:		%{name}-3.0-lua-files.patch
 URL:		http://awesome.naquadah.org
-# BuildRequires:	luadoc - this is very difficult, because of luadoc reqs :(
+# BuildRequires:	luadoc - it's ready but need to build luadoc (it exists in SPEC-file)
 BuildRequires:	asciidoc
 BuildRequires:	cairo-devel
 BuildRequires:	cmake >= 2.6
 BuildRequires:	dbus-devel
-# doxygen required when build source code reference, but without luadoc...
+# doxygen required when build source code reference - see TODO
 # BuildRequires:	doxygen
 BuildRequires:	gdk-pixbuf-devel
 BuildRequires:	gperf
@@ -28,8 +33,9 @@ BuildRequires:	lua51
 BuildRequires:	lua51-devel
 BuildRequires:	pango-devel
 BuildRequires:	pkgconfig >= 0.9.0
+BuildRequires:	rpmbuild(macros) >= 1.293
 BuildRequires:	sed >= 4.0
-BuildRequires:	xcb-util-devel >= 0.2.1
+BuildRequires:	xcb-util-devel >= 0.3
 BuildRequires:	xmlto
 BuildRequires:	xorg-lib-libICE-devel
 BuildRequires:	xorg-lib-libXext-devel
@@ -38,7 +44,7 @@ BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXrandr-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%{expand:%%define	_sysconfdir	%{_sysconfdir}/X11}
+%define		_sysconfdir	/etc/X11
 
 %description
 awesome is a highly configurable, next generation framework window
@@ -55,11 +61,16 @@ számítógéppel dolgozik és teljeskörű irányítást akar a grafikus
 felületén.
 
 %prep
-%setup -q -n %{name}-%{_MainVersion}-%{_RC}
+%setup -q
 %patch0 -p1
 
 %build
-cmake -DLUA_INC_DIR=%{_includedir}/lua51/ -DPREFIX=%{_prefix} -DAWESOME_DOC_PATH=%{_docdir}/%{name}-%{version} -DAWESOME_DATA_PATH=%{_datadir}/%{name} -DSYSCONFDIR=%{_sysconfdir}
+%cmake \
+	-DLUA_INC_DIR=%{_includedir}/lua51 \
+	-DPREFIX=%{_prefix} \
+	-DAWESOME_DOC_PATH=%{_docdir}/%{name}-%{version} \
+	-DAWESOME_DATA_PATH=%{_datadir}/%{name} \
+	-DSYSCONFDIR=%{_sysconfdir}
 %{__make}
 
 %install
@@ -83,6 +94,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xsessions/%{name}.desktop
 %{_mandir}/man1/%{name}*
 %{_mandir}/man5/%{name}*
+# XXX shouldn't this dir be in filesystem or xorg packages?
 %dir %{_sysconfdir}/xdg
 %dir %{_sysconfdir}/xdg/awesome
 %{_sysconfdir}/xdg/awesome/*