Replacing systemd unit path with _unitdir macro

This commit is contained in:
Jaromir Capik 2013-07-03 18:45:14 +02:00
parent 7b2914d07e
commit 348857914e

View File

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