rpms/vdr-text2skin/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 vdr-text2skin-1.3-skindir.patch, 1.1, 1.2 vdr-text2skin.spec, 1.10, 1.11

Ville Skyttä scop at fedoraproject.org
Wed Oct 7 20:34:28 UTC 2009 

Author: scop

Update of /cvs/pkgs/rpms/vdr-text2skin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27270

Modified Files:
	.cvsignore sources vdr-text2skin-1.3-skindir.patch 
	vdr-text2skin.spec 
Log Message:
* Wed Oct  7 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.3-1
- Update to 1.3 (#527682).
- Filter out autoprovided libvdr-*.so.* (if %filter_setup is available).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	1 Sep 2009 20:23:41 -0000	1.5
+++ .cvsignore	7 Oct 2009 20:34:26 -0000	1.6
@@ -1 +1 @@
-vdr-plugin-text2skin-97c95bc.tar.gz
+vdr-text2skin-1.3.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	1 Sep 2009 20:23:41 -0000	1.5
+++ sources	7 Oct 2009 20:34:27 -0000	1.6
@@ -1 +1 @@
-4f2c86e5a12283ef7bb159ae29794d61  vdr-plugin-text2skin-97c95bc.tar.gz
+39f3354b5ae04ee41cb45543de858ec2  vdr-text2skin-1.3.tgz

vdr-text2skin-1.3-skindir.patch:
 README    |    3 +++
 README.de |    3 +++
 common.c  |    2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

Index: vdr-text2skin-1.3-skindir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/vdr-text2skin-1.3-skindir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vdr-text2skin-1.3-skindir.patch	1 Sep 2009 20:23:41 -0000	1.1
+++ vdr-text2skin-1.3-skindir.patch	7 Oct 2009 20:34:27 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up vdr-plugin-text2skin/common.c.orig vdr-plugin-text2skin/common.c
---- vdr-plugin-text2skin/common.c.orig	2009-08-22 01:11:50.000000000 +0300
-+++ vdr-plugin-text2skin/common.c	2009-09-01 22:31:23.000000000 +0300
+diff -up text2skin-1.3/common.c~ text2skin-1.3/common.c
+--- text2skin-1.3/common.c~	2009-07-17 02:18:57.000000000 +0300
++++ text2skin-1.3/common.c	2009-10-07 23:19:34.000000000 +0300
 @@ -14,7 +14,7 @@
  const std::string &SkinPath(void) 
  {
@@ -10,22 +10,9 @@ diff -up vdr-plugin-text2skin/common.c.o
  	return path;
  }
  
-diff -up vdr-plugin-text2skin/README.de.orig vdr-plugin-text2skin/README.de
---- vdr-plugin-text2skin/README.de.orig	2009-08-22 01:11:50.000000000 +0300
-+++ vdr-plugin-text2skin/README.de	2009-09-01 22:31:23.000000000 +0300
-@@ -70,6 +70,9 @@ root at linux # ./vdr -P text2skin
- Wo die Skins hingehören:
- ------------------------
- 
-+*** rpm package note: this text2skin package has been patched to load skins
-+*** from /usr/share/vdr/text2skin instead of the path documented below.
-+
- Wie Sie vielleicht wissen, hat VDR einen Unterordner "plugins" innerhalb seines
- Konfigurationsordners, in dem alle Dateien, die zu Plugins gehören, enthalten
- sein sollten. Wenn Sie nicht wissen, wo das sein könnte, schauen Sie in dem
-diff -up vdr-plugin-text2skin/README.orig vdr-plugin-text2skin/README
---- vdr-plugin-text2skin/README.orig	2009-08-22 01:11:50.000000000 +0300
-+++ vdr-plugin-text2skin/README	2009-09-01 22:31:23.000000000 +0300
+diff -up text2skin-1.3/README~ text2skin-1.3/README
+--- text2skin-1.3/README~	2009-07-17 02:16:35.000000000 +0300
++++ text2skin-1.3/README	2009-10-07 23:19:34.000000000 +0300
 @@ -68,6 +68,9 @@ root at linux # ./vdr -P text2skin
  Where to put the skins:
  -----------------------
@@ -36,3 +23,16 @@ diff -up vdr-plugin-text2skin/README.ori
  As you might know, VDR has a subfolder "plugins" inside it's configuration 
  folder, where all plugin-related files should reside. If you don't know, where
  this could be, look into the folder you gave to VDR with the -v parameter 
+diff -up text2skin-1.3/README.de~ text2skin-1.3/README.de
+--- text2skin-1.3/README.de~	2009-09-06 18:31:27.000000000 +0300
++++ text2skin-1.3/README.de	2009-10-07 23:19:34.000000000 +0300
+@@ -73,6 +73,9 @@ root at linux # ./vdr -P text2skin
+ Wo die Skins hingehören:
+ ------------------------
+ 
++*** rpm package note: this text2skin package has been patched to load skins
++*** from /usr/share/vdr/text2skin instead of the path documented below.
++
+ Wie Sie vielleicht wissen, hat VDR einen Unterordner "plugins" innerhalb seines
+ Konfigurationsordners, in dem alle Dateien, die zu Plugins gehören, enthalten
+ sein sollten. Wenn Sie nicht wissen, wo das sein könnte, schauen Sie in dem


Index: vdr-text2skin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/vdr-text2skin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- vdr-text2skin.spec	1 Sep 2009 20:23:41 -0000	1.10
+++ vdr-text2skin.spec	7 Oct 2009 20:34:27 -0000	1.11
@@ -1,5 +1,4 @@
 %global pname     text2skin
-%global gitrev    97c95bc
 %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)
@@ -7,15 +6,14 @@
 %{!?imagelib: %global imagelib graphicsmagick}
 
 Name:           vdr-%{pname}
-Version:        1.2
-Release:        3.git%{gitrev}%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        OSD skin plugin for VDR
 
 Group:          Applications/Multimedia
 License:        GPL+
 URL:            http://projects.vdr-developer.org/projects/show/plg-text2skin
-# wget --content-disposition "http://projects.vdr-developer.org/git/?p=vdr-plugin-text2skin.git;a=snapshot;h=%{gitrev};sf=tgz"
-Source0:        vdr-plugin-%{pname}-%{gitrev}.tar.gz
+Source0:        http://projects.vdr-developer.org/attachments/download/127/%{name}-%{version}.tgz
 Source1:        %{name}.conf
 Patch0:         %{name}-1.3-skindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,6 +34,10 @@ BuildRequires:  gawk
 BuildRequires:  gettext
 Requires:       vdr(abi)%{?_isa} = %{apiver}
 
+%{?filter_setup:
+%filter_provides_in %{plugindir}/.*\.so
+%filter_setup}
+
 %description
 This plugin is designed to load and interpret a set of files
 describing the layout of VDR's on screen display and to make this
@@ -47,7 +49,7 @@ of the skin wishes.
 
 
 %prep
-%setup -q -n vdr-plugin-%{pname}
+%setup -q -n %{pname}-%{version}
 sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH0} | patch -p1
 chmod -x contrib/*.pl
 
@@ -87,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.3-1
+- Update to 1.3 (#527682).
+- Filter out autoprovided libvdr-*.so.* (if %%filter_setup is available).
+
 * Tue Sep  1 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.2-3.git97c95bc
 - Update to git revision 97c95bc for several bugfixes and better fonts handling.
 - Build with GraphicsMagick instead of imlib2 by default.
@@ -97,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Thu Jul  9 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.2-1
+* Thu Jul  9 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.2-1
 - Update to 1.2.
 - Specfile cleanups.
 - Fix spelling errors in description.
@@ -105,44 +111,44 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-24.cvsext0.10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Mon Apr  7 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-23.cvsext0.10
+* Mon Apr  7 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-23.cvsext0.10
 - Update to 1.1-cvs_ext-0.10.
 - Build for VDR 1.6.0.
 
-* Sun Apr  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-22.20051217cvs
+* Sun Apr  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-22.20051217cvs
 - Apply VDR 1.5+ patches from e-tobi.net Debian package.
 
-* Fri Jan  4 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-21.20051217cvs
+* Fri Jan  4 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-21.20051217cvs
 - Fix build with gcc 4.3's cleaned up C++ headers.
 
-* Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1-20.20051217cvs
+* Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1-20.20051217cvs
 - BuildRequires: gawk for extracting APIVERSION.
 
-* Tue Aug  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1-19.20051217cvs
+* Tue Aug  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1-19.20051217cvs
 - License: GPL+
 
-* Sun Apr  8 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1-18.20051217cvs
+* Sun Apr  8 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1-18.20051217cvs
 - Grab potential XML parse buffer overflow fix from upstream CVS.
 
-* Sun Nov 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-16.20051217cvs
+* Sun Nov 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-16.20051217cvs
 - Migrate real skins directory to /usr/share/vdr/text2skin.
 - Patch for freetype 2.2 compatibility.
 
-* Sat Nov  4 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-15.20051217
+* Sat Nov  4 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-15.20051217
 - Build with imlib2 instead of imagemagick by default due to #212478.
 - Build for VDR 1.4.4.
 
 * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.1-14
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
-* Sat Sep 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-13.20051217
+* Sat Sep 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-13.20051217
 - Rebuild for VDR 1.4.3.
 
-* Sun Aug  6 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-12.20051217
+* Sun Aug  6 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-12.20051217
 - Rebuild for VDR 1.4.1-3.
 
-* Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-11.20051217
+* Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-11.20051217
 - Rebuild for VDR 1.4.1.
 
-* Sun Apr 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-10.20051217
+* Sun Apr 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-10.20051217
 - Rebuild for VDR 1.4.0.

More information about the fedora-extras-commits mailing list