rpms/vdr/devel vdr-CHANGES.package.old, NONE, 1.1 vdr-moveto.sh, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 vdr-README.package, 1.3, 1.4 vdr.init, 1.3, 1.4 vdr.spec, 1.13, 1.14

Ville Skytta (scop) fedora-extras-commits at redhat.com
Wed Aug 1 20:49:36 UTC 2007


Author: scop

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

Modified Files:
	.cvsignore sources vdr-README.package vdr.init vdr.spec 
Added Files:
	vdr-CHANGES.package.old vdr-moveto.sh 
Log Message:
* 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.



--- NEW FILE vdr-CHANGES.package.old ---
* Sat Nov  4 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.4-1
- 1.4.4.
- Apply epgsearch and timer info patches.
- Mark console.perms snippet noreplace again.

* Sun Oct 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.3-3
- Apply upstream 1.4.3-1 maintenance patch.
- Sync with 1.4.3-1.ds, update liemikuutio patch to 1.13.
- Drop no longer needed README.plugins.d, README.package is enough (#190343).

* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.4.3-2
- rebuilt for unwind info generation, broken in gcc-4.1.1-21

* Sat Sep 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.3-1
- 1.4.3, 1.4.2-1.ds, liemikuutio 1.12.

* Sun Sep  3 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.2-2
- 1.4.2-1, liemikuutio 1.10.

* Sun Aug 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.2-1
- 1.4.2, syscall and maintenance patches applied upstream.

* Mon Aug 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-11
- Set device permissions in both console.perms and udev (#202132).
- Implement restart and DVB module reload functionality roughly like
  upstream runvdr does it.

* Fri Aug 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-10
- Fix build with recent kernel headers where _syscallX are no longer visible.
- Drop ia64 patch (superseded by the above) and the thread poison patch.

* Fri Aug 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-9
- Set device permissions using console.perms instead of udev rules
  to work around new pam trumping udev config (#202132).

* Sun Aug  6 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-8
- Apply upstream 1.4.1-3 maintenance patch.

* Sun Jul 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-7
- Apply upstream 1.4.1-2 maintenance patch.
- Use VFAT compatible recording names by default.

* Sun Jul 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-6
- Don't use %%bcond_with to appease buildsys.

* Sat Jul 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-5
- Update liemikuutio patch to 1.8.
- Patch dumpability to work with PR_SET_DUMPABLE changes in recent kernels,
  add corresponding warning to sysconfig snippet comment.

* Sat Jul  1 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-4
- Update liemikuutio patch to 1.7.
- Conditionally build the skincurses and sky plugins; disabled by default,
  rebuild with "--with plugins" to enable.
- Make symlinks relative.

* Fri Jun 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-3
- Move headers to %%{_includedir}.
- Add README.package to docs, describing some aspects of the package (#1063).
- Add LIBDIR to Make.config to ease local plugin builds (#1063).
- Update VDR_PLUGIN_ORDER in sysconfig snippet, loading potential output
  plugins before others.  See commentary in the file for details.
- Add example how to affect OSD time/date formats to sysconfig snippet.

* Sun Jun 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-2
- 1.4.1-1 + 1.4.1-1.ds.
- Drop glibc-kernheaders dependency from -devel too.
- Make -devel multilib friendly, add pkgconfig file.

* Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-1
- 1.4.1, liemikuutio 1.6.

* Mon May 29 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.0-5
- Address some review notes in #190343 comment 2:
- Add example udev rule for predictable remote control device naming.
- Drop glibc-kernheaders build dependency.
- Specfile cleanups.

* Sun May 28 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.0-4
- Apply upstream 1.4.0-2 maintenance patch.

* Sun May 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.0-3
- Apply upstream 1.4.0-1 maintenance patch.
- Drop unneeded version check from %%check.

* Mon May  1 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.0-2
- Sync with 1.4.0-1.ds.

* Sun Apr 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.0-1
- 1.4.0 + 1.3.48-1.ds, re-enable reload patch.

* Sun Apr 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.48-1
- 1.3.48, no need to rebuild plugins, woo-hoo!

* Mon Apr 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.47-1
- 1.3.47 + the usual patchwork.
- Trim pre-RLO %%changelog entries.
- Add vdr(abi) and vdr-devel(api) versioned Provides for plugin versioning
  and --version and --apiversion to vdr-config, see HISTORY.
- Use sed instead of perl for edits during the build.
- Temporarily disable reload/SIGUSR1 patch.

* Sun Apr  9 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.46-1
- 1.3.46 + the usual patchwork.

* Sun Mar 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.45-1
- 1.3.45 + 1.3.44-2.ds + Rofa's mute fix.

* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field

* Sun Mar  5 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.44-0.lvn.2
- Sync with 1.3.44-1.ds, apply Rolf Ahrenberg's readline fix.

* Wed Mar  1 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.44-0.lvn.1
- 1.3.44, include Marko Mäkelä's suspend patch.
- Move runvdr to %%{_sbindir} and make it option-compatible with the
  upstream one.  If VDR_INIT is non-empty in the environment, automatic
  command line building is enabled.  The init script still does that.
  Also makes the init script and runvdr easier to adapt to alternative
  init systems such as initng (#781).

* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist

* Tue Feb 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.43-0.lvn.2
- Sync with 1.3.43-1.ds.

* Sun Feb 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.43-0.lvn.1
- 1.3.43 + 1.3.42-2.ds + Rolf Ahrenberg's audiotracks patch.
- Drop Reinhard Nißl's dvbplayer patch at least for now.

* Sun Feb  5 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.42-0.lvn.1
- 1.3.42; dumpable, menu-in-replay and constness patches applied upstream.
- Make udev rules work as expected with later udev versions.

* Sun Jan 29 2006 Ville Skyttä <ville.skytta at iki.fi>
- 1.3.41; Finnish, EPG null title and LIRC reconnect patches
  applied/obsoleted upstream.
- Revert back to Udo Richter's more general purpose "menu in replay" patch.

* Sat Jan 28 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.40-0.lvn.3
- Patch LIRC support to try to reconnect if lircd connection is lost.
- Update liemikuutio patch to 1.2.

* Mon Jan 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.40-0.lvn.2
- Replace EPG null title crash fix with upstream one.

* Sun Jan 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.40-0.lvn.1
- 1.3.40, key macro and SVDRP CLRE crash patches applied upstream.
- Replace menu tweak patch with one from Luca Olivetti.

* Wed Jan 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.39-0.lvn.3
- Fix sysconfig stupidity introduced in 0.lvn.2, _only_ DAEMON_COREFILE_LIMIT
  was taken into account :P

* Mon Jan 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.39-0.lvn.2
- Apply upstream key macro and SVDRP CLRE crash patches.
- Source sysconfig snippet again in init script (so that eg.
  DAEMON_COREFILE_LIMIT etc works as expected).

* Sun Jan 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.39-0.lvn.1
- 1.3.39 + the usual patch shuffling, kudos to Rolf Ahrenberg and Udo
  Richter.

* Wed Jan 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.38-0.lvn.4
- Apply upstream menu fix patch.
- Add some comments to sysconfig file.

* Tue Jan 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.38-0.lvn.3
- Sync with 1.3.38-2.ds.

* Mon Jan  9 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.38-0.lvn.2
- Sync with 1.3.38-1.ds.
- Remove references to the removed ca.conf from the manpage.

* Sun Jan  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.38-0.lvn.1
- 1.3.38, su/capabilities stuff, low disk space crash, CAN-2005-0071,
  audio pids and timed recording deletion patches applied upstream.
- Patch to allow core dumps and startup script simplifications with the
  newly introduced set[ug]id functionality.
- Patch to fix gettid usage (includes).
- enAIO patchset replaced by liemikuutio 1.0.
- Updated Finnish translations.

* Wed Jan  4 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.37-0.lvn.3
- Fix syntax error in sysconfig file (#714, Scott Tsai).
- Change built-in default of epg.data location to %%{cachedir}, drop it
  from the sysconfig file and update docs.

* Sat Dec 10 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.37-0.lvn.2
- Apply "low disk space" message crash from Andreas Brachold.
- Apply upstream fix for 2nd audio pid and live DD on encrypted channels.
- Add (commented out) sysconfig and console.perms.d samples for setting and
  retaining VDR-friendly CD/DVD drive permissions.
- Sync with 1.3.37-1.ds.

* Mon Nov 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.37-0.lvn.1
- 1.3.37.

* Sat Nov 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.36-0.lvn.2
- Default config improvements.
- Sync with 1.3.36-1.ds.

* Sun Nov  6 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.36-0.lvn.1
- 1.3.36, recording end crash fix applied upstream.
- Don't load LIRC unconditionally, pass --lirc by default in sysconfig/vdr.

* Tue Nov  1 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.35-0.lvn.1
- 1.3.35 + Joachim Wilke's recording end crash fix; Finnish, daemon and
  infloop patches applied upstream.

* Sun Oct 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.34-0.lvn.2
- Update enAIO patch to 2.7.
- Apply daemon and menu infinite loop patches from Enrico Scholz.

* Fri Oct  7 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.34-0.lvn.1
- 1.3.34 + 1.3.34-1.ds + Rolf Ahrenberg's Finnish i18n fixes.

* Sun Sep 25 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.33-0.lvn.1
- 1.3.33.
- Sync with 1.3.32-1.ds.
- Apply enAIO patch.

* Fri Sep 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.32-0.lvn.2
- Fix init script on multilib archs (#596, Jussi Lehtola).

* Sun Sep 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.32-0.lvn.1
- 1.3.32, bunch of patches applied upstream.
- Drop main package dependency from -devel.

* Sun Aug 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.31-0.lvn.1
- 1.3.31 + upstream warnings fix + Reinhard Nißl's patch bomb.
- Ship plugin creator script in -devel.

* Mon Aug 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.30-0.lvn.2
- Don't use stuff from the su/capabilities patch by default, it causes
  problems with getting core dumps if plugins crash.
- Simplify things by splitting stuff from init script to separate launcher.
- Sync with 1.3.30-1.ds, fix a warning in the svdrp grab patch.
- Add audio CD ripping example to commands.conf.

* Sun Aug 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.30-0.lvn.1
- 1.3.30, PPC/unaligned patch no longer needed.
- Tune default plugin load order, add muggle.
- Minor init script improvements.

* Wed Aug 17 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.29-0.lvn.2
- Sync with Darren Salt's 1.3.29-1.ds.
- Drop dvbplayer patch; no longer needed for recent recordings.
- Patch/hack (from reiserfsprogs) to fix PPC build (asm/unaligned.h).
- Start up earlier/shut down later by default at boot/shutdown.
- Add vardir for storing non-cache, non-video data; and audiodir for
  audio plugins.

* Mon Aug 15 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.29-0.lvn.1
- 1.3.29, Finnish patch applied upstream.

* Sat Aug 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.28-1.lvn.2
- Apply Rolf Ahrenberg's newest Finnish patch.
- Drop historical conflict with an old vdr-dxr3 snapshot.

* Thu Aug 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.28-1.lvn.1
- Truncate config files in more portable manner during build.


--- NEW FILE vdr-moveto.sh ---
#!/bin/sh

# vdr-moveto.sh -- simple script for moving recordings to folders
# Ville Skyttä 2007, Public Domain
#
# The preferred way to use this script is through VDR's recording commands
# menu.  To do that, add entries eg. like these to /etc/vdr/reccmds.conf:
#
# Move to movies: vdr-moveto.sh 00_Movies
# Move to music: vdr-moveto.sh 00_Music

videodir="/srv/vdr"

to="$videodir/$1"
what="$2"
if [ -z "$what" ] ; then
    echo "Usage: $0 TO-DIR WHAT"
    exit 1
fi

mkdir -p "$to"
dir="$(dirname $what)"
todir="$to/$(basename $dir)"
if [ -d "$todir" ] ; then
    mv -v "$what" "$todir"
    rmdir -v "$dir"
else
    mv -v "$dir" "$to"
fi

touch "$videodir/.update"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 May 2007 14:32:11 -0000	1.11
+++ .cvsignore	1 Aug 2007 20:49:04 -0000	1.12
@@ -1,3 +1,3 @@
 vdr_1.4.5-2.ds.diff.gz
-vdr-1.4.6-liemikuutio-1.13.diff.gz
 vdr-1.4.7.tar.bz2
+vdr-1.4.7-liemikuutio-1.13.diff.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 May 2007 14:32:11 -0000	1.11
+++ sources	1 Aug 2007 20:49:04 -0000	1.12
@@ -1,3 +1,3 @@
 3e9287f726df5a667054a15078235791  vdr_1.4.5-2.ds.diff.gz
-7616b9dddf6bd766ee0db0edbd651e54  vdr-1.4.6-liemikuutio-1.13.diff.gz
 81be33a0edb93288ca3d235a04107ec4  vdr-1.4.7.tar.bz2
+7b43fa7a9c0d45e5f24ba6143926e720  vdr-1.4.7-liemikuutio-1.13.diff.gz


Index: vdr-README.package
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr-README.package,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vdr-README.package	28 Jan 2007 11:11:18 -0000	1.3
+++ vdr-README.package	1 Aug 2007 20:49:04 -0000	1.4
@@ -88,3 +88,10 @@
         echo -n "Setting ACPI wakeup for next VDR timer: " ; cat $wakeupfile
         cat $wakeupfile > /proc/acpi/alarm
     fi
+
+Organizing recordings
+---------------------
+
+A simple sample script for organizing recordings into folders, vdr-moveto.sh,
+is shipped in the /usr/lib*/vdr/bin directory.  See commentary in it for
+usage information.


Index: vdr.init
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vdr.init	28 Jan 2007 11:11:18 -0000	1.3
+++ vdr.init	1 Aug 2007 20:49:04 -0000	1.4
@@ -10,6 +10,18 @@
 #              is required to run VDR.
 # processname: vdr
 
+### BEGIN INIT INFO
+# Provides: vdr
+# Should-Start: $syslog $network lirc
+# Should-Stop: $syslog $network lirc
+# Short-Description: Video Disk Recorder
+# Description: Video Disk Recorder (VDR) implements a complete digital
+#              set-top-box and video recorder.  It can work with signals
+#              received from satellites (DVB-S) as well as cable (DVB-C)
+#              and terrestrial (DVB-T) signals.  At least one DVB card
+#              is required to run VDR.
+### END INIT INFO
+
 # Source function library.
 . /etc/rc.d/init.d/functions
 


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vdr.spec	11 Jun 2007 16:46:52 -0000	1.13
+++ vdr.spec	1 Aug 2007 20:49:04 -0000	1.14
@@ -19,11 +19,11 @@
 
 Name:           vdr
 Version:        1.4.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://www.cadsoft.de/vdr/
 Source0:        ftp://ftp.cadsoft.de/vdr/%{name}-%{version}.tar.bz2
 Source1:        %{name}.init
@@ -39,9 +39,11 @@
 Source12:       %{name}-sky.conf
 Source13:       %{name}-timercmds.conf
 Source14:       %{name}-shutdown.sh
+Source15:       %{name}-moveto.sh
+Source16:       %{name}-CHANGES.package.old
 Patch0:         %{name}-channel+epg.patch
-Patch1:         http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr_1.4.5-2.ds.diff.gz
-Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.6-liemikuutio-1.13.diff.gz
+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.4.7-liemikuutio-1.13.diff.gz
 Patch3:         %{name}-1.4.6-paths.patch
 Patch4:         %{name}-1.4.1-dumpable.patch
 # http://article.gmane.org/gmane.linux.vdr/32708
@@ -53,8 +55,7 @@
 BuildRequires:  pkgconfig
 BuildRequires:  perl(File::Spec)
 Requires:       udev
-Requires(pre):  %{_sbindir}/groupadd
-Requires(pre):  %{_sbindir}/useradd
+Requires(pre):  shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Provides:       vdr(abi) = %{apiver}
@@ -165,6 +166,7 @@
 cat /dev/null > timers.conf
 
 install -pm 644 %{SOURCE10} README.package
+install -pm 644 %{SOURCE16} CHANGES.package.old
 
 # Would like to do "files {channels,setup,timers}.conf" from config dir
 # only, but rename() in cSafeFile barks "device or resource busy", cf.
@@ -283,6 +285,10 @@
 sed -e 's|/var/lib/vdr/|%{vardir}/|' < %{SOURCE14} \
   > $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-shutdown.sh
 chmod 755 $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-shutdown.sh
+sed -e 's|/srv/vdr|%{videodir}|' -e 's|/etc/vdr/|%{configdir}/|' \
+  < %{SOURCE15} > $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-moveto.sh
+chmod 755 $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-moveto.sh
+
 install -dm 755 $RPM_BUILD_ROOT%{cachedir}
 touch $RPM_BUILD_ROOT%{cachedir}/epg.data
 install -dm 755 $RPM_BUILD_ROOT%{datadir}/logos
@@ -343,18 +349,21 @@
 
 
 %pre
-%{_sbindir}/groupadd -r video 2>/dev/null || :
-%{_sbindir}/useradd -c "Video Disk Recorder" -d %{videodir} \
-  -g %{vdr_group} -M -n -r -s /sbin/nologin %{vdr_user} 2>/dev/null || :
+getent group %{vdr_group} >/dev/null || groupadd -r %{vdr_group}
+getent passwd %{vdr_user} >/dev/null || \
+useradd -r -g %{vdr_group} -d %{videodir} -s /sbin/nologin -M -n \
+    -c "Video Disk Recorder" %{vdr_user}
+:
 
 %post
-/sbin/chkconfig --add vdr
+/sbin/chkconfig --add vdr || :
 
 %preun
 if [ $1 -eq 0 ] ; then
-    %{_initrddir}/vdr stop >/dev/null 2>&1 || :
+    %{_initrddir}/vdr stop >/dev/null 2>&1
     /sbin/chkconfig --del vdr
 fi
+:
 
 %postun
 [ $1 -gt 0 ] && %{_initrddir}/vdr try-restart >/dev/null || :
@@ -363,6 +372,7 @@
 %files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS COPYING HISTORY* INSTALL MANUAL README* UPDATE-1.[24].0
+%doc CHANGES.package.old
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
@@ -375,6 +385,7 @@
 %{_sbindir}/vdr
 %dir %{plugindir}/
 %dir %{plugindir}/bin/
+%{plugindir}/bin/%{name}-moveto.sh
 %{plugindir}/bin/%{name}-shutdown.sh
 %{datadir}/
 %{_mandir}/man[58]/vdr.[58]*
@@ -426,6 +437,14 @@
 %endif
 
 %changelog
+* 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.
 
@@ -464,268 +483,3 @@
 - 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.
-- Mark console.perms snippet noreplace again.
-
-* Sun Oct 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.3-3
-- Apply upstream 1.4.3-1 maintenance patch.
-- Sync with 1.4.3-1.ds, update liemikuutio patch to 1.13.
-- Drop no longer needed README.plugins.d, README.package is enough (#190343).
-
-* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.4.3-2
-- rebuilt for unwind info generation, broken in gcc-4.1.1-21
-
-* Sat Sep 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.3-1
-- 1.4.3, 1.4.2-1.ds, liemikuutio 1.12.
-
-* Sun Sep  3 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.2-2
-- 1.4.2-1, liemikuutio 1.10.
-
-* Sun Aug 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.2-1
-- 1.4.2, syscall and maintenance patches applied upstream.
-
-* Mon Aug 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-11
-- Set device permissions in both console.perms and udev (#202132).
-- Implement restart and DVB module reload functionality roughly like
-  upstream runvdr does it.
-
-* Fri Aug 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-10
-- Fix build with recent kernel headers where _syscallX are no longer visible.
-- Drop ia64 patch (superseded by the above) and the thread poison patch.
-
-* Fri Aug 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-9
-- Set device permissions using console.perms instead of udev rules
-  to work around new pam trumping udev config (#202132).
-
-* Sun Aug  6 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-8
-- Apply upstream 1.4.1-3 maintenance patch.
-
-* Sun Jul 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-7
-- Apply upstream 1.4.1-2 maintenance patch.
-- Use VFAT compatible recording names by default.
-
-* Sun Jul 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-6
-- Don't use %%bcond_with to appease buildsys.
-
-* Sat Jul 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-5
-- Update liemikuutio patch to 1.8.
-- Patch dumpability to work with PR_SET_DUMPABLE changes in recent kernels,
-  add corresponding warning to sysconfig snippet comment.
-
-* Sat Jul  1 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-4
-- Update liemikuutio patch to 1.7.
-- Conditionally build the skincurses and sky plugins; disabled by default,
-  rebuild with "--with plugins" to enable.
-- Make symlinks relative.
-
-* Fri Jun 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-3
-- Move headers to %%{_includedir}.
-- Add README.package to docs, describing some aspects of the package (#1063).
-- Add LIBDIR to Make.config to ease local plugin builds (#1063).
-- Update VDR_PLUGIN_ORDER in sysconfig snippet, loading potential output
-  plugins before others.  See commentary in the file for details.
-- Add example how to affect OSD time/date formats to sysconfig snippet.
-
-* Sun Jun 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-2
-- 1.4.1-1 + 1.4.1-1.ds.
-- Drop glibc-kernheaders dependency from -devel too.
-- Make -devel multilib friendly, add pkgconfig file.
-
-* Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.1-1
-- 1.4.1, liemikuutio 1.6.
-
-* Mon May 29 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.0-5
-- Address some review notes in #190343 comment 2:
-- Add example udev rule for predictable remote control device naming.
-- Drop glibc-kernheaders build dependency.
-- Specfile cleanups.
-
-* Sun May 28 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.0-4
-- Apply upstream 1.4.0-2 maintenance patch.
-
-* Sun May 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.0-3
-- Apply upstream 1.4.0-1 maintenance patch.
-- Drop unneeded version check from %%check.
-
-* Mon May  1 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.0-2
-- Sync with 1.4.0-1.ds.
-
-* Sun Apr 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.0-1
-- 1.4.0 + 1.3.48-1.ds, re-enable reload patch.
-
-* Sun Apr 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.48-1
-- 1.3.48, no need to rebuild plugins, woo-hoo!
-
-* Mon Apr 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.47-1
-- 1.3.47 + the usual patchwork.
-- Trim pre-RLO %%changelog entries.
-- Add vdr(abi) and vdr-devel(api) versioned Provides for plugin versioning
-  and --version and --apiversion to vdr-config, see HISTORY.
-- Use sed instead of perl for edits during the build.
-- Temporarily disable reload/SIGUSR1 patch.
-
-* Sun Apr  9 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.46-1
-- 1.3.46 + the usual patchwork.
-
-* Sun Mar 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.45-1
-- 1.3.45 + 1.3.44-2.ds + Rofa's mute fix.
-
-* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- switch to new release field
-
-* Sun Mar  5 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.44-0.lvn.2
-- Sync with 1.3.44-1.ds, apply Rolf Ahrenberg's readline fix.
-
-* Wed Mar  1 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.44-0.lvn.1
-- 1.3.44, include Marko Mäkelä's suspend patch.
-- Move runvdr to %%{_sbindir} and make it option-compatible with the
-  upstream one.  If VDR_INIT is non-empty in the environment, automatic
-  command line building is enabled.  The init script still does that.
-  Also makes the init script and runvdr easier to adapt to alternative
-  init systems such as initng (#781).
-
-* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- add dist
-
-* Tue Feb 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.43-0.lvn.2
-- Sync with 1.3.43-1.ds.
-
-* Sun Feb 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.43-0.lvn.1
-- 1.3.43 + 1.3.42-2.ds + Rolf Ahrenberg's audiotracks patch.
-- Drop Reinhard Nißl's dvbplayer patch at least for now.
-
-* Sun Feb  5 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.42-0.lvn.1
-- 1.3.42; dumpable, menu-in-replay and constness patches applied upstream.
-- Make udev rules work as expected with later udev versions.
-
-* Sun Jan 29 2006 Ville Skyttä <ville.skytta at iki.fi>
-- 1.3.41; Finnish, EPG null title and LIRC reconnect patches
-  applied/obsoleted upstream.
-- Revert back to Udo Richter's more general purpose "menu in replay" patch.
-
-* Sat Jan 28 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.40-0.lvn.3
-- Patch LIRC support to try to reconnect if lircd connection is lost.
-- Update liemikuutio patch to 1.2.
-
-* Mon Jan 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.40-0.lvn.2
-- Replace EPG null title crash fix with upstream one.
-
-* Sun Jan 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.40-0.lvn.1
-- 1.3.40, key macro and SVDRP CLRE crash patches applied upstream.
-- Replace menu tweak patch with one from Luca Olivetti.
-
-* Wed Jan 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.39-0.lvn.3
-- Fix sysconfig stupidity introduced in 0.lvn.2, _only_ DAEMON_COREFILE_LIMIT
-  was taken into account :P
-
-* Mon Jan 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.39-0.lvn.2
-- Apply upstream key macro and SVDRP CLRE crash patches.
-- Source sysconfig snippet again in init script (so that eg.
-  DAEMON_COREFILE_LIMIT etc works as expected).
-
-* Sun Jan 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.39-0.lvn.1
-- 1.3.39 + the usual patch shuffling, kudos to Rolf Ahrenberg and Udo
-  Richter.
-
-* Wed Jan 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.38-0.lvn.4
-- Apply upstream menu fix patch.
-- Add some comments to sysconfig file.
-
-* Tue Jan 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.38-0.lvn.3
-- Sync with 1.3.38-2.ds.
-
-* Mon Jan  9 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.38-0.lvn.2
-- Sync with 1.3.38-1.ds.
-- Remove references to the removed ca.conf from the manpage.
-
-* Sun Jan  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.38-0.lvn.1
-- 1.3.38, su/capabilities stuff, low disk space crash, CAN-2005-0071,
-  audio pids and timed recording deletion patches applied upstream.
-- Patch to allow core dumps and startup script simplifications with the
-  newly introduced set[ug]id functionality.
-- Patch to fix gettid usage (includes).
-- enAIO patchset replaced by liemikuutio 1.0.
-- Updated Finnish translations.
-
-* Wed Jan  4 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.3.37-0.lvn.3
-- Fix syntax error in sysconfig file (#714, Scott Tsai).
-- Change built-in default of epg.data location to %%{cachedir}, drop it
-  from the sysconfig file and update docs.
-
-* Sat Dec 10 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.37-0.lvn.2
-- Apply "low disk space" message crash from Andreas Brachold.
-- Apply upstream fix for 2nd audio pid and live DD on encrypted channels.
-- Add (commented out) sysconfig and console.perms.d samples for setting and
-  retaining VDR-friendly CD/DVD drive permissions.
-- Sync with 1.3.37-1.ds.
-
-* Mon Nov 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.37-0.lvn.1
-- 1.3.37.
-
-* Sat Nov 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.36-0.lvn.2
-- Default config improvements.
-- Sync with 1.3.36-1.ds.
-
-* Sun Nov  6 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.36-0.lvn.1
-- 1.3.36, recording end crash fix applied upstream.
-- Don't load LIRC unconditionally, pass --lirc by default in sysconfig/vdr.
-
-* Tue Nov  1 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.35-0.lvn.1
-- 1.3.35 + Joachim Wilke's recording end crash fix; Finnish, daemon and
-  infloop patches applied upstream.
-
-* Sun Oct 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.34-0.lvn.2
-- Update enAIO patch to 2.7.
-- Apply daemon and menu infinite loop patches from Enrico Scholz.
-
-* Fri Oct  7 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.34-0.lvn.1
-- 1.3.34 + 1.3.34-1.ds + Rolf Ahrenberg's Finnish i18n fixes.
-
-* Sun Sep 25 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.33-0.lvn.1
-- 1.3.33.
-- Sync with 1.3.32-1.ds.
-- Apply enAIO patch.
-
-* Fri Sep 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.32-0.lvn.2
-- Fix init script on multilib archs (#596, Jussi Lehtola).
-
-* Sun Sep 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.32-0.lvn.1
-- 1.3.32, bunch of patches applied upstream.
-- Drop main package dependency from -devel.
-
-* Sun Aug 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.31-0.lvn.1
-- 1.3.31 + upstream warnings fix + Reinhard Nißl's patch bomb.
-- Ship plugin creator script in -devel.
-
-* Mon Aug 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.30-0.lvn.2
-- Don't use stuff from the su/capabilities patch by default, it causes
-  problems with getting core dumps if plugins crash.
-- Simplify things by splitting stuff from init script to separate launcher.
-- Sync with 1.3.30-1.ds, fix a warning in the svdrp grab patch.
-- Add audio CD ripping example to commands.conf.
-
-* Sun Aug 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.30-0.lvn.1
-- 1.3.30, PPC/unaligned patch no longer needed.
-- Tune default plugin load order, add muggle.
-- Minor init script improvements.
-
-* Wed Aug 17 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.29-0.lvn.2
-- Sync with Darren Salt's 1.3.29-1.ds.
-- Drop dvbplayer patch; no longer needed for recent recordings.
-- Patch/hack (from reiserfsprogs) to fix PPC build (asm/unaligned.h).
-- Start up earlier/shut down later by default at boot/shutdown.
-- Add vardir for storing non-cache, non-video data; and audiodir for
-  audio plugins.
-
-* Mon Aug 15 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.29-0.lvn.1
-- 1.3.29, Finnish patch applied upstream.
-
-* Sat Aug 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.28-1.lvn.2
-- Apply Rolf Ahrenberg's newest Finnish patch.
-- Drop historical conflict with an old vdr-dxr3 snapshot.
-
-* Thu Aug 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.3.28-1.lvn.1
-- Truncate config files in more portable manner during build.




More information about the fedora-extras-commits mailing list