From 9389f2aa3b5f388a5eacbce3f1de38e655802892 Mon Sep 17 00:00:00 2001
From: Petr Písař <ppisar@redhat.com>
Date: Feb 12 2013 10:22:36 +0000
Subject: Require systemd instead of systemd-units since F18


---

diff --git a/cvs.spec b/cvs.spec
index b4fddcb..29315cc 100644
--- a/cvs.spec
+++ b/cvs.spec
@@ -5,7 +5,7 @@
 
 Name: cvs
 Version: 1.11.23
-Release: 28%{?dist}
+Release: 29%{?dist}
 Summary: Concurrent Versions System
 Group: Development/Tools
 URL: http://cvs.nongnu.org/
@@ -21,9 +21,9 @@ Source3: cvs.sh
 Source4: cvs.csh
 Source5: cvs@.service
 Source6: cvs.socket
-Requires(post): /sbin/install-info, systemd-units
-Requires(preun): /sbin/install-info, systemd-units
-Requires(postun): systemd-units
+Requires(post): /sbin/install-info, systemd
+Requires(preun): /sbin/install-info, systemd
+Requires(postun): systemd
 Requires: vim-minimal
 BuildRequires: autoconf >= 2.58, automake >= 1.7.9, libtool, zlib-devel
 BuildRequires: vim-minimal
@@ -36,7 +36,7 @@ BuildRequires: pam-devel
 # texinfo required for
 # cvs-1.11.23-Back-port-KeywordExpand-configuration-keyword.patch
 BuildRequires: texinfo
-BuildRequires: systemd-units
+BuildRequires: systemd
 
 # Fix up initial cvs login, bug #47457
 Patch0: cvs-1.11.22-cvspass.patch
@@ -230,7 +230,7 @@ install -p -m 644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/cvs.socket
 %post
 /sbin/install-info %{_infodir}/cvs.info.gz %{_infodir}/dir
 /sbin/install-info %{_infodir}/cvsclient.info.gz %{_infodir}/dir
-%systemd_post cvs@.service
+%systemd_post cvs.socket
 exit 0
 
 %preun
@@ -239,11 +239,11 @@ if [ $1 -eq 0 ] ; then
     /sbin/install-info --delete %{_infodir}/cvs.info.gz %{_infodir}/dir
     /sbin/install-info --delete %{_infodir}/cvsclient.info.gz %{_infodir}/dir
 fi
-%systemd_preun cvs@.service
+%systemd_preun cvs.socket
 exit 0
 
 %postun
-%systemd_postun_with_restart cvs@.service
+%systemd_postun_with_restart cvs.socket
 
 
 %files
@@ -272,6 +272,9 @@ exit 0
 
 
 %changelog
+* Tue Feb 12 2013 Petr Pisar <ppisar@redhat.com> - 1.11.23-29
+- Correct handling systemd service (bug #737264)
+
 * Tue Aug 28 2012 Petr Pisar <ppisar@redhat.com> - 1.11.23-28
 - Document patches and add Public Domain license