9:18 a.m.
Author: martinkg
Update of /cvs/free/rpms/vdr-burn/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11789/devel
Modified Files:
vdr-burn.spec
Added Files:
vdr-burn-0.2.2-Makefile.patch
Log Message:
vdr-burn-0.2.2-Makefile.patch:
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE vdr-burn-0.2.2-Makefile.patch ---
--- burn-0.2.2/Makefile.orig 2013-04-22 12:04:46.056656436 +0200
+++ burn-0.2.2/Makefile 2013-04-22 12:05:45.054757905 +0200
@@ -61,7 +61,7 @@
### The version number of VDR's plugin API (taken from VDR's
"config.h"):
-APIVERSION = $(shell sed -ne '/define
APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+APIVERSION = $(shell sed -ne '/define
APIVERSION/s/^.*"\(.*\)".*$$/\1/p' /usr/lib64/vdr/config.h)
LOCDIR = $(VDRDIR)/locale
--- burn-0.2.2/Makefile.orig 2013-04-22 10:07:45.217895829 +0200
+++ burn-0.2.2/Makefile 2013-04-22 10:08:33.752980114 +0200
@@ -75,7 +75,7 @@
all: install
-ifeq ($(shell grep 'I18N_DEFAULT_LOCALE' $(VDRDIR)/i18n.h),)
+ifeq ($(shell grep 'I18N_DEFAULT_LOCALE' /usr/include/vdr/i18n.h),)
OLD_I18N = 1
i18n install-i18n:
Index: vdr-burn.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-burn/devel/vdr-burn.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vdr-burn.spec 23 Feb 2013 14:43:39 -0000 1.9
+++ vdr-burn.spec 23 Apr 2013 09:18:15 -0000 1.10
@@ -3,7 +3,7 @@
Name: vdr-%{pname}
Version: 0.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: DVD writing plugin for VDR
Group: Applications/Multimedia
@@ -14,12 +14,12 @@
Source1: %{name}.conf
Source2: http://www.muempf.de/down/genindex-%{gver}.tar.gz
Patch0: %{name}-%{version}-config.patch
+Patch1: %{name}-%{version}-Makefile.patch
-BuildRequires: vdr-devel >= 1.6.0-41
+BuildRequires: vdr-devel >= 1.7.31
BuildRequires: boost-devel
BuildRequires: gd-devel
Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
-Requires: vdrsync
Requires: ProjectX
Requires: m2vrequantiser
Requires: dvdauthor
@@ -44,6 +44,7 @@
find -name CVS | xargs rm -rf
chmod -c -x *.[ch] genindex/*.[ch] proctools/*.cc proctools/*.h README
%patch0 -p0
+%patch1 -p1
sed -i -e 's|/var/lib/vdr/|%{vdr_vardir}/|g' chain-archive.c jobs.c vdrburn-*.sh
sed -i -e 's|"Vera"|"DejaVuLGCSans"|g' skins.c
@@ -55,13 +56,14 @@
%build
-make -C burn-%{version} %{?_smp_mflags} LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr
all
+make -C burn-%{version} %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS -fPIC"
LIBDIR=. VDRDIR=. LOCALEDIR=./locale all
make -C genindex-%{gver} %{?_smp_mflags}
%install
install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir}/bin
-install -pm 755 burn-%{version}/libvdr-%{pname}.so.%{vdr_apiversion}
$RPM_BUILD_ROOT%{vdr_plugindir}
+#install -pm 755 burn-%{version}/libvdr-%{pname}.so.%{vdr_apiversion}
$RPM_BUILD_ROOT%{vdr_plugindir}
+install -pm 755 burn-%{version}/libvdr-%{pname}.so
$RPM_BUILD_ROOT%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
install -pm 755 burn-%{version}/*.sh genindex-%{gver}/genindex \
$RPM_BUILD_ROOT%{vdr_plugindir}/bin
install -dm 755 $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn/skins
@@ -74,6 +76,11 @@
install -Dpm 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
+# locale
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
+cp -pR burn-%{version}/locale/* $RPM_BUILD_ROOT%{_datadir}/locale
+
+%find_lang %{name}
%post
if [ $1 -gt 1 ] ; then # maybe upgrading from < 0.1.0?
@@ -81,8 +88,7 @@
%{vdr_configdir}/reccmds.conf >/dev/null 2>&1 || :
fi
-
-%files
+%files -f %{name}.lang
%defattr(-,root,root,-)
%doc burn-%{version}/COPYING burn-%{version}/HISTORY burn-%{version}/README
README.genindex
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
@@ -92,10 +98,17 @@
%{vdr_plugindir}/bin/vdrburn-dvd.sh
%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
%defattr(-,%{vdr_user},root)
-%config(noreplace) %{vdr_vardir}/burn/
+%config(noreplace) %{vdr_vardir}/%{pname}
%changelog
+* Mon Apr 22 2013 Martin Gansser <martinkg(a)fedoraproject.org> - 0.2.2-2
+- added Makefile locale fix
+- changed build option for new plugin Makefile
+- removed vdrsync Requirement
+- fixed typos
+- rebuild
+
* Sat Feb 23 2013 Martin Gansser <martinkg(a)fedoraproject.org> - 0.2.2-1
- rebuild for new release
@@ -107,7 +120,7 @@
- rebuild for Fedora 18.
* Wed Oct 10 2012 Martin Gansser <linux4martin(a)gmx.de> - 0.2.0-2
-- removed vdrsync Requirenment
+- removed vdrsync Requirement
- removed no-subtitle patch
* Sun Oct 07 2012 Martin Gansser <linux4martin(a)gmx.de> - 0.2.0-1