rpms/vdr/devel .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 vdr.spec, 1.40, 1.41

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2289

Modified Files:
	.cvsignore sources vdr.spec 
Log Message:
* Tue Apr 14 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-20
- Use useradd -N instead of -n in scriptlets (#495731).
- Include Rolf Ahrenberg's sys_nice and ionice patches.
- Update liemikuutio patch to 1.25.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	1 Mar 2009 15:11:33 -0000	1.18
+++ .cvsignore	14 Apr 2009 15:27:38 -0000	1.19
@@ -6,5 +6,7 @@
 vdr-1.6.0-2.diff
 vdr-timer-info-0.5-1.5.15.diff
 vdr-1.6.0-2-ttxtsubs.patch
-vdr-1.6.0-liemikuutio-1.24.diff.gz
 vdr-1.6.0-subtitles-button.patch.gz
+vdr-1.6.0-liemikuutio-1.25.diff.gz
+vdr-1.6.0-ionice.patch.gz
+vdr-1.6.0-cap_sys_nice.patch.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	1 Mar 2009 15:11:33 -0000	1.18
+++ sources	14 Apr 2009 15:27:38 -0000	1.19
@@ -6,5 +6,7 @@
 875b66a90d1c6f2e25aa1221b319136b  vdr-1.6.0-2.diff
 92ee6cdf60b795d9fbcf4fdcafe401b4  vdr-timer-info-0.5-1.5.15.diff
 ded3dacb4be2958c03a50e3064164eb8  vdr-1.6.0-2-ttxtsubs.patch
-a77e4db7aa22f11cfc397a2070b187db  vdr-1.6.0-liemikuutio-1.24.diff.gz
 bd3221bb080788a87b4560eb0f323f2b  vdr-1.6.0-subtitles-button.patch.gz
+122b40baef4d0c9a3e31e91b1c877e5b  vdr-1.6.0-liemikuutio-1.25.diff.gz
+bc2dbfe11e0ddbc791ceb2f659081c8c  vdr-1.6.0-ionice.patch.gz
+32004893569e9a68f17d2b4b93410ed5  vdr-1.6.0-cap_sys_nice.patch.gz


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- vdr.spec	1 Mar 2009 15:11:33 -0000	1.40
+++ vdr.spec	14 Apr 2009 15:27:39 -0000	1.41
@@ -24,7 +24,7 @@
 
 Name:           vdr
 Version:        1.6.0
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -53,7 +53,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.24.diff.gz
+Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-liemikuutio-1.25.diff.gz
 Patch3:         %{name}-1.6.0-scriptnames.patch
 Patch4:         %{name}-1.6.0-paths.patch
 Patch5:         %{name}-1.5.18-use-pkgconfig.patch
@@ -80,6 +80,8 @@
 Patch19:        ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.6.0-2.diff
 Patch20:        %{name}-1.6.0-remove-dvb-abi-check.patch
 Patch21:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-subtitles-button.patch.gz
+Patch22:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-cap_sys_nice.patch.gz
+Patch23:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-ionice.patch.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -95,7 +97,8 @@
 %endif # docs
 # udev >= 136-1 for the video group
 Requires:       udev >= 136-1
-Requires(pre):  shadow-utils
+# shadow-utils >= 4.1.1 for useradd -N
+Requires(pre):  shadow-utils >= 2:4.1.1
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Provides:       vdr(abi) = %{apiver}
@@ -197,6 +200,8 @@
 %patch19 -p1
 %patch20 -p0
 %patch21 -p1
+%patch22 -p1
+%patch23 -p1
 
 for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 README.timer-info ; do
   iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
@@ -404,7 +409,7 @@
 
 %pre
 getent passwd %{vdr_user} >/dev/null || \
-useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -n \
+useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -N \
     -c "Video Disk Recorder" %{vdr_user}
 :
 
@@ -519,6 +524,11 @@
 %endif # plugins
 
 %changelog
+* Tue Apr 14 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-20
+- Use useradd -N instead of -n in scriptlets (#495731).
+- Include Rolf Ahrenberg's sys_nice and ionice patches.
+- Update liemikuutio patch to 1.25.
+
 * Sat Feb 28 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-19
 - Update liemikuutio patch to 1.24 to fix some issues with gcc 4.4.
 - Apply Rolf Ahrenberg's patch to include audio and subtitles shortcut