ailiopoulos/ocfs2-tools
1
0
Fork 0
forked from pool/ocfs2-tools
Code Pull Requests Activity

Accepting request 544890 from home:RBrownSUSE:branches:network:ha-clustering:Factory

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

OBS-URL: https://build.opensuse.org/request/show/544890
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=108
This commit is contained in:
Gang He 2017-11-24 03:27:55 +00:00 committed by Git OBS Bridge
parent de35897265
commit b809f64532
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ocfs2-tools.changes
View File

@ -1,5 +1,12 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 24 10:30:00 UTC 2017 - ghe@suse.com Thu Nov 23 13:48:49 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
- Correct clearly invalid .changes timestamp
-------------------------------------------------------------------
Wed Nov 22 10:30:00 UTC 2017 - ghe@suse.com
- Remove o2cb resource agent which is obsolete (bsc#1069099) - Remove o2cb resource agent which is obsolete (bsc#1069099)

11
ocfs2-tools.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: ocfs2-tools Name: ocfs2-tools
Version: 1.8.5 Version: 1.8.5
Release: 0 Release: 0
@ -165,10 +170,10 @@ cd ..
%install %install
mkdir -p %{buildroot}/sbin mkdir -p %{buildroot}/sbin
mkdir -p %{buildroot}%{_prefix}/bin mkdir -p %{buildroot}%{_prefix}/bin
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates mkdir -p %{buildroot}%{_fillupdir}
mkdir -p %{buildroot}%{_udevrulesdir} mkdir -p %{buildroot}%{_udevrulesdir}
cp -f vendor/common/51-ocfs2.rules %{buildroot}%{_udevrulesdir} cp -f vendor/common/51-ocfs2.rules %{buildroot}%{_udevrulesdir}
cp -f vendor/common/o2cb.sysconfig %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.o2cb cp -f vendor/common/o2cb.sysconfig %{buildroot}%{_fillupdir}/sysconfig.o2cb
%if %{systemd_enabled} %if %{systemd_enabled}
mkdir -p %{buildroot}/usr/lib/systemd/system mkdir -p %{buildroot}/usr/lib/systemd/system
@ -266,7 +271,7 @@ python -c "import compileall; compileall.compile_dir('%{buildroot}/%{py_sitedir}
%endif %endif
%{_mandir}/man8/o2cb_ctl.8* %{_mandir}/man8/o2cb_ctl.8*
%{_localstatedir}/adm/fillup-templates/sysconfig.o2cb %{_fillupdir}/sysconfig.o2cb
%{_mandir}/man7/o2cb.7.gz %{_mandir}/man7/o2cb.7.gz
%{_mandir}/man8/o2cb.8.gz %{_mandir}/man8/o2cb.8.gz