From 348857914e33b49854add3250f5c684f57fc5c33 Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Wed, 3 Jul 2013 18:45:14 +0200 Subject: [PATCH] Replacing systemd unit path with _unitdir macro --- gpm.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gpm.spec b/gpm.spec index c38adbf..fcf649e 100644 --- a/gpm.spec +++ b/gpm.spec @@ -1,7 +1,7 @@ Summary: A mouse server for the Linux console Name: gpm Version: 1.20.6 -Release: 32%{?dist} +Release: 33%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://www.nico.schottelius.org/software/gpm/ @@ -18,12 +18,13 @@ Patch7: 0001-rhbz-668480-gpm-types-7-manpage-fixes.patch Patch8: gpm-1.20.6-missing-header-dir-in-make-depend.patch Patch9: gpm-aarch64.patch #Patch7: gpm-1.20.6-capability.patch -Requires(post): systemd-units systemd-sysv info -Requires(preun): systemd-units info -Requires(postun): systemd-units +Requires(post): systemd systemd-sysv info +Requires(preun): systemd info +Requires(postun): systemd # this defines the library version that this package builds. %define LIBVER 2.1.0 BuildRequires: sed gawk texinfo bison ncurses-devel autoconf automake libtool libcap-ng-devel +BuildRequires: systemd Requires: linuxconsoletools Requires: %{name}-libs = %{version}-%{release} @@ -102,11 +103,11 @@ rm -f %{buildroot}%{_datadir}/emacs/site-lisp/t-mouse.el %ifnarch s390 s390x mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d -mkdir -p %{buildroot}/usr/lib/systemd/system/ +mkdir -p %{buildroot}%{_unitdir} install -m 644 conf/gpm-* %{buildroot}%{_sysconfdir} # Systemd mkdir -p %{buildroot}/usr/lib/systemd/system -install -m644 %{SOURCE1} %{buildroot}/usr/lib/systemd/system +install -m644 %{SOURCE1} %{buildroot}%{_unitdir} rm -rf %{buildroot}%{_initrddir} %else # we're shipping only libraries in s390[x], so @@ -157,7 +158,7 @@ fi %{_infodir}/* %ifnarch s390 s390x %config(noreplace) %{_sysconfdir}/gpm-* -/usr/lib/systemd/system/gpm.service +%{_unitdir}/gpm.service %{_sbindir}/* %{_bindir}/* %{_mandir}/man?/* @@ -174,6 +175,9 @@ fi %{_libdir}/libgpm.a %changelog +* Wed Jul 03 2013 Jaromir Capik - 1.20.6-33 +- Replacing systemd unit path with _unitdir macro + * Wed Jul 03 2013 Jaromir Capik - 1.20.6-32 - Fixing full RELRO ... bind_now -> now (#884017)