- rpm macros for %cmake

[packages/awesome.git] / awesome.spec

diff --git a/awesome.spec b/awesome.spec
index 6be3d91f043931ed47479cb1648ad14daaa65eea..1540d080e61310d742c88fc99f54bba8239b9ea5 100644 (file)
--- a/awesome.spec
+++ b/awesome.spec
@@ -1,15 +1,16 @@
-## Todo: lua-doc
-%define _MainVersion 3.0
-%define _RC rc6
+# TODO
+# - lua-doc
+%define        subver  rc6
+%define        rel             1
 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:       0.%{subver}.%{rel}
 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}-%{subver}.tar.bz2
 Source1:       %{name}-xsession.desktop
 Patch0:                %{name}-lua-files.patch
 # Source0-md5: cc5588184a3f77f21af3deb5180f704f
@@ -28,6 +29,7 @@ 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: xmlto
@@ -38,7 +40,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 +57,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 -n %{name}-%{version}-%{subver}
 %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 +90,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/*