[vdr-text2skin] Update to 1.3.2. Clean up specfile constructs no longer needed with Fedora or EL6+.

[Ville Skyttä]

commit 7f9dbd1ca3cae8aae601ef3f5e82e465b29a9383
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Nov 6 19:26:12 2011 +0200

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

 .gitignore                           |    2 +-
 sources                              |    2 +-
 vdr-text2skin-1.3.1-cache-init.patch |   43 ------------------------------
 vdr-text2skin.spec                   |   48 ++++++++++++++-------------------
 4 files changed, 22 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3d1cff2..17d6b36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-vdr-text2skin-1.3.1.tgz
+/*.tgz
diff --git a/sources b/sources
index d88a52f..d20f190 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0f615b821731f46c36c2894d733b85f  vdr-text2skin-1.3.1.tgz
+e9cdf24d1a4dd1d65d72cbf0f1ff6df5  vdr-text2skin-1.3.2.tgz
diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index 574e0eb..f23dada 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -1,25 +1,18 @@
-%global pname     text2skin
-%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%global datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
-%global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
-%global __provides_exclude_from ^%{plugindir}/
+%global pname   text2skin
+%global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
 # imagelib: imagemagick, graphicsmagick, imlib2 or %%{nil}
 %{!?imagelib: %global imagelib graphicsmagick}
 
 Name:           vdr-%{pname}
-Version:        1.3.1
-Release:        3%{?dist}
+Version:        1.3.2
+Release:        1%{?dist}
 Summary:        OSD skin plugin for VDR
 
-Group:          Applications/Multimedia
 License:        GPL+
 URL:            http://projects.vdr-developer.org/projects/show/plg-text2skin
-Source0:        http://projects.vdr-developer.org/attachments/download/344/%{name}-%{version}.tgz
+Source0:        http://projects.vdr-developer.org/attachments/download/783/%{name}-%{version}.tgz
 Source1:        %{name}.conf
 Patch0:         %{name}-1.3-skindir.patch
-# In upstream post-1.3.1 git
-Patch1:         %{name}-1.3.1-cache-init.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{imagelib}" == "imagemagick"
 BuildRequires:  ImageMagick-c++-devel
@@ -30,10 +23,9 @@ BuildRequires:  GraphicsMagick-c++-devel
 %if "%{imagelib}" == "imlib2"
 BuildRequires:  imlib2-devel
 %endif
-BuildRequires:  vdr-devel >= 1.6.0
+BuildRequires:  vdr-devel >= 1.6.0-41
 BuildRequires:  gawk
-BuildRequires:  gettext
-Requires:       vdr(abi)%{?_isa} = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 
 %description
 This plugin is designed to load and interpret a set of files
@@ -47,8 +39,7 @@ of the skin wishes.
 
 %prep
 %setup -q -n %{pname}-%{version}
-sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH0} | patch -p1
-%patch1 -p1
+sed -e 's|/usr/share/vdr/|%{vdr_datadir}/|' %{PATCH0} | patch -p1
 chmod -c -x contrib/*.pl
 
 
@@ -58,34 +49,35 @@ make %{?_smp_mflags} STRIP=: IMAGELIB=%{?imagelib} LIBDIR=. LOCALEDIR=./locale \
 
 
 %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 -Dpm 644 %{SOURCE1} \
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 
-install -dm 755 $RPM_BUILD_ROOT%{datadir}/text2skin
+install -dm 755 $RPM_BUILD_ROOT%{vdr_datadir}/text2skin
 
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
 cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 %find_lang %{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f %{name}.lang
-%doc CONTRIBUTORS COPYING HISTORY README Docs/*.txt contrib/skin_to_10.pl
+%doc CONTRIBUTORS COPYING HISTORY README Docs/*.txt Docs/text2skin*.rng
+%doc contrib/skin_to_10.pl
 %lang(de) %doc README.de
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
-%{plugindir}/libvdr-%{pname}.so.%{apiver}
-%{datadir}/text2skin/
+%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
+%{vdr_datadir}/text2skin/
 
 
 %changelog
+* Sun Nov  6 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.3.2-1
+- Update to 1.3.2.
+- Clean up specfile constructs no longer needed with Fedora or EL6+.
+
 * Tue May 31 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.3.1-3
 - Patch to fix cache initialization crash when built with GCC 4.6.
 - Use __provides_exclude_from to filter Provides.