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

Accepting request 760630 from home:mgerstner:branches:network:ha-clustering:Factory

Browse Source 
- Don't package sysconfig file in tmpfiles.d, it's a bug. Instead correctly
  add it to /etc/sysconfig, invoking fillup accordingly.

OBS-URL: https://build.opensuse.org/request/show/760630
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=166
This commit is contained in:
nick wang 2020-03-11 03:05:27 +00:00 committed by Git OBS Bridge
parent 76c3d6829f
commit 03886ab714
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
corosync.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jan 3 11:30:41 UTC 2020 - matthias.gerstner@suse.com
- Don't package sysconfig file in tmpfiles.d, it's a bug. Instead correctly
add it to /etc/sysconfig, invoking fillup accordingly.
-------------------------------------------------------------------
Thu Nov 7 06:26:20 UTC 2019 - Yuan Ren <yren@suse.com>

10
corosync.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package corosync
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,6 +15,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
@ -213,11 +214,9 @@ rm -f %{buildroot}%{_libdir}/*.la
rm -rf %{buildroot}%{_docdir}/*
#remove init scripts for corosync, corosync-qdevice, corosync-qnetd
rm -rf init/corosync init/corosync-qnetd init/corosync-qdevice
mkdir -p %{buildroot}/usr/lib/tmpfiles.d/
mkdir -p %{buildroot}/usr/share/doc/packages/corosync/
mkdir -p %{buildroot}%{_fillupdir}/
mkdir -p %{buildroot}%{_sysconfdir}/init.d/
install -m 0644 tools/corosync-notifyd.sysconfig.example %{buildroot}/usr/lib/tmpfiles.d/corosync-notifyd
install -m 0644 conf/corosync.conf.example* %{buildroot}/usr/share/doc/packages/corosync/
mkdir -p %{buildroot}/usr/lib/corosync
install -m 0755 init/upgrade.sh %{buildroot}/usr/lib/corosync
@ -226,6 +225,8 @@ rm -rf %{buildroot}/etc/logrotate.d/
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
install -m 644 init/corosync.sysconfig.example \
%{buildroot}%{_fillupdir}/sysconfig.corosync
install -m 0644 tools/corosync-notifyd.sysconfig.example \
%{buildroot}%{_fillupdir}/sysconfig.corosync-notifyd
rm -rf %{buildroot}%{localstatedir}/run/
%if %{with qdevices}
install -m 644 init/corosync-qdevice.sysconfig.example \
@ -256,6 +257,7 @@ APIs and libraries, default configuration files, and an init script.
%post
/usr/lib/corosync/upgrade.sh
%{fillup_only -n corosync}
%{fillup_only -n corosync-notifyd}
# Upgrade
if [ $1 -eq 2 ]; then
# restore configured /etc/sysconfig/corosync(bsc#1155792)
@ -311,7 +313,7 @@ fi
/usr/lib/corosync/upgrade.sh
%config(noreplace) /usr/share/doc/packages/corosync/corosync.conf.example
%config(noreplace) /usr/share/doc/packages/corosync/corosync.conf.example.udpu
%config(noreplace) /usr/lib/tmpfiles.d/corosync-notifyd
%config(noreplace) %{_fillupdir}/sysconfig.corosync-notifyd
%config(noreplace) %{_fillupdir}/sysconfig.corosync
%if %{with dbus}