rpms/vdr/devel vdr-1.6.0-fedora-pkgconfig.patch, NONE, 1.1.2.1 vdr-1.6.0-includes+pkgconfig.patch, NONE, 1.1.2.1 .cvsignore, 1.13.2.2, 1.13.2.3 sources, 1.13.2.2, 1.13.2.3 vdr-1.6.0-man-section.patch, 1.1.2.1, 1.1.2.2 vdr-CHANGES.package.old, 1.1, 1.1.2.1 vdr.spec, 1.23.2.2, 1.23.2.3
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Fri Apr 4 21:17:04 UTC 2008
Author: scop
Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32507
Modified Files:
Tag: vdr-1_6-test
.cvsignore sources vdr-1.6.0-man-section.patch
vdr-CHANGES.package.old vdr.spec
Added Files:
Tag: vdr-1_6-test
vdr-1.6.0-fedora-pkgconfig.patch
vdr-1.6.0-includes+pkgconfig.patch
Log Message:
* Fri Apr 4 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-0.3
- Update liemikuutio patch to 1.20.
- Move various (partially) upstreamable changes to patches instead of
inlining them in the specfile.
- Drop unused logdir.
- Move pre-2008 changelog entries to README.package.old.
vdr-1.6.0-fedora-pkgconfig.patch:
--- NEW FILE vdr-1.6.0-fedora-pkgconfig.patch ---
--- Makefile~ 2008-04-04 20:28:08.000000000 +0300
+++ Makefile 2008-04-04 20:32:48.000000000 +0300
@@ -115,6 +115,15 @@
echo "localedir=$(LOCDIR)" >> $@
echo "apiversion=$(APIVERSION)" >> $@
echo "" >> $@
+ echo "audiodir=$(AUDIODIR)" >> $@
+ echo "datadir=$(DATADIR)" >> $@
+ echo "cachedir=$(CACHEDIR)" >> $@
+ echo "rundir=$(RUNDIR)" >> $@
+ echo "vardir=$(VARDIR)" >> $@
+ echo "logdir=$(LOGDIR)" >> $@
+ echo "user=$(VDR_USER)" >> $@
+ echo "group=$(VDR_GROUP)" >> $@
+ echo "" >> $@
echo "Name: VDR" >> $@
echo "Description: Video Disk Recorder" >> $@
echo "URL: http://www.cadsoft.de/vdr/" >> $@
vdr-1.6.0-includes+pkgconfig.patch:
--- NEW FILE vdr-1.6.0-includes+pkgconfig.patch ---
--- Makefile.orig 2008-02-29 23:43:03.000000000 +0200
+++ Makefile 2008-04-04 20:18:51.000000000 +0300
@@ -19,6 +19,7 @@
PREFIX ?= /usr/local
MANDIR = $(PREFIX)/share/man
BINDIR = $(PREFIX)/bin
+INCLUDEDIR = $(PREFIX)/include
LOCDIR = ./locale
LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
INCLUDES = -I/usr/include/freetype2
@@ -32,6 +33,8 @@
DOXYGEN = /usr/bin/doxygen
DOXYFILE = Doxyfile
+PCDIR ?= $(firstword $(subst :, , ${PKG_CONFIG_PATH}:$(PREFIX)/lib/pkgconfig))
+
-include Make.config
SILIB = $(LSIDIR)/libsi.a
@@ -75,7 +78,7 @@
DEFINES += -DVFAT
endif
-all: vdr i18n
+all: vdr i18n vdr.pc
# Implicit rules:
@@ -101,6 +104,23 @@
$(SILIB):
$(MAKE) -C $(LSIDIR) all
+# pkg-config file:
+
+vdr.pc: Makefile
+ echo "bindir=$(BINDIR)" > $@
+ echo "includedir=$(INCLUDEDIR)" >> $@
+ echo "configdir=$(CONFDIR)" >> $@
+ echo "videodir=$(VIDEODIR)" >> $@
+ echo "plugindir=$(PLUGINLIBDIR)" >> $@
+ echo "localedir=$(LOCDIR)" >> $@
+ echo "apiversion=$(APIVERSION)" >> $@
+ echo "" >> $@
+ echo "Name: VDR" >> $@
+ echo "Description: Video Disk Recorder" >> $@
+ echo "URL: http://www.cadsoft.de/vdr/" >> $@
+ echo "Version: $(VDRVERSION)" >> $@
+ echo "Cflags: $(CXXFLAGS) -I$${includedir}" >> $@
+
# Internationalization (I18N):
PODIR = po
@@ -161,7 +181,8 @@
# Install the files:
-install: install-bin install-conf install-doc install-plugins install-i18n
+install: install-bin install-conf install-doc install-plugins install-i18n \
+ install-includes install-pc
# VDR binary:
@@ -192,6 +213,20 @@
@mkdir -p $(DESTDIR)$(PLUGINLIBDIR)
@cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)
+# Headers:
+
+install-includes: include-dir
+ @mkdir -p $(DESTDIR)$(INCLUDEDIR)
+ @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCLUDEDIR)
+
+# pkg-config file:
+
+install-pc: vdr.pc
+ if [ -n "$(PCDIR)" ] ; then \
+ mkdir -p $(DESTDIR)$(PCDIR) ; \
+ cp vdr.pc $(DESTDIR)$(PCDIR) ; \
+ fi
+
# Source documentation:
srcdoc:
@@ -204,7 +239,7 @@
clean:
$(MAKE) -C $(LSIDIR) clean
- -rm -f $(OBJS) $(DEPFILE) vdr core* *~
+ -rm -f $(OBJS) $(DEPFILE) vdr vdr.pc core* *~
-rm -rf $(LOCALEDIR) $(PODIR)/*.mo $(PODIR)/*.pot
-rm -rf include
-rm -rf srcdoc
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/.cvsignore,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -r1.13.2.2 -r1.13.2.3
--- .cvsignore 29 Mar 2008 06:53:34 -0000 1.13.2.2
+++ .cvsignore 4 Apr 2008 21:16:25 -0000 1.13.2.3
@@ -1,4 +1,4 @@
vdr_1.4.5-2.ds.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
+vdr-1.6.0-liemikuutio-1.20.diff.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/sources,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -r1.13.2.2 -r1.13.2.3
--- sources 29 Mar 2008 06:53:34 -0000 1.13.2.2
+++ sources 4 Apr 2008 21:16:25 -0000 1.13.2.3
@@ -1,4 +1,4 @@
3e9287f726df5a667054a15078235791 vdr_1.4.5-2.ds.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
+a17349da99994ba6aad5737bf810d458 vdr-1.6.0-liemikuutio-1.20.diff.gz
vdr-1.6.0-man-section.patch:
Index: vdr-1.6.0-man-section.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/Attic/vdr-1.6.0-man-section.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- vdr-1.6.0-man-section.patch 24 Mar 2008 16:07:35 -0000 1.1.2.1
+++ vdr-1.6.0-man-section.patch 4 Apr 2008 21:16:25 -0000 1.1.2.2
@@ -1,40 +1,94 @@
-diff -U1 vdr-1.6.0/HISTORY~ vdr-1.6.0/HISTORY
---- vdr-1.6.0/HISTORY~ 2008-03-23 12:26:08.000000000 +0200
-+++ vdr-1.6.0/HISTORY 2008-03-23 15:48:23.000000000 +0200
-@@ -1142,3 +1142,3 @@
+diff -up vdr-1.6.0/HISTORY.orig vdr-1.6.0/HISTORY
+--- vdr-1.6.0/HISTORY.orig 2008-03-23 12:26:08.000000000 +0200
++++ vdr-1.6.0/HISTORY 2008-04-04 22:34:13.000000000 +0300
+@@ -1140,7 +1140,7 @@ Video Disk Recorder Revision History
+ important if this takes some time.
+ - Fixed scrolling the "Channels" menu in case the cursor ends up on a group
delimiter (thanks to Bernd Zierath for helping to debug this one).
-- Added manual pages vdr(1) and vdr(5) (which made the FORMATS file obsolete).
+- Added manual pages vdr(8) and vdr(5) (which made the FORMATS file obsolete).
- New command command line option '-V' to display the VDR version.
-@@ -1252,3 +1252,3 @@
+ - Adjusting column width for channel numbers in case there are more than 999
+ channels.
+@@ -1250,7 +1250,7 @@ Video Disk Recorder Revision History
+ - Begin of the 1.1 development branch. THIS IS NOT A STABLE VERSION!
+ The current stable version for every day use is still the 1.0 branch.
- First step towards a universal plugin interface. See the file PLUGINS.html
- for a detailed description. The man page vdr(1) describes the new options '-L'
+ for a detailed description. The man page vdr(8) describes the new options '-L'
and '-P' used to load plugins. This first step implements the complete "outer"
-@@ -3894,3 +3894,3 @@
+ shell for plugins. The "inner" access to VDR data structures will follow.
+ - The VDR version number is now displayed in the title line of the "Setup" menu.
+@@ -3892,7 +3892,7 @@ Video Disk Recorder Revision History
+ - Added '__attribute__' to functions that use printf() like parameters (thanks
+ to Darren Salt).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
-- Fixed a leftover 'summary.vdr' in vdr.1 (reported by Christoph Hermanns).
+- Fixed a leftover 'summary.vdr' in vdr.8 (reported by Christoph Hermanns).
- Added more error messages and line numbers when reading EPG data and info.vdr
-@@ -4165,3 +4165,3 @@
+ (thanks to Peter Bieringer).
+ - Updated the Danish OSD texts (thanks to Mogens Elneff).
+@@ -4163,7 +4163,7 @@ Video Disk Recorder Revision History
+ - Key macros can now be defined for all non-modeless keys (suggested by Mirko Dölle).
+ - Adjusted the "KEY MACROS" section of vdr.5 to the new plugin calling mechanism
introduced in version 1.3.32.
-- Removed the now obsolete "ca.conf" section from vdr.1 (thanks to Ville Skyttä).
+- Removed the now obsolete "ca.conf" section from vdr.8 (thanks to Ville Skyttä).
- Added missing description of L and R circular polarization to 'diseqc.conf'.
-@@ -4522,3 +4522,3 @@
+ - Added a note about "modprobe capability" to INSTALL (suggested by Patrick Cernko).
+ - Fixed canonicalizing the file name in the SVDRP command GRAB to allow full path
+@@ -4520,7 +4520,7 @@ Video Disk Recorder Revision History
+ - Added a missing "Key$" in skincurses.c (reported by Darren Salt).
+ - Reintroduced the log message "deleting plugin: ..." when shutting down VDR (upon
request by Ville Skyttä, as in the initial patch from Christoph Haubrich).
-- Fixed the vdr.1 man page (a single DVB card can record and do live tv).
+- Fixed the vdr.8 man page (a single DVB card can record and do live tv).
- The preferred audio language is now automatically selected when starting replay.
-@@ -4812,3 +4812,3 @@
+ - Updated the Danish OSD texts (thanks to Mogens Elneff).
+ - The new function cPlugin::Active() can be used by a plugin to indicate that it
+@@ -4810,7 +4810,7 @@ Video Disk Recorder Revision History
+ Note to all plugin developers: a plugin's Makefile *must* define the PLUGIN
+ macro, even if it doesn't use it itself!
- Added a comment regarding the PLUGIN macro to the 'newplugin' script.
-- Added '--vfat' to the vdr.1 man page (reported by Udo Richter).
+- Added '--vfat' to the vdr.8 man page (reported by Udo Richter).
- Removed a double fdopen() in cPipe::Open() (reported by Stefan Huelswitt).
-diff -U1 vdr-1.6.0/vdr.1~ vdr-1.6.0/vdr.1
---- vdr-1.6.0/vdr.1~ 2008-03-09 18:07:06.000000000 +0200
-+++ vdr-1.6.0/vdr.1 2008-03-23 15:48:54.000000000 +0200
-@@ -10,5 +10,5 @@
+ - Fixed handling the running status of EPG events before the currently running one,
+ in case they are added after the current event.
+diff -up vdr-1.6.0/vdr.5.orig vdr-1.6.0/vdr.5
+--- vdr-1.6.0/vdr.5.orig 2008-03-09 17:46:57.000000000 +0200
++++ vdr-1.6.0/vdr.5 2008-04-04 22:34:13.000000000 +0300
+@@ -663,7 +663,7 @@ just 16 bit wide. The internal represent
+ be used, so that external tools can generate EPG data that is guaranteed
+ not to collide with the ids of existing data.
+ .SH SEE ALSO
+-.BR vdr (1)
++.BR vdr (8)
+ .SH AUTHOR
+ Written by Klaus Schmidinger.
+ .SH REPORTING BUGS
+diff -up vdr-1.6.0/Makefile.orig vdr-1.6.0/Makefile
+--- vdr-1.6.0/Makefile.orig 2008-02-29 23:43:03.000000000 +0200
++++ vdr-1.6.0/Makefile 2008-04-04 22:36:05.000000000 +0300
+@@ -181,10 +181,8 @@ install-conf:
+ # Documentation:
+
+ install-doc:
+- @mkdir -p $(DESTDIR)$(MANDIR)/man1
+- @mkdir -p $(DESTDIR)$(MANDIR)/man5
+- @gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz
+- @gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz
++ install -Dpm 644 vdr.1 $(DESTDIR)$(MANDIR)/man8/vdr.8
++ install -Dpm 644 vdr.5 $(DESTDIR)$(MANDIR)/man5/vdr.5
+
+ # Plugins:
+
+diff -up vdr-1.6.0/vdr.1.orig vdr-1.6.0/vdr.1
+--- vdr-1.6.0/vdr.1.orig 2008-03-09 18:07:06.000000000 +0200
++++ vdr-1.6.0/vdr.1 2008-04-04 22:34:13.000000000 +0300
+@@ -8,9 +8,9 @@
+ .\" License as specified in the file COPYING that comes with the
+ .\" vdr distribution.
.\"
-.\" $Id$
+.\" $Id$
@@ -42,19 +96,17 @@
-.TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder"
+.TH vdr 8 "10 Feb 2008" "1.6" "Video Disk Recorder"
.SH NAME
-diff -U1 vdr-1.6.0/vdr.5~ vdr-1.6.0/vdr.5
---- vdr-1.6.0/vdr.5~ 2008-03-09 17:46:57.000000000 +0200
-+++ vdr-1.6.0/vdr.5 2008-03-23 15:46:21.000000000 +0200
-@@ -665,3 +665,3 @@
- .SH SEE ALSO
--.BR vdr (1)
-+.BR vdr (8)
- .SH AUTHOR
-diff -U1 vdr-1.6.0/UPDATE-1.2.0~ vdr-1.6.0/UPDATE-1.2.0
---- vdr-1.6.0/UPDATE-1.2.0~ 2003-05-30 16:46:54.000000000 +0300
-+++ vdr-1.6.0/UPDATE-1.2.0 2008-03-23 15:47:32.000000000 +0200
-@@ -10,3 +10,3 @@
+ vdr \- the Video Disk Recorder
+ .SH SYNOPSIS
+diff -up vdr-1.6.0/UPDATE-1.2.0.orig vdr-1.6.0/UPDATE-1.2.0
+--- vdr-1.6.0/UPDATE-1.2.0.orig 2003-05-30 16:46:54.000000000 +0300
++++ vdr-1.6.0/UPDATE-1.2.0 2008-04-04 22:34:13.000000000 +0300
+@@ -8,7 +8,7 @@ See the file HISTORY for a detailed list
+ Plugins:
+
- Implemented a universal plugin interface. See the file PLUGINS.html
- for a detailed description. The man page vdr(1) describes the new options '-L'
+ for a detailed description. The man page vdr(8) describes the new options '-L'
and '-P' used to load plugins.
+ See http://www.cadsoft.de/vdr/plugins.htm for a list of available plugins.
+ - Rearranged the remote control key handling to allow plugins to implement
Index: vdr-CHANGES.package.old
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr-CHANGES.package.old,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- vdr-CHANGES.package.old 1 Aug 2007 20:49:04 -0000 1.1
+++ vdr-CHANGES.package.old 4 Apr 2008 21:16:25 -0000 1.1.2.1
@@ -1,3 +1,60 @@
+* Wed Oct 17 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-6
+- Add patch to start playback from recordings menu with the play button.
+
+* Fri Oct 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-5
+- Fix init script not to start a new vdr if it's already running (#247089).
+- Update subtitles+ttxtsubs patch to Rolf's latest revision.
+
+* Mon Aug 6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-4
+- License: GPL+ for skincurses and sky plugins.
+
+* Wed Aug 1 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-3
+- Sync user/group handling with current packaging guideline draft.
+- Include vdr-moveto.sh, a script for organizing recordings.
+- Refresh patches, include GPL version info in License tag.
+- Move pre-2007 %%changelog entries to CHANGES.package.old.
+- Make sure all package scriptlets exit with zero status.
+- Add LSB comment block to init script.
+
+* Mon Jun 11 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-2
+- Apply Reinhard Nißl's "sync early" patch for smoother channel changes.
+
+* Sat May 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-1
+- 1.4.7.
+
+* Tue May 1 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.6-3
+- Upstream 1.4.6-1, refresh other patches.
+
+* Mon Apr 23 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.6-2
+- Relocate themes to /var/lib/vdr/themes (#216355).
+- Tighten up some directory permissions.
+
+* Sun Mar 4 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.6-1
+- 1.4.6.
+
+* Sat Feb 24 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.5-4
+- Upstream 1.4.5-2.
+
+* Sun Jan 28 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.5-3
+- Upstream 1.4.5-1, refresh other patches.
+- Fix xineliboutput plugin name in sysconfig's VDR_PLUGIN_ORDER.
+- Delay a bit in the init script's stop function for clean shutdown.
+- Update CDDA_TRANSPORT workaround status in commands.conf abcde example.
+- Improve /sbin/halt.local explanation in README.package.
+- Minor specfile cleanups.
+
+* Sun Jan 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.5-2
+- 1.4.5, Darren Salt's 1.4.4-1.ds.
+- Make it possible to disable installed plugins in plugin sysconfig snippet.
+- Add shutdown script, document ACPI wakeup usage in README.package.
+- Shut down earlier by default for better experience with the -s option.
+- Include INSTALL in docs, it contains useful post-install info.
+- Improve remote control examples in udev rules snippet.
+- Honor $TMPDIR when running with core dumps enabled.
+- Add read only root/temporary state config.
+- Add ttxtsubs to default plugin order list.
+- Include log dir for plugins.
+
* Sat Nov 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.4-1
- 1.4.4.
- Apply epgsearch and timer info patches.
Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -u -r1.23.2.2 -r1.23.2.3
--- vdr.spec 29 Mar 2008 06:53:34 -0000 1.23.2.2
+++ vdr.spec 4 Apr 2008 21:16:25 -0000 1.23.2.3
@@ -14,7 +14,6 @@
%define cachedir %{_var}/cache/vdr
%define rundir %{_var}/run/vdr
%define vardir %{_var}/lib/vdr
-%define logdir %{_var}/log/vdr
%define vdr_user vdr
%define vdr_group video
# From APIVERSION in config.h
@@ -22,7 +21,7 @@
Name: vdr
Version: 1.6.0
-Release: 0.2%{?dist}
+Release: 0.3%{?dist}
Summary: Video Disk Recorder
Group: Applications/Multimedia
@@ -59,7 +58,7 @@
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.6.0-liemikuutio-1.19.diff.gz
+Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-liemikuutio-1.20.diff.gz
Patch3: %{name}-1.6.0-scriptnames.patch
Patch4: %{name}-1.6.0-paths.patch
Patch5: %{name}-1.5.18-use-pkgconfig.patch
@@ -73,10 +72,12 @@
# 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.beta23.tgz
+# http://winni.vdr-developer.org/epgsearch/downloads/beta/vdr-epgsearch-0.9.24.beta25.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
+Patch14: %{name}-1.6.0-includes+pkgconfig.patch
+Patch15: %{name}-1.6.0-fedora-pkgconfig.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel
@@ -186,6 +187,8 @@
# TODO: does not apply
#patch12 -p1
%patch13 -p1
+%patch14 -p0
+%patch15 -p0
for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 ; do
iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
@@ -221,30 +224,6 @@
%build
-# Intentionally not using %{version} or %{apiver} here, see %check
-vdrver=$(sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$/\1/p' config.h)
-apiver=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' config.h)
-
-# TODO: check
-cat << EOF > vdr.pc
-videodir=%{videodir}
-audiodir=%{audiodir}
-plugindir=%{plugindir}
-configdir=%{configdir}
-datadir=%{datadir}
-cachedir=%{cachedir}
-rundir=%{rundir}
-vardir=%{vardir}
-logdir=%{logdir}
-user=%{vdr_user}
-group=%{vdr_group}
-apiversion=$apiver
-
-Name: VDR
-Description: Video Disk Recorder
-Version: $vdrver
-EOF
-
cat << EOF > Make.config
CC = %{__cc}
CXX = %{__cxx}
@@ -262,19 +241,26 @@
endif
MANDIR = %{_mandir}
-BINDIR = %{_bindir}
+BINDIR = %{_sbindir}
-LOCDIR = %{_datadir}/locale
-PLUGINLIBDIR = \$(DESTDIR)\$(shell pkg-config vdr --variable=plugindir)
-VIDEODIR = \$(DESTDIR)\$(shell pkg-config vdr --variable=videodir)
-CONFDIR = \$(DESTDIR)\$(shell pkg-config vdr --variable=configdir)
+LOCDIR = \$(shell pkg-config vdr --variable=localedir)
+PLUGINLIBDIR = \$(shell pkg-config vdr --variable=plugindir)
+VIDEODIR = \$(shell pkg-config vdr --variable=videodir)
+CONFDIR = \$(shell pkg-config vdr --variable=configdir)
+INCLUDEDIR = \$(shell pkg-config vdr --variable=includedir)
LIBDIR = \$(PLUGINLIBDIR)
VDR_USER = %{vdr_user}
EOF
-export PKG_CONFIG_PATH=$(pwd)
-make %{?_smp_mflags} all include-dir
+make %{?_smp_mflags} vdr vdr.pc include-dir \
+ BINDIR=%{_sbindir} INCLUDEDIR=%{_includedir} CONFDIR=%{configdir} \
+ VIDEODIR=%{videodir} PLUGINLIBDIR=%{plugindir} LOCDIR=%{_datadir}/locale \
+ AUDIODIR=%{audiodir} DATADIR=%{datadir} CACHEDIR=%{cachedir} \
+ RUNDIR=%{rundir} VARDIR=%{vardir} VDR_GROUP=%{vdr_group}
+
+make %{?_smp_mflags} i18n LOCALEDIR=./locale
+
%if %{with docs}
make %{?_smp_mflags} srcdoc
find srcdoc -type f -size 0 -delete
@@ -297,10 +283,9 @@
install -pm 755 svdrpsend.pl $RPM_BUILD_ROOT%{_bindir}/svdrpsend
install -pm 755 epg2html.pl $RPM_BUILD_ROOT%{_bindir}/epg2html
-install -Dpm 644 vdr.1 $RPM_BUILD_ROOT%{_mandir}/man8/vdr.8
-install -Dpm 644 vdr.5 $RPM_BUILD_ROOT%{_mandir}/man5/vdr.5
-
-make install-i18n DESTDIR=$RPM_BUILD_ROOT
+export PKG_CONFIG_PATH=.
+make install-i18n install-includes install-pc install-doc \
+ PCDIR=%{_libdir}/pkgconfig DESTDIR=$RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins
install -pm 644 *.conf $RPM_BUILD_ROOT%{configdir}
@@ -349,7 +334,6 @@
install -dm 755 $RPM_BUILD_ROOT%{rundir}
install -dm 755 $RPM_BUILD_ROOT%{vardir}
touch $RPM_BUILD_ROOT%{vardir}/acpi-wakeup
-install -dm 755 $RPM_BUILD_ROOT%{logdir}
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
sed -e 's/VDR_GROUP/%{vdr_group}/' < %{SOURCE4} \
@@ -364,13 +348,9 @@
install -Dpm 644 %{name}.rwtab $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/%{name}
# devel
-install -Dpm 644 vdr.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/vdr.pc
install -pm 755 %{SOURCE9} $RPM_BUILD_ROOT%{_bindir}/vdr-config
install -pm 755 newplugin $RPM_BUILD_ROOT%{_bindir}/vdr-newplugin
-install -dm 755 $RPM_BUILD_ROOT%{_libdir}/vdr/include/vdr
install -pm 644 Make.config $RPM_BUILD_ROOT%{_libdir}/vdr
-install -dm 755 $RPM_BUILD_ROOT%{_includedir}/{vdr,libsi}
-cp -pLR include/* $RPM_BUILD_ROOT%{_includedir}/
ln -s $(abs2rel %{_includedir}/vdr/config.h %{_libdir}/vdr) \
$RPM_BUILD_ROOT%{_libdir}/vdr
@@ -461,7 +441,6 @@
%defattr(-,%{vdr_user},root,-)
%dir %{configdir}/
%dir %{configdir}/plugins/
-%dir %{logdir}/
%dir %{rundir}/
%dir %{vardir}/
%dir %{vardir}/themes/
@@ -507,6 +486,13 @@
%endif # plugins
%changelog
+* Fri Apr 4 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-0.3
+- Update liemikuutio patch to 1.20.
+- Move various (partially) upstreamable changes to patches instead of
+ inlining them in the specfile.
+- Drop unused logdir.
+- Move pre-2008 changelog entries to README.package.old.
+
* 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.
@@ -544,60 +530,3 @@
- Include Udo Richter's hard link cutter patch v0.2.0 (see README-HLCUTTER).
- Add some plugins to the default plugin order list in sysconfig.
- Minor runvdr cleanups.
-
-* Wed Oct 17 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-6
-- Add patch to start playback from recordings menu with the play button.
-
-* Fri Oct 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-5
-- Fix init script not to start a new vdr if it's already running (#247089).
-- Update subtitles+ttxtsubs patch to Rolf's latest revision.
-
-* Mon Aug 6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-4
-- License: GPL+ for skincurses and sky plugins.
-
-* Wed Aug 1 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-3
-- Sync user/group handling with current packaging guideline draft.
-- Include vdr-moveto.sh, a script for organizing recordings.
-- Refresh patches, include GPL version info in License tag.
-- Move pre-2007 %%changelog entries to CHANGES.package.old.
-- Make sure all package scriptlets exit with zero status.
-- Add LSB comment block to init script.
-
-* Mon Jun 11 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-2
-- Apply Reinhard Nißl's "sync early" patch for smoother channel changes.
-
-* Sat May 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-1
-- 1.4.7.
-
-* Tue May 1 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.6-3
-- Upstream 1.4.6-1, refresh other patches.
-
-* Mon Apr 23 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.6-2
-- Relocate themes to /var/lib/vdr/themes (#216355).
-- Tighten up some directory permissions.
-
-* Sun Mar 4 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.6-1
-- 1.4.6.
-
-* Sat Feb 24 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.5-4
-- Upstream 1.4.5-2.
-
-* Sun Jan 28 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.5-3
-- Upstream 1.4.5-1, refresh other patches.
-- Fix xineliboutput plugin name in sysconfig's VDR_PLUGIN_ORDER.
-- Delay a bit in the init script's stop function for clean shutdown.
-- Update CDDA_TRANSPORT workaround status in commands.conf abcde example.
-- Improve /sbin/halt.local explanation in README.package.
-- Minor specfile cleanups.
-
-* Sun Jan 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.5-2
-- 1.4.5, Darren Salt's 1.4.4-1.ds.
-- Make it possible to disable installed plugins in plugin sysconfig snippet.
-- Add shutdown script, document ACPI wakeup usage in README.package.
-- Shut down earlier by default for better experience with the -s option.
-- Include INSTALL in docs, it contains useful post-install info.
-- Improve remote control examples in udev rules snippet.
-- Honor $TMPDIR when running with core dumps enabled.
-- Add read only root/temporary state config.
-- Add ttxtsubs to default plugin order list.
-- Include log dir for plugins.
More information about the fedora-extras-commits
mailing list