diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 9b4d134..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -vdr-text2skin-1.3.tgz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3d1cff2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +vdr-text2skin-1.3.1.tgz diff --git a/Makefile b/Makefile deleted file mode 100644 index d247620..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vdr-text2skin -# $Id: Makefile,v 1.1 2007/04/23 17:04:59 wtogami Exp $ -NAME := vdr-text2skin -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index 5b08a7f..d88a52f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -39f3354b5ae04ee41cb45543de858ec2 vdr-text2skin-1.3.tgz +b0f615b821731f46c36c2894d733b85f vdr-text2skin-1.3.1.tgz diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec index 011b6fe..d62b411 100644 --- a/vdr-text2skin.spec +++ b/vdr-text2skin.spec @@ -2,18 +2,18 @@ %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) -# imagelib: imagemagick, graphicsmagick, imlib2 or %{nil} +# imagelib: imagemagick, graphicsmagick, imlib2 or %%{nil} %{!?imagelib: %global imagelib graphicsmagick} Name: vdr-%{pname} -Version: 1.3 +Version: 1.3.1 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/127/%{name}-%{version}.tgz +Source0: http://projects.vdr-developer.org/attachments/download/344/%{name}-%{version}.tgz Source1: %{name}.conf Patch0: %{name}-1.3-skindir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,7 +51,7 @@ of the skin wishes. %prep %setup -q -n %{pname}-%{version} sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH0} | patch -p1 -chmod -x contrib/*.pl +chmod -c -x contrib/*.pl %build @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 22 2010 Ville Skyttä - 1.3.1-1 +- Update to 1.3.1 (#606725). + * Wed Oct 7 2009 Ville Skyttä - 1.3-1 - Update to 1.3 (#527682). - Filter out autoprovided libvdr-*.so.* (if %%filter_setup is available).