scop pushed to vdr (f22). "Add edit recording patch, make use of systemd notification support"

[notifications at fedoraproject.org]

>From 81642f4f0fac4bd13632918f657ecf7218962676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
Date: Sat, 21 Feb 2015 17:42:57 +0200
Subject: Add edit recording patch, make use of systemd notification support


diff --git a/sources b/sources
index 4e40a97..51a8434 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,5 @@
 3e9287f726df5a667054a15078235791  vdr_1.4.5-2.ds.diff.gz
-b01a5d964af6379af5e7aa0f5203e1d3  vdr-2.1.9-menuselection.patch.gz
 8853f64c0fc3d41ffd3b4bfc6f0a14b7  vdr-2.2.0.tar.bz2
 f84cc801c1495829ef0f22b768dcfb2f  vdr_2.0.6-2.debian.tar.bz2
+77a858732829b95351a67dfe660b1c11  vdr-2.2.0-editrecording.patch.gz
+f238e515be830ecc594a044bd8c8dbf6  vdr-2.2.0-menuselection.patch.gz
diff --git a/vdr.service b/vdr.service
index 3a2dd9a..030c219 100644
--- a/vdr.service
+++ b/vdr.service
@@ -6,6 +6,7 @@ Documentation=file:///usr/share/doc/vdr/INSTALL
 After=network.target
 
 [Service]
+Type=notify
 ExecStartPre=/usr/lib/vdr/bin/vdr-check-setup
 ExecStart=/usr/sbin/runvdr
 ExecStop=-/usr/lib/vdr/bin/vdr-set-wakeup
diff --git a/vdr.spec b/vdr.spec
index b432a6c..3c2686c 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -24,7 +24,7 @@
 
 Name:           vdr
 Version:        2.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Video Disk Recorder
 
 License:        GPLv2+
@@ -53,6 +53,7 @@ Source20:       %{name}-rcu.conf
 Source21:       %{name}-set-wakeup.sh
 Patch0:         %{name}-channel+epg.patch
 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-2.2.0-editrecording.patch.gz
 # Extracted from http://copperhead.htpc-forum.de/downloads/extensionpatch/extpngvdr1.7.21v1.diff.gz
 Patch3:         %{name}-1.7.21-plugin-missing.patch
 Patch4:         %{name}-1.7.41-paths.patch
@@ -73,7 +74,7 @@ Patch13:        http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/p
 Patch15:        %{name}-1.7.37-fedora-pkgconfig.patch
 Patch17:        http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/plain/patches/vdr.epgsearch-exttimeredit-0.0.2.diff
 Patch18:        %{name}-timer-info-2.2.0.patch
-Patch19:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-2.1.9-menuselection.patch.gz
+Patch19:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-2.2.0-menuselection.patch.gz
 
 BuildRequires:  libjpeg-devel
 BuildRequires:  libcap-devel
@@ -175,6 +176,7 @@ patch -F 2 -i debian/patches/07_blockify_define.dpatch
 # TODO: does not apply
 #patch -F 0 -i debian/patches/10_livelock.dpatch
 patch -F 0 -i debian/patches/12_osdbase-maxitems.patch
+%patch2 -p1
 %patch3 -p1
 sed \
     -e 's|__CACHEDIR__|%{cachedir}|'   \
@@ -557,6 +559,10 @@ useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -N \
 
 
 %changelog
+* Sat Feb 21 2015 Ville Skyttä <ville.skytta at iki.fi> - 2.2.0-3
+- Add edit recording patch by Rolf Ahrenberg
+- Make use of systemd notification in service
+
 * Thu Feb 19 2015 Ville Skyttä <ville.skytta at iki.fi> - 2.2.0-2
 - Enable systemd notification support
 - Refresh some patches
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/vdr.git/commit/?h=f22&id=81642f4f0fac4bd13632918f657ecf7218962676