pool/conman
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 546487 from network:cluster

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/546487
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/conman?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2017-12-06 07:58:24 +00:00 committed by Git OBS Bridge
commit 5d474b6b7e
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conman.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:54:08 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 9 06:39:12 UTC 2017 - eich@suse.com Mon Oct 9 06:39:12 UTC 2017 - eich@suse.com

11
conman.spec
View File

@ -17,6 +17,11 @@
# #
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%if 0%{?suse_version} > 1140 %if 0%{?suse_version} > 1140
%define have_systemd 1 %define have_systemd 1
%ifarch x86_64 %ifarch x86_64
@ -112,9 +117,9 @@ mv %{buildroot}%_sysconfdir/init.d/conman.tmp %{buildroot}%_sysconfdir/init.d/co
ln -s %{_sysconfdir}/init.d/conman %{buildroot}%{_sbindir}/rcconman ln -s %{_sysconfdir}/init.d/conman %{buildroot}%{_sbindir}/rcconman
chmod u+x %{buildroot}%{_sysconfdir}/init.d/conman chmod u+x %{buildroot}%{_sysconfdir}/init.d/conman
%endif %endif
mkdir -p %{buildroot}/var/adm/fillup-templates mkdir -p %{buildroot}%{_fillupdir}
mv %{buildroot}%{_sysconfdir}/sysconfig/conman \ mv %{buildroot}%{_sysconfdir}/sysconfig/conman \
%{buildroot}/var/adm/fillup-templates/sysconfig.conman %{buildroot}%{_fillupdir}/sysconfig.conman
for i in $(find %{buildroot}/usr/lib/conman) ; do for i in $(find %{buildroot}/usr/lib/conman) ; do
if [ -f $i -a -x $i ]; then if [ -f $i -a -x $i ]; then
if ! head -1 $i | grep "^#!"; then if ! head -1 $i | grep "^#!"; then
@ -184,7 +189,7 @@ exit 0
%doc THANKS %doc THANKS
%config(noreplace) %attr(-,%conman_u,%conman_g) %{_sysconfdir}/conman.conf %config(noreplace) %attr(-,%conman_u,%conman_g) %{_sysconfdir}/conman.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/conman %config(noreplace) %{_sysconfdir}/logrotate.d/conman
%{_localstatedir}/adm/fillup-templates/sysconfig.conman %{_fillupdir}/sysconfig.conman
%{_bindir}/* %{_bindir}/*
%{_sbindir}/* %{_sbindir}/*
%{_prefix}/lib/conman %{_prefix}/lib/conman