Accepting request 545037 from Base:System

OBS-URL: https://build.opensuse.org/request/show/545037
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpm?expand=0&rev=50
This commit is contained in:
Dominique Leuenberger 2017-11-30 11:31:40 +00:00 committed by Git OBS Bridge
commit 11bacf8647
2 changed files with 14 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:40:02 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 11 18:59:26 UTC 2017 - jengelh@inai.de Mon Sep 11 18:59:26 UTC 2017 - jengelh@inai.de

View File

@ -16,6 +16,11 @@
# #
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
Name: gpm Name: gpm
%define lname libgpm2 %define lname libgpm2
Version: 1.20.7 Version: 1.20.7
@ -153,11 +158,11 @@ done
#install contrib/emacs/t-mouse.el* %%{buildroot}/usr/share/emacs/site-lisp #install contrib/emacs/t-mouse.el* %%{buildroot}/usr/share/emacs/site-lisp
# #
# start script # start script
install -m 755 -d %{buildroot}/var/adm/fillup-templates install -m 755 -d %{buildroot}%{_fillupdir}
install -m 755 -d %{buildroot}/%{_unitdir} install -m 755 -d %{buildroot}/%{_unitdir}
install -m 755 -d %{buildroot}/usr/sbin install -m 755 -d %{buildroot}/usr/sbin
install -m 755 inputattach %{buildroot}%{_sbindir} install -m 755 inputattach %{buildroot}%{_sbindir}
install -m 644 sysconfig.mouse-%{name} %{buildroot}/var/adm/fillup-templates install -m 644 sysconfig.mouse-%{name} %{buildroot}%{_fillupdir}
install -m 644 %{S:2} %{buildroot}/%{_unitdir}/gpm.service install -m 644 %{S:2} %{buildroot}/%{_unitdir}/gpm.service
ln -sf %{_sbindir}/service %{buildroot}/usr/sbin/rcgpm ln -sf %{_sbindir}/service %{buildroot}/usr/sbin/rcgpm
# there were two variables with the same value GPM_PROTOCOL and MOUSETYPE # there were two variables with the same value GPM_PROTOCOL and MOUSETYPE
@ -208,7 +213,7 @@ touch %{buildroot}/run/gpm.pid
%{_unitdir}/gpm.service %{_unitdir}/gpm.service
%{_bindir}/* %{_bindir}/*
%{_sbindir}/* %{_sbindir}/*
/var/adm/fillup-templates/* %{_fillupdir}/*
%ghost /run/gpm.pid %ghost /run/gpm.pid
%files -n %lname %files -n %lname