rpms/vdr/devel .cvsignore, 1.13.2.1, 1.13.2.2 sources, 1.13.2.1, 1.13.2.2 vdr.spec, 1.23.2.1, 1.23.2.2

Ville Skytta (scop) fedora-extras-commits at redhat.com
Sat Mar 29 06:54:11 UTC 2008 

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25996

Modified Files:
      Tag: vdr-1_6-test
	.cvsignore sources vdr.spec 
Log Message:
* Sat Mar 29 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-0.2
- Add --with docs build option for building a -docs subpackage.
- Refresh liemikuutio and ttxtsubs patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/.cvsignore,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- .cvsignore	24 Mar 2008 16:07:35 -0000	1.13.2.1
+++ .cvsignore	29 Mar 2008 06:53:34 -0000	1.13.2.2
@@ -1,4 +1,4 @@
 vdr_1.4.5-2.ds.diff.gz
-vdr-1.5.18-liemikuutio-1.19.diff.gz
-vdr-1.5.18-ttxtsubs-0.0.5.diff.gz
 vdr-1.6.0.tar.bz2
+vdr-1.6.0-liemikuutio-1.19.diff.gz
+vdr-1.6.0-ttxtsubs-0.0.5.diff.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/sources,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- sources	24 Mar 2008 16:07:35 -0000	1.13.2.1
+++ sources	29 Mar 2008 06:53:34 -0000	1.13.2.2
@@ -1,4 +1,4 @@
 3e9287f726df5a667054a15078235791  vdr_1.4.5-2.ds.diff.gz
-63a276c23a71658739641a969832ef28  vdr-1.5.18-liemikuutio-1.19.diff.gz
-a411bb27e814cedbbef0c71c0ff6bab7  vdr-1.5.18-ttxtsubs-0.0.5.diff.gz
 76f4ebe6525a35e33313d27a3f8e80c0  vdr-1.6.0.tar.bz2
+d60c9d15236dd17b7ec1e88a59c3ddd5  vdr-1.6.0-liemikuutio-1.19.diff.gz
+2e994fcf18766fed279e2a8f2a70e717  vdr-1.6.0-ttxtsubs-0.0.5.diff.gz


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -r1.23.2.1 -r1.23.2.2
--- vdr.spec	24 Mar 2008 16:07:35 -0000	1.23.2.1
+++ vdr.spec	29 Mar 2008 06:53:34 -0000	1.23.2.2
@@ -3,6 +3,9 @@
 # - channelfilter patch, http://www.u32.de/vdr.html#patches
 # - rofa's parentalrating, cutter-marks patches
 
+%bcond_with       docs
+%bcond_with       plugins
+
 %define videodir  /srv/vdr
 %define audiodir  /srv/audio
 %define plugindir %{_libdir}/vdr
@@ -19,7 +22,7 @@
 
 Name:           vdr
 Version:        1.6.0
-Release:        0.1%{?dist}
+Release:        0.2%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -56,13 +59,13 @@
 Patch0:         %{name}-channel+epg.patch
 # TODO
 Patch1:         http://zap.tartarus.org/~ds/debian/dists/stable/main/source/vdr_1.4.5-2.ds.diff.gz
-Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.5.18-liemikuutio-1.19.diff.gz
+Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-liemikuutio-1.19.diff.gz
 Patch3:         %{name}-1.6.0-scriptnames.patch
 Patch4:         %{name}-1.6.0-paths.patch
 Patch5:         %{name}-1.5.18-use-pkgconfig.patch
 # http://article.gmane.org/gmane.linux.vdr/36097
 Patch6:         %{name}-1.5.18-syncearly.patch
-Patch7:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.5.18-ttxtsubs-0.0.5.diff.gz
+Patch7:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-ttxtsubs-0.0.5.diff.gz
 Patch8:         %{name}-1.6.0-man-section.patch
 # Patch8: http://www.udo-richter.de/vdr/files/vdr-1.5.13-hlcutter-0.2.0.diff
 # edited so that it applies on top of the liemikuutio patch (menu.c)
@@ -70,7 +73,7 @@
 # TODO
 Patch10:        %{name}-1.4.7-hlcutter-0.2.0-finnish.patch
 # mainmenuhooks, timercmd and progressbar-support from
-# http://winni.vdr-developer.org/epgsearch/downloads/beta/vdr-epgsearch-0.9.24.beta22.tgz
+# http://winni.vdr-developer.org/epgsearch/downloads/beta/vdr-epgsearch-0.9.24.beta23.tgz
 Patch11:        MainMenuHooks-v1_0.patch
 Patch12:        timercmd-0.1_1.5.12.diff
 Patch13:        %{name}-1.5.17-progressbar-support-0.0.1.diff
@@ -83,6 +86,10 @@
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel
 BuildRequires:  gettext
+%if %{with docs}
+BuildRequires:  doxygen
+BuildRequires:  graphviz
+%endif # docs
 Requires:       udev
 Requires(pre):  shadow-utils
 Requires(post): /sbin/chkconfig
@@ -104,12 +111,19 @@
 %description    devel
 %{summary}.
 
+%package        docs
+Summary:        Developer documentation for VDR
+Group:          Documentation
+
+%description    docs
+%{summary}.
+
 %package        skincurses
 Summary:        Shell window skin plugin for VDR
 Group:          Applications/Multimedia
-%if 0%{?_with_plugins:1}
+%if %{with plugins}
 BuildRequires:  ncurses-devel
-%endif
+%endif # plugins
 Requires:       vdr(abi) = %{apiver}
 
 %description    skincurses
@@ -199,6 +213,11 @@
 files   %{vardir}
 EOF
 
+# Disable some graphs that end up too big to be useful.
+for g in COLLABORATION INCLUDE INCLUDED_BY ; do
+    sed -i -e 's/^\(\s*'$g'_GRAPH\s*=\s*\).*/\1NO/' Doxyfile
+done
+
 
 %build
 
@@ -256,10 +275,15 @@
 
 export PKG_CONFIG_PATH=$(pwd)
 make %{?_smp_mflags} all include-dir
-%if 0%{?_with_plugins:1}
+%if %{with docs}
+make %{?_smp_mflags} srcdoc
+find srcdoc -type f -size 0 -delete
+%endif # docs
+
+%if %{with plugins}
 make %{?_smp_mflags} -C PLUGINS/src/skincurses LIBDIR=. all
 make %{?_smp_mflags} -C PLUGINS/src/sky        LIBDIR=. all
-%endif
+%endif # plugins
 
 
 %install
@@ -355,7 +379,7 @@
 sed -i -e '1i%%defattr(-,root,root,-)' %{name}.lang
 
 # plugins
-%if 0%{?_with_plugins:1}
+%if %{with plugins}
 install -pm 755 PLUGINS/src/skincurses/libvdr-skincurses.so.%{apiver} \
   $RPM_BUILD_ROOT%{plugindir}
 install -pm 644 %{SOURCE11} \
@@ -371,7 +395,7 @@
   $RPM_BUILD_ROOT%{_bindir}/getskyepg
 install -Dpm 644 PLUGINS/src/sky/channels.conf.sky \
   $RPM_BUILD_ROOT%{configdir}/plugins/sky/channels.conf.sky
-%endif
+%endif # plugins
 
 
 %check
@@ -445,7 +469,10 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc COPYING PLUGINS.html
+%doc COPYING
+%if ! %{with docs}
+%doc PLUGINS.html
+%endif # docs
 %{_bindir}/vdr-config
 %{_bindir}/vdr-newplugin
 %{_includedir}/libsi/
@@ -455,7 +482,13 @@
 %{_libdir}/vdr/Make.config
 %{_libdir}/vdr/config.h
 
-%if 0%{?_with_plugins:1}
+%if %{with docs}
+%files docs
+%defattr(-,root,root,-)
+%doc PLUGINS.html srcdoc/html/
+%endif
+
+%if %{with plugins}
 %files skincurses -f %{name}-skincurses.lang
 %defattr(-,root,root,-)
 %doc PLUGINS/src/skincurses/COPYING PLUGINS/src/skincurses/HISTORY
@@ -471,9 +504,13 @@
 %config(noreplace) %{configdir}/plugins/sky/channels.conf.sky
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/sky.conf
 %{plugindir}/libvdr-sky.so.%{apiver}
-%endif
+%endif # plugins
 
 %changelog
+* Sat Mar 29 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-0.2
+- Add --with docs build option for building a -docs subpackage.
+- Refresh liemikuutio and ttxtsubs patches.
+
 * Sun Mar 23 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-0.1
 - 1.6.0 final; still quite a bit to do with the package.
 - Adapt sync early and epgsearch (partially) patches.

More information about the fedora-extras-commits mailing list