[vdr-sudoku] Clean up specfile constructs no longer needed with Fedora or EL6+.

[Ville Skyttä]

commit 126b38b552a7f1e5d98f4846daeae6944f4c3a2e
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Nov 6 20:07:42 2011 +0200

    Clean up specfile constructs no longer needed with Fedora or EL6+.

 .gitignore      |    2 +-
 vdr-sudoku.spec |   42 +++++++++++++++++-------------------------
 2 files changed, 18 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0862b0d..17d6b36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-vdr-sudoku-0.3.5.tgz
+/*.tgz
diff --git a/vdr-sudoku.spec b/vdr-sudoku.spec
index 9e622e8..8ddaa4a 100644
--- a/vdr-sudoku.spec
+++ b/vdr-sudoku.spec
@@ -1,27 +1,20 @@
-%global pname     sudoku
-%global vardir    %(vdr-config --vardir     2>/dev/null || echo ERROR)
-%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%global vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)
-%global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
-%global __provides_exclude_from ^%{plugindir}/
+%global pname   sudoku
+%global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
 
 Name:           vdr-%{pname}
 Version:        0.3.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Sudoku plugin for VDR
 
-Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.toms-cafe.de/vdr/sudoku/
 Source0:        http://projects.vdr-developer.org/attachments/download/280/%{name}-%{version}.tgz
 Source1:        %{name}.conf
 Patch0:         %{name}-0.3.0-vardir.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  vdr-devel >= 1.6.0
-BuildRequires:  gettext
+BuildRequires:  vdr-devel >= 1.6.0-41
 BuildRequires:  cxxtest
-Requires:       vdr(abi)%{?_isa} = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 
 %description
 This is a VDR plugin to generate and solve number place puzzles, so
@@ -30,7 +23,7 @@ called Sudokus.
 
 %prep
 %setup -q -n sudoku-%{version}
-sed -e 's|@PLUGINVARDIR@|%{vardir}/%{pname}|g' %{PATCH0} | patch -p1
+sed -e 's|@PLUGINVARDIR@|%{vdr_vardir}/%{pname}|g' %{PATCH0} | patch -p1
 
 
 %build
@@ -41,10 +34,10 @@ make %{?_smp_mflags} -C tools CXXFLAGS="$RPM_OPT_FLAGS -Woverloaded-virtual" \
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 
-install -dm 755 $RPM_BUILD_ROOT%{plugindir}
-install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
+install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir}
+install -pm 755 libvdr-%{pname}.so.%{vdr_apiversion} \
+  $RPM_BUILD_ROOT%{vdr_plugindir}
 
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
 cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
@@ -53,8 +46,8 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 install -Dpm 644 %{SOURCE1} \
   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 
-install -dm 755 $RPM_BUILD_ROOT%{vardir}/%{pname}
-cat /dev/null >$RPM_BUILD_ROOT%{vardir}/%{pname}/sudoku-list
+install -dm 755 $RPM_BUILD_ROOT%{vdr_vardir}/%{pname}
+cat /dev/null >$RPM_BUILD_ROOT%{vdr_vardir}/%{pname}/sudoku-list
 
 make -C tools DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install
 
@@ -63,23 +56,22 @@ make -C tools DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install
 make tests
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f %{name}.lang
 %defattr(-,%{vdr_user},root,-)
-%dir %{vardir}/%{pname}/
-%ghost %config(noreplace) %{vardir}/%{pname}/sudoku-list
+%dir %{vdr_vardir}/%{pname}/
+%ghost %config(noreplace) %{vdr_vardir}/%{pname}/sudoku-list
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS COPYING HISTORY README
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
-%{plugindir}/libvdr-%{pname}.so.%{apiver}
+%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
 %{_bindir}/sudoku_generator
 %{_mandir}/man1/sudoku_generator.1*
 
 
 %changelog
+* Sun Nov  6 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.3.5-4
+- Clean up specfile constructs no longer needed with Fedora or EL6+.
+
 * Thu Mar  3 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.3.5-3
 - Filter autogenerated plugin lib Provides (rpmbuild >= 4.9).