- cleanups

Changed files:
    animenu.spec -> 1.2

diff --git a/animenu.spec b/animenu.spec
index 3aa5885bc6ef138b3ac17de6ab033aac6fbf09ba..de29f00e3b555157c28ab62d36696ad1cb3912bf 100644 (file)
--- a/animenu.spec
+++ b/animenu.spec
@@ -1,10 +1,9 @@
 #
-# Conditional build _without_xft       without xft support
-
-
-
-Summary:       On Screen Display menu with lirc.
-Summary(pl):   Menu ekranowe obs³ugiwane pilotem.
+# Conditional build:
+%bcond_without xft     # without xft support
+#
+Summary:       On Screen Display menu with lirc
+Summary(pl):   Menu ekranowe obs³ugiwane pilotem
 Name:          animenu
 Version:       0.3.0
 Release:       1
@@ -15,28 +14,26 @@ Source0:    http://www.blackfiveservices.co.uk/projects/%{name}-%{version}.tar.gz
 Source1:       %{name}-examples.tar.gz
 # Source1-md5: 1e8f16b3a9227072a92253db9c16bb7a
 URL:           http://www.blackfiveservices.co.uk/animenu.shtml
+BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: XFree86-devel
-#%{!?_without_xft:BuildRequires:       XFree86-xft-devel}
 BuildRequires: lirc-devel
+%{?with_xft:BuildRequires:     xft-devel}
 BuildRequires: xosd-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-On Screen Display menu with lirc.
-Fully configurable.
-With directory autoloading support and file types assotiations.
+On Screen Display menu with lirc. Fully configurable, with directory
+autoloading support and file types assotiations.
 
 %description -l pl
-Menu ekranowe obs³ugiwane pilotem.
-Z mo¿liwo¶ci± konfiguracji wczytywanych podczas startu katalogów
-i programów obs³uguj±cych umieszczone w tych katalogach plików.
-
+Menu ekranowe obs³ugiwane pilotem. Jest w pe³ni konfigurowalne, z
+mo¿liwo¶ci± konfiguracji wczytywanych podczas startu katalogów
+i programów przypisanych do obs³ugugi poszczególnych typów plików.
 
 %prep
 %setup  -q
-cp %{SOURCE1} ./
+cp %{SOURCE1} .
 tar zxf %{SOURCE1}
 
 %build
@@ -46,19 +43,19 @@ rm -f missing
 %{__automake}
 
 %configure \
-%if %{?_without_xft:1}0
---disable-xft
-%endif
+       %{!?with_xft:--disable-xft}
 
 %{__make}
 
 %install
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(644,root,root,755)
 %doc README examples examplemenus