Accepting request 544812 from network:utilities

OBS-URL: https://build.opensuse.org/request/show/544812
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bwbar?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2017-11-24 09:54:23 +00:00 committed by Git OBS Bridge
commit d0e512bcd9
2 changed files with 14 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:45:50 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Oct 26 12:24:59 UTC 2013 - p.drouand@gmail.com Sat Oct 26 12:24:59 UTC 2013 - p.drouand@gmail.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package bwbar # spec file for package bwbar
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -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: bwbar Name: bwbar
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libpng-devel BuildRequires: libpng-devel
@ -68,7 +73,7 @@ CFLAGS="-Wall $RPM_OPT_FLAGS"
%install %install
install -d %buildroot%{_bindir} install -d %buildroot%{_bindir}
install -m 755 bwbar %buildroot%{_bindir} install -m 755 bwbar %buildroot%{_bindir}
install -m 644 -D %{SOURCE2} %buildroot/var/adm/fillup-templates/sysconfig.%{name} install -m 644 -D %{SOURCE2} %buildroot%{_fillupdir}/sysconfig.%{name}
# #
%if 0%{?has_systemd} %if 0%{?has_systemd}
install -m 644 -D %{SOURCE4} %buildroot/%{_unitdir}/%name.service install -m 644 -D %{SOURCE4} %buildroot/%{_unitdir}/%name.service
@ -111,7 +116,7 @@ ln -svf ../../etc/init.d/%{name} %buildroot/%{_sbindir}/rc%{name}
%defattr(-, root, root) %defattr(-, root, root)
%doc README COPYING %doc README COPYING
%{_bindir}/* %{_bindir}/*
/var/adm/fillup-templates/sysconfig.%{name} %{_fillupdir}/sysconfig.%{name}
%if 0%{?has_systemd} %if 0%{?has_systemd}
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%else %else