rpms/vdr-text2skin/devel vdr-text2skin-1.3-skindir.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 vdr-text2skin.spec, 1.9, 1.10 vdr-text2skin-1.2-skindir.patch, 1.1, NONE
Ville Skyttä
scop at fedoraproject.org
Tue Sep 1 20:23:42 UTC 2009
Author: scop
Update of /cvs/pkgs/rpms/vdr-text2skin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4997
Modified Files:
.cvsignore sources vdr-text2skin.spec
Added Files:
vdr-text2skin-1.3-skindir.patch
Removed Files:
vdr-text2skin-1.2-skindir.patch
Log Message:
* 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.
- Make vdr(abi) dependency ISA qualified.
- Install translations.
- Use %global instead of %define.
vdr-text2skin-1.3-skindir.patch:
README | 3 +++
README.de | 3 +++
common.c | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
--- NEW FILE vdr-text2skin-1.3-skindir.patch ---
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
@@ -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 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
@@ -68,6 +68,9 @@ root at linux # ./vdr -P text2skin
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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 8 Jul 2009 21:42:56 -0000 1.4
+++ .cvsignore 1 Sep 2009 20:23:41 -0000 1.5
@@ -1 +1 @@
-vdr-text2skin-1.2.tgz
+vdr-plugin-text2skin-97c95bc.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 8 Jul 2009 21:42:56 -0000 1.4
+++ sources 1 Sep 2009 20:23:41 -0000 1.5
@@ -1 +1 @@
-bc24ba8fad94ac435081144b067676db vdr-text2skin-1.2.tgz
+4f2c86e5a12283ef7bb159ae29794d61 vdr-plugin-text2skin-97c95bc.tar.gz
Index: vdr-text2skin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/vdr-text2skin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- vdr-text2skin.spec 27 Jul 2009 06:47:45 -0000 1.9
+++ vdr-text2skin.spec 1 Sep 2009 20:23:41 -0000 1.10
@@ -1,33 +1,40 @@
-%define pname text2skin
-%define plugindir %(vdr-config --plugindir 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)
+%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)
+# imagelib: imagemagick, graphicsmagick, imlib2 or %{nil}
+%{!?imagelib: %global imagelib graphicsmagick}
Name: vdr-%{pname}
Version: 1.2
-Release: 2%{?dist}
+Release: 3.git%{gitrev}%{?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/112/%{name}-%{version}.tgz
+# 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
Source1: %{name}.conf
-Patch0: %{name}-1.2-skindir.patch
+Patch0: %{name}-1.3-skindir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{?_with_imagemagick:1}
+%if "%{imagelib}" == "imagemagick"
BuildRequires: ImageMagick-c++-devel
-%else
-BuildRequires: imlib2-devel
%endif
+%if "%{imagelib}" == "graphicsmagick"
+BuildRequires: GraphicsMagick-c++-devel
+# Dependency missing in GraphicsMagick-devel <= 1.1.14-4.fc11
BuildRequires: freetype-devel
-BuildRequires: vdr-devel >= 1.3.47
-BuildRequires: sed >= 3.95
-BuildRequires: which
+%endif
+%if "%{imagelib}" == "imlib2"
+BuildRequires: imlib2-devel
+%endif
+BuildRequires: vdr-devel >= 1.6.0
BuildRequires: gawk
BuildRequires: gettext
-Requires: vdr(abi) = %{apiver}
+Requires: vdr(abi)%{?_isa} = %{apiver}
%description
This plugin is designed to load and interpret a set of files
@@ -40,15 +47,14 @@ of the skin wishes.
%prep
-%setup -q -n %{pname}-%{version}
+%setup -q -n vdr-plugin-%{pname}
sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH0} | patch -p1
chmod -x contrib/*.pl
-sed -i -e /strip/d -e /O2/d Makefile
%build
-opts="%{!?_with_imagemagick:HAVE_IMLIB2=1 HAVE_IMAGEMAGICK=}"
-make %{?_smp_mflags} $opts LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr all
+make %{?_smp_mflags} STRIP=: IMAGELIB=%{?imagelib} LIBDIR=. LOCALEDIR=./locale \
+ VDRDIR=%{_libdir}/vdr all
%install
@@ -60,14 +66,18 @@ install -pm 755 libvdr-%{pname}.so.%{api
install -Dpm 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
-install -dm 755 $RPM_BUILD_ROOT%{datadir}/text2skin/fonts
+install -dm 755 $RPM_BUILD_ROOT%{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
+%files -f %{name}.lang
%defattr(-,root,root,-)
%doc CONTRIBUTORS COPYING HISTORY README Docs/*.txt contrib/skin_to_10.pl
%lang(de) %doc README.de
@@ -77,6 +87,13 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* 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.
+- Make vdr(abi) dependency ISA qualified.
+- Install translations.
+- Use %%global instead of %%define.
+
* 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
--- vdr-text2skin-1.2-skindir.patch DELETED ---
More information about the fedora-extras-commits
mailing list