rpms/vdr-text2skin/devel vdr-text2skin-1.2-skindir.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 vdr-text2skin.spec, 1.7, 1.8 vdr-text2skin-1.1cvs-includes.patch, 1.1, NONE vdr-text2skin-1.1cvs-skindir.patch, 1.1, NONE vdr-text2skin-1.1cvs-vdr154.patch, 1.1, NONE vdr-text2skin-1.1cvs-vdr157.patch, 1.1, NONE
Ville Skyttä
scop at fedoraproject.org
Wed Jul 8 21:42:56 UTC 2009
- Previous message (by thread): rpms/fence-agents/devel .cvsignore, 1.10, 1.11 fence-agents.spec, 1.11, 1.12 sources, 1.10, 1.11
- Next message (by thread): rpms/xorg-x11-server/F-11 .cvsignore, 1.59, 1.60 sources, 1.54, 1.55 xorg-x11-server.spec, 1.451, 1.452 xserver-1.6.0-randr-xinerama-crash.patch, 1.1, NONE xserver-1.6.0-restore-zap.patch, 1.1, NONE xserver-1.6.0-xinerama-cursors.patch, 1.1, NONE xserver-1.6.1-avoid-malloc-for-logging.patch, 1.1, NONE xserver-1.6.1-xkbsendmap.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/vdr-text2skin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11283
Modified Files:
.cvsignore sources vdr-text2skin.spec
Added Files:
vdr-text2skin-1.2-skindir.patch
Removed Files:
vdr-text2skin-1.1cvs-includes.patch
vdr-text2skin-1.1cvs-skindir.patch
vdr-text2skin-1.1cvs-vdr154.patch
vdr-text2skin-1.1cvs-vdr157.patch
Log Message:
* 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.
vdr-text2skin-1.2-skindir.patch:
--- NEW FILE vdr-text2skin-1.2-skindir.patch ---
diff -up text2skin-1.2/common.c~ text2skin-1.2/common.c
--- text2skin-1.2/common.c~ 2009-06-15 21:21:50.000000000 +0300
+++ text2skin-1.2/common.c 2009-06-15 21:58:22.000000000 +0300
@@ -14,7 +14,7 @@
const std::string &SkinPath(void)
{
// should never change
- static std::string path = cPlugin::ConfigDirectory(PLUGIN_NAME_I18N);
+ static std::string path = "/usr/share/vdr/text2skin";
return path;
}
diff -up text2skin-1.2/README~ text2skin-1.2/README
--- text2skin-1.2/README~ 2009-06-15 21:21:50.000000000 +0300
+++ text2skin-1.2/README 2009-06-15 21:58:20.000000000 +0300
@@ -82,6 +82,9 @@ vdr-1.3.17-osdbase-maxitems.diff
Where to put the skins:
-----------------------
+*** rpm package note: this text2skin package has been patched to load skins
+*** from /usr/share/vdr/text2skin instead of the path documented below.
+
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
@@ -109,6 +112,9 @@ it there.
Where to put the fonts:
-----------------------
+*** rpm package note: this text2skin package has been patched to load fonts
+*** from /usr/share/vdr/text2skin instead of the path documented below.
+
Font files (.ttf) can be placed either in the directory of the skin itself or
in a subfolder fonts inside the text2skin directory.
diff -up text2skin-1.2/README.de~ text2skin-1.2/README.de
--- text2skin-1.2/README.de~ 2009-06-15 21:21:50.000000000 +0300
+++ text2skin-1.2/README.de 2009-06-15 21:58:27.000000000 +0300
@@ -77,6 +77,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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 7 Apr 2008 20:56:44 -0000 1.3
+++ .cvsignore 8 Jul 2009 21:42:56 -0000 1.4
@@ -1 +1 @@
-vdr-text2skin-1.1-cvs_ext-0.10.tgz
+vdr-text2skin-1.2.tgz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 7 Apr 2008 20:56:44 -0000 1.3
+++ sources 8 Jul 2009 21:42:56 -0000 1.4
@@ -1 +1 @@
-92d5e0612f59f16190db93ae817f08ae vdr-text2skin-1.1-cvs_ext-0.10.tgz
+bc24ba8fad94ac435081144b067676db vdr-text2skin-1.2.tgz
Index: vdr-text2skin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/vdr-text2skin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- vdr-text2skin.spec 26 Feb 2009 00:01:27 -0000 1.7
+++ vdr-text2skin.spec 8 Jul 2009 21:42:56 -0000 1.8
@@ -1,27 +1,19 @@
%define pname text2skin
%define plugindir %(vdr-config --plugindir 2>/dev/null || echo ERROR)
-%define configdir %(vdr-config --configdir 2>/dev/null || echo ERROR)
%define datadir %(vdr-config --datadir 2>/dev/null || echo ERROR)
%define apiver %(vdr-config --apiversion 2>/dev/null || echo ERROR)
-%define ext 0.10
-
Name: vdr-%{pname}
-Version: 1.1
-Release: 24.cvsext%{ext}%{?dist}
+Version: 1.2
+Release: 1%{?dist}
Summary: OSD skin plugin for VDR
Group: Applications/Multimedia
License: GPL+
-URL: http://linux.kompiliert.net/index.php?view=text2skin
-#Source0: http://linux.kompiliert.net/files/%{name}-%{version}.tgz
-#Source0: http://linux.kompiliert.net/contrib/%{name}-%{version}cvs-%{cvs}.tgz
-Source0: http://brougs78.vdr-developer.org/tmp/vdr-text2skin-%{version}-cvs_ext-%{ext}.tgz
+URL: http://projects.vdr-developer.org/projects/show/plg-text2skin
+Source0: http://projects.vdr-developer.org/attachments/download/112/%{name}-%{version}.tgz
Source1: %{name}.conf
-Patch0: %{name}-1.1cvs-vdr154.patch
-Patch1: %{name}-1.1cvs-vdr157.patch
-Patch2: %{name}-1.1cvs-skindir.patch
-Patch3: %{name}-1.1cvs-includes.patch
+Patch0: %{name}-1.2-skindir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?_with_imagemagick:1}
@@ -34,57 +26,36 @@ BuildRequires: vdr-devel >= 1.3.47
BuildRequires: sed >= 3.95
BuildRequires: which
BuildRequires: gawk
+BuildRequires: gettext
Requires: vdr(abi) = %{apiver}
%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
"skin" available to VDR via Setup -> OSD in the main menu. Of course
-it is possible to load more than one text-based skin this way and to
+it is possible to load more than one text based skin this way and to
choose between them while running VDR. All skins may be themeable
-(you can create your own color-theme) and translateable as the author
+(you can create your own color theme) and translatable as the author
of the skin wishes.
%prep
-%setup -q -c
-
-cd text2skin
-
-%patch0 -p1
-%patch1 -p1
-sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH2} | patch -p1
-%patch3 -p0
-
-find . -depth -type d -name CVS | xargs rm -r
-
-for f in HISTORY README.de Docs/*.txt ; do
- iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-done
-
+%setup -q -n %{pname}-%{version}
+sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH0} | patch -p1
chmod -x contrib/*.pl
-
sed -i -e /strip/d -e /O2/d Makefile
-sed -i -e '/^DVBDIR/d' -e 's|-I$(DVBDIR)\(/linux\)\?/include||g' Makefile
-
-cd ..
%build
-opts=
-%if 0%{!?_with_imagemagick:1}
-opts="HAVE_IMLIB2=1 HAVE_IMAGEMAGICK="
-%endif
-make -C text2skin %{?_smp_mflags} $opts LIBDIR=. VDRDIR=%{_libdir}/vdr all
+opts="%{!?_with_imagemagick:HAVE_IMLIB2=1 HAVE_IMAGEMAGICK=}"
+make %{?_smp_mflags} $opts LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr all
%install
rm -rf $RPM_BUILD_ROOT
-cd text2skin
install -dm 755 $RPM_BUILD_ROOT%{plugindir}
install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
-cd ..
install -Dpm 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
@@ -96,26 +67,21 @@ install -dm 755 $RPM_BUILD_ROOT%{datadir
rm -rf $RPM_BUILD_ROOT
-%pre
-if [ $1 -gt 1 -a -d %{configdir}/plugins/text2skin ] ; then
- # Migrate skins (can't overwrite a dir with a symlink)
- mkdir -p %{datadir}/text2skin && \
- cp -a %{configdir}/plugins/text2skin/* %{datadir}/text2skin || :
- rm -rf %{configdir}/plugins/text2skin
-fi
-
-
%files
%defattr(-,root,root,-)
-%doc text2skin/CONTRIBUTORS text2skin/COPYING text2skin/HISTORY
-%doc text2skin/README text2skin/Docs/*.txt text2skin/contrib/skin_to_10.pl
-%lang(de) %doc text2skin/README.de
+%doc CONTRIBUTORS COPYING HISTORY README Docs/*.txt 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/
%changelog
+* 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.
+
* 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
--- vdr-text2skin-1.1cvs-includes.patch DELETED ---
--- vdr-text2skin-1.1cvs-skindir.patch DELETED ---
--- vdr-text2skin-1.1cvs-vdr154.patch DELETED ---
--- vdr-text2skin-1.1cvs-vdr157.patch DELETED ---
- Previous message (by thread): rpms/fence-agents/devel .cvsignore, 1.10, 1.11 fence-agents.spec, 1.11, 1.12 sources, 1.10, 1.11
- Next message (by thread): rpms/xorg-x11-server/F-11 .cvsignore, 1.59, 1.60 sources, 1.54, 1.55 xorg-x11-server.spec, 1.451, 1.452 xserver-1.6.0-randr-xinerama-crash.patch, 1.1, NONE xserver-1.6.0-restore-zap.patch, 1.1, NONE xserver-1.6.0-xinerama-cursors.patch, 1.1, NONE xserver-1.6.1-avoid-malloc-for-logging.patch, 1.1, NONE xserver-1.6.1-xkbsendmap.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list