[vdr] Use main package's doc dir in -devel and -docs.
Ville Skyttä
scop at fedoraproject.org
Wed Dec 11 19:10:40 UTC 2013
commit fd798520530bb96a16529c1883361239209bcf93
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Wed Dec 11 21:10:25 2013 +0200
Use main package's doc dir in -devel and -docs.
- Use upstream copy of NALU dump patch.
.gitignore | 1 +
sources | 1 +
vdr-2.0.4-naludump-0.1.diff | 620 -------------------------------------------
vdr.spec | 33 ++-
4 files changed, 27 insertions(+), 628 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9e50e7c..381a3e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/vdr.epgsearch-exttimeredit-0.0.2.diff
/vdr-1.7.29-hlcutter-0.2.3.diff
/vdr-1.7.40-ttxtsubs.patch
+/vdr-2.1.2-naludump-0.1.diff
diff --git a/sources b/sources
index ff72f2d..1018bd0 100644
--- a/sources
+++ b/sources
@@ -7,3 +7,4 @@ da3a3ab8c2a42a320171b1648c3b3258 vdr-1.7.29-hlcutter-0.2.3.diff
6fe5d740c7fdb12af842de9c47b80fe8 vdr-2.0.3-vasarajanauloja.patch.gz
d76b06a7bf1f458a02f2d1169776fb7f vdr_2.0.3-1.debian.tar.bz2
8effb19fe09eb6c057ce354fe8f6be9f vdr-2.0.4.tar.bz2
+6ca3d3c0794492e475d6b7656acb45fe vdr-2.1.2-naludump-0.1.diff
diff --git a/vdr.spec b/vdr.spec
index df7fe81..000a6ea 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -24,7 +24,7 @@
Name: vdr
Version: 2.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Video Disk Recorder
License: GPLv2+
@@ -66,8 +66,7 @@ Patch8: %{name}-1.7.28-vasarajanauloja-jumpplay.patch
# http://www.udo-richter.de/vdr/patches.en.html#hlcutter
Patch9: http://www.udo-richter.de/vdr/files/vdr-1.7.29-hlcutter-0.2.3.diff
# http://www.udo-richter.de/vdr/naludump.en.html
-# This updated version sent upstream 2013-10-23
-Patch10: %{name}-2.0.4-naludump-0.1.diff
+Patch10: http://www.udo-richter.de/vdr/files/vdr-2.1.2-naludump-0.1.diff
# http://article.gmane.org/gmane.linux.vdr/43590
Patch11: %{name}-2.0.4-mainmenuhooks101.patch
# http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/plain/patches/timercmd-0.1_1.7.17.diff
@@ -366,6 +365,13 @@ chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/*-%{name}.rules
install -Dpm 644 %{name}.rwtab $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/%{name}
+install -dm 755 $RPM_BUILD_ROOT%{_pkgdocdir}
+install -pm 644 CHANGES.package.old CONTRIBUTORS COPYING HISTORY* INSTALL \
+ MANUAL PLUGINS.html README* UPDATE-?.?.0 $RPM_BUILD_ROOT%{_pkgdocdir}
+%if %{with docs}
+cp -pR srcdoc/html $RPM_BUILD_ROOT%{_pkgdocdir}
+%endif
+
# devel
abs2rel() { perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' "$@" ; }
@@ -441,8 +447,11 @@ systemctl daemon-reload &>/dev/null
[ $1 -gt 0 ] && systemctl try-restart %{name}.service &>/dev/null || :
%files -f %{name}.lang
-%doc CONTRIBUTORS COPYING HISTORY* INSTALL MANUAL README* UPDATE-?.?.0
-%doc CHANGES.package.old
+%{_pkgdocdir}
+%exclude %{_pkgdocdir}/PLUGINS.html
+%if %{with docs}
+%exclude %{_pkgdocdir}/html/
+%endif
%config(noreplace) %{_sysconfdir}/sudoers.d/vdr
%config(noreplace) %{_sysconfdir}/sysconfig/vdr
%config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
@@ -480,9 +489,10 @@ systemctl daemon-reload &>/dev/null
%dir %{cachedir}/
%files devel -f %{name}-devel.files
-%doc COPYING
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/COPYING
%if ! %{with docs}
-%doc PLUGINS.html
+%{_pkgdocdir}/PLUGINS.html
%endif # docs
%{_bindir}/vdr-config
%{_bindir}/vdr-newplugin
@@ -497,7 +507,10 @@ systemctl daemon-reload &>/dev/null
%if %{with docs}
%files docs
-%doc COPYING PLUGINS.html srcdoc/html/
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/COPYING
+%{_pkgdocdir}/PLUGINS.html
+%{_pkgdocdir}/html/
%endif
%files dvbhddevice -f %{name}-dvbhddevice.lang
@@ -525,6 +538,10 @@ systemctl daemon-reload &>/dev/null
%changelog
+* Wed Dec 11 2013 Ville Skyttä <ville.skytta at iki.fi> - 2.0.4-2
+- Use main package's doc dir in -devel and -docs.
+- Use upstream copy of NALU dump patch.
+
* Wed Oct 23 2013 Ville Skyttä <ville.skytta at iki.fi> - 2.0.4-1
- Update to 2.0.4.
More information about the scm-commits
mailing list