jengelh/cdemu-daemon
SHA256
1
0
Fork 0
forked from pool/cdemu-daemon
Code Pull Requests Activity

Accepting request 544984 from filesystems

Browse Source 
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) (forwarded request 544733 from RBrownSUSE)

OBS-URL: https://build.opensuse.org/request/show/544984
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cdemu-daemon?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger 2017-11-24 09:56:28 +00:00 committed by Git OBS Bridge
commit 016dfdf1c9
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cdemu-daemon.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:44:48 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 7 19:29:16 UTC 2017 - jengelh@inai.de Mon Aug 7 19:29:16 UTC 2017 - jengelh@inai.de

11
cdemu-daemon.spec
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: cdemu-daemon Name: cdemu-daemon
Version: 3.1.0 Version: 3.1.0
Release: 0 Release: 0
@ -67,10 +72,10 @@ make %{?_smp_mflags}
%install %install
b="%buildroot" b="%buildroot"
%cmake_install %cmake_install
mkdir -p "$b/%_sbindir" "$b/%_localstatedir/adm/fillup-templates" \ mkdir -p "$b/%_sbindir" "$b/%{_fillupdir}" \
"$b/%_prefix/lib/udev/rules.d" "$b/%_prefix/lib/udev/rules.d"
install -pm0644 "%{S:2}" "$b/%_prefix/lib/udev/rules.d/60-vhba.rules" install -pm0644 "%{S:2}" "$b/%_prefix/lib/udev/rules.d/60-vhba.rules"
install -pm0644 "%{S:3}" "$b/%_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon" install -pm0644 "%{S:3}" "$b/%{_fillupdir}/sysconfig.cdemu-daemon"
# Not desired for security; it would permit a user to start a system service. # Not desired for security; it would permit a user to start a system service.
rm -rf "$b/%_datadir/dbus-1/system-services" "$b/%_sysconfdir/dbus-1/system.d/" rm -rf "$b/%_datadir/dbus-1/system-services" "$b/%_sysconfdir/dbus-1/system.d/"
%find_lang %name %find_lang %name
@ -85,7 +90,7 @@ rm -rf "$b/%_datadir/dbus-1/system-services" "$b/%_sysconfdir/dbus-1/system.d/"
%_libexecdir/cdemu-daemon-session.sh %_libexecdir/cdemu-daemon-session.sh
%_datadir/dbus-1/ %_datadir/dbus-1/
%_mandir/man8/cdemu-daemon.8* %_mandir/man8/cdemu-daemon.8*
%_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon %{_fillupdir}/sysconfig.cdemu-daemon
%_prefix/lib/udev/ %_prefix/lib/udev/
%changelog %changelog