X-Git-Url: https://git.pld-linux.org/?p=packages%2Fawesome.git;a=blobdiff_plain;f=awesome.spec;h=3d260097502af5e486ef3131892262eaeda008eb;hp=8fe72d31565ed60a307109b669ff8cb4cd82513d;hb=e519f8ede0d21821966b661231c4ab34b28482dc;hpb=8e78d678cf88be4e0396ca44f0816fa6e4fdf550

diff --git a/awesome.spec b/awesome.spec
index 8fe72d3..3d26009 100644
--- a/awesome.spec
+++ b/awesome.spec
@@ -1,35 +1,36 @@
-## Todo: lua-doc
-%define _MainVersion 3.0
-%define _RC rc6
+# TODO
+# - 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:	1
+Version:	3.0
+Release:	2
 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:	asciidoc
 BuildRequires:	cairo-devel
 BuildRequires:	cmake >= 2.6
 BuildRequires:	dbus-devel
-# doxygen required when build source code reference, but without luadoc...
-# BuildRequires:	doxygen
+BuildRequires:	doxygen
 BuildRequires:	gdk-pixbuf-devel
 BuildRequires:	gperf
 BuildRequires:	libev-devel
+BuildRequires:	lua-doc
 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 +39,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
@@ -54,12 +55,29 @@ célközönség a "power user"-ek, fejlesztők és bárki, aki minden nap
 számítógéppel dolgozik és teljeskörű irányítást akar a grafikus
 felületén.
 
+%package doc
+Summary:	awesome window manager API documentation
+Summary(hu.UTF-8):	awesome ablakkezelő API dokumentációja
+Group:		X11/Window Managers
+
+%description doc
+awesome window manager API documentation
+
+%description doc -l hu.UTF-8
+awesome ablakkezelő API dokumentációja
+
+
 %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
@@ -69,13 +87,15 @@ install -d $RPM_BUILD_ROOT%{_datadir}/xsessions
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
+install AUTHORS LICENSE README STYLE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS LICENSE README STYLE
+%dir %{_docdir}/%{name}-%{version}
+%{_docdir}/%{name}-%{version}/[A-Z]*
 %attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/%{name}-client
 %attr(755,root,root) %{_bindir}/awsetbg
@@ -83,6 +103,17 @@ 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?
+# XXX in my system there isn't until awesome won't installed - uzsolt
 %dir %{_sysconfdir}/xdg
 %dir %{_sysconfdir}/xdg/awesome
 %{_sysconfdir}/xdg/awesome/*
+
+%files doc
+%defattr(644,root,root,755)
+%dir %{_docdir}/%{name}-%{version}/luadoc
+%dir %{_docdir}/%{name}-%{version}/luadoc/files
+%dir %{_docdir}/%{name}-%{version}/luadoc/modules
+%{_docdir}/%{name}-%{version}/luadoc/*
+%{_docdir}/%{name}-%{version}/luadoc/files/*
+%{_docdir}/%{name}-%{version}/luadoc/modules/*