• R/O
  • SSH

pm_diskd: Commit

※ リポジトリは、pm-diskd ブランチが https://github.com/linux-ha-japan/pm_diskd-1.0 へ、pm-diskd-2.0ブランチが https://github.com/linux-ha-japan/pm_diskd へ移行しました。

Pacemaker 対応ディスク故障監視機能。

Pacemaker-1.0公式リポジトリのクローンに対し、パッチ作成用のブランチを作成して管理する。
ブランチ名: pm-diskd

初回 hg clone 実行後は、hg update -r pm-diskd を実行すること。

Heartbeat-2.1.4 用 hb-diskd(*) のPacemaker対応版
(*) http://sourceforge.jp/projects/linux-ha/releases/?package_id=10555


Commit MetaInfo

Revision0a5cfaa1de94d89f53f5ecf6253c544cdb2b0e17 (tree)
Time2008-10-09 18:27:40
AuthorAndrew Beekhof <abeekhof@suse...>
CommiterAndrew Beekhof

Log Message

Low: Build: Refresh the spec file from OBS

Change Summary

Incremental Difference

diff -r 30549d369660 -r 0a5cfaa1de94 pacemaker.spec
--- a/pacemaker.spec Wed Oct 08 20:12:21 2008 +0200
+++ b/pacemaker.spec Thu Oct 09 11:27:40 2008 +0200
@@ -1,143 +1,159 @@
1-#
2-# spec file for package Pacemaker (Version 0.7.0)
31 #
4-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
5-# This file and all modifications and additions to the pristine
6-# package are under the same license as the package itself.
2+# spec file for package pacemaker (Version 0.7.2)
73 #
4+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
5+#
6+# All modifications and additions to the file contributed by third parties
7+# remain the property of their copyright owners, unless otherwise agreed
8+# upon. The license for this file, and modifications and additions to the
9+# file, is the same license as for the pristine package itself (unless the
10+# license for the pristine package is not an Open Source License, in which
11+# case the license is the MIT License). An "Open Source License" is a
12+# license that conforms to the Open Source Definition (Version 1.9)
13+# published by the Open Source Initiative.
14+
815 # Please submit bugfixes or comments via http://bugs.opensuse.org/
916 #
1017
1118 # norootforbuild
1219
20+%if 0%{?suse_version}
21+%define _libexecdir %{_libdir}
22+%endif
1323 %define with_extra_warnings 0
1424 %define with_debugging 0
1525 %define without_fatal_warnings 1
1626 %define with_ais_support 1
17-%define with_heartbeat_support 1
18-%define with_snmp_support 1
19-
20-%define pkg_group Productivity/Clustering/HA
21-
27+%define with_heartbeat_support 0
28+%define gname haclient
29+%define uname hacluster
2230 %if 0%{?fedora_version}
2331 %define pkg_group System Environment/Daemons
32+%else
33+%define pkg_group Productivity/Clustering/HA
2434 %endif
2535
26-%define gname haclient
27-%define uname hacluster
28-
2936 Name: pacemaker
3037 Summary: The Pacemaker scalable High-Availability cluster resource manager
31-Version: 0.6.2
38+Version: 1.0.0
3239 Release: 1
33-License: GPL2/LGPL2
34-URL: http://www.clusterlabs.org
40+License: GPL v2 or later; LGPL v2.1 or later
41+Url: http://www.clusterlabs.org
3542 Group: %{pkg_group}
3643 Source: pacemaker.tar.gz
44+Source100: pacemaker.rpmlintrc
3745 BuildRoot: %{_tmppath}/%{name}-%{version}-build
38-Autoreqprov: on
39-
46+AutoReqProv: on
4047 %if %with_ais_support
41-BuildRequires: openais-devel
42-%endif
43-
44-%if %with_heartbeat_support
45-BuildRequires: heartbeat heartbeat-devel > 2.1.2
46-%endif
47-
48-%if %{with_ais_support}
49- %if %{with_heartbeat_support}
50-Conflicts: pacemaker-ais
51-Conflicts: pacemaker-heartbeat
52- %else
53-Conflicts: pacemaker
54-Conflicts: pacemaker-heartbeat
55- %endif
56-%else
57-Conflicts: pacemaker
58-Conflicts: pacemaker-ais
59-%endif
60-
61-BuildRequires: heartbeat-common heartbeat-common-devel e2fsprogs-devel glib2-devel gnutls-devel libxml2-devel pam-devel python-devel swig
62-
63-%if 0%{?suse_version}
64-
48+BuildRequires: libopenais-devel
6549 %if 0%{?suse_version} > 1000
66-%if %with_ais_support
67-Supplements: openais
68-%endif
69-
70-%if %with_heartbeat_support
71-Supplements: heartbeat
50+Supplements: openais
7251 %endif
7352 %endif
74-
53+%if %with_heartbeat_support
54+BuildRequires: heartbeat-devel
55+%if 0%{?suse_version} > 1000
56+Supplements: heartbeat
57+%endif
58+%endif
59+Conflicts: heartbeat < 2.99
60+BuildRequires: e2fsprogs-devel glib2-devel gnutls-devel libheartbeat-devel libxml2-devel libxslt-devel ncurses-devel pam-devel python-devel swig
61+%if 0%{?suse_version}
7562 %if 0%{?suse_version} == 930
76-BuildRequires: rpm-devel
63+BuildRequires: rpm-devel
7764 %endif
78-
7965 %if 0%{?suse_version} == 1000
80-BuildRequires: lzo lzo-devel
66+BuildRequires: lzo lzo-devel
8167 %endif
82-
8368 %if 0%{?suse_version} < 1020
84-BuildRequires: tcpd-devel
69+BuildRequires: tcpd-devel
8570 %endif
86-
8771 %if 0%{?sles_version} == 9
88-BuildRequires: pkgconfig
89-%endif
90-
91-%endif
92-
93-%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
94-BuildRequires: which
72+BuildRequires: openssl-devel pkgconfig
9573 %endif
96-
97-%if 0%{?fedora_version} == 8
98-BuildRequires: openssl-devel
9974 %endif
100-
101-
75+%if 0%{?rhel_version} == 406
76+BuildRequires: gcc-c++ kernel
77+%endif
78+%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
79+BuildRequires: openssl-devel which
80+%endif
10281 %if 0%{?mandriva_version}
103-BuildRequires: libbzip2-devel
82+BuildRequires: libbzip2-devel openssl-devel
10483 %endif
10584
10685 %description
107-Pacemaker is an advanced, scalable High-Availability cluster resource manager for
108-Linux-HA (Heartbeat) and/or OpenAIS.
86+Pacemaker is an advanced, scalable High-Availability cluster resource
87+manager for Linux-HA (Heartbeat) and/or OpenAIS.
10988
110-It supports "n-node" clusters with significant capabilities for managing
111-resources and dependencies.
89+It supports "n-node" clusters with significant capabilities for
90+managing resources and dependencies.
11291
113-It will run scripts at initialization, when machines go up or down,
92+It will run scripts at initialization, when machines go up or down,
11493 when related resources fail and can be configured to periodically check
11594 resource health.
11695
117-%if 0%{?suse_version}
118-%debug_package
119-%endif
12096
121-%package devel
122-Summary: Pacemaker development package
97+
98+Authors:
99+--------
100+ Andrew Beekhof <abeekhof@suse.de>
101+
102+%package -n libpacemaker3
103+License: GPL v2 or later; LGPL v2.1 or later
104+Summary: The Pacemaker scalable High-Availability cluster resource manager
123105 Group: %{pkg_group}
106+
107+%description -n libpacemaker3
108+Pacemaker is an advanced, scalable High-Availability cluster resource
109+manager for Linux-HA (Heartbeat) and/or OpenAIS.
110+
111+It supports "n-node" clusters with significant capabilities for
112+managing resources and dependencies.
113+
114+It will run scripts at initialization, when machines go up or down,
115+when related resources fail and can be configured to periodically check
116+resource health.
117+
118+
119+
120+Authors:
121+--------
122+ Andrew Beekhof <abeekhof@suse.de>
123+
124+%package -n libpacemaker-devel
125+License: GPL v2 or later; LGPL v2.1 or later
126+Summary: The Pacemaker scalable High-Availability cluster resource manager
127+Group: Development/Libraries/C and C++
124128 Requires: %{name} = %{version}-%{release}
129+Requires: libpacemaker3 = %{version}-%{release}
130+Requires: libheartbeat-devel
125131
126-%description devel
127-Header files and shared libraries needed for developing programs based on the
128-Pacemaker High-Availability cluster resource manager.
132+%description -n libpacemaker-devel
133+Pacemaker is an advanced, scalable High-Availability cluster resource
134+manager for Linux-HA (Heartbeat) and/or OpenAIS.
135+
136+It supports "n-node" clusters with significant capabilities for
137+managing resources and dependencies.
138+
139+It will run scripts at initialization, when machines go up or down,
140+when related resources fail and can be configured to periodically check
141+resource health.
142+
143+
144+
145+Authors:
146+--------
147+ Andrew Beekhof <abeekhof@suse.de>
129148
130149 %prep
131150 ###########################################################
132151 %setup -n pacemaker
133-
134152 ###########################################################
135153
136154 %build
137155 # TODO: revisit -all
138-
139156 CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
140-
141157 # Feature-dependent CFLAGS:
142158 %if %with_extra_warnings
143159 # CFLAGS="${CFLAGS} -Wshadow -Wfloat-equal -Waggregate-return -Wnested-externs -Wunreachable-code -Wendif-labels -Winline"
@@ -146,50 +162,29 @@
146162 %if %with_debugging
147163 CFLAGS="${CFLAGS} -O0"
148164 %endif
149-
150165 # Distribution specific settings:
151166 %if 0%{?suse_version} > 1001
152167 CFLAGS="${CFLAGS} -fstack-protector-all"
153168 %endif
154-
155169 %if 0%{?suse_version} < 1001
156170 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/opt/gnome/%{_lib}/pkgconfig:/opt/gnome/share/pkgconfig"
157171 %endif
158-
159172 %if 0%{?suse_version} > 1020
160173 CFLAGS="$CFLAGS -fgnu89-inline"
161174 %endif
162-
163175 %if 0%{?fedora_version} > 6
164176 CFLAGS="$CFLAGS -fgnu89-inline"
165177 %endif
166-
167178 export CFLAGS
168-
169179 ./ConfigureMe configure --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} \
170180 --localstatedir=%{_var} --infodir=%{_infodir} \
171181 --mandir=%{_mandir} --libdir=%{_libdir} \
172182 --libexecdir=%{_libexecdir} \
173- --with-group-name=%{gname} --with-ccmuser-name=%{uname} \
174- --with-hapkgversion=%{version} \
175- --enable-glib-malloc \
176-%if %with_snmp_support == 1
177- --enable-snmp-subagent \
178-%else
179- --disable-snmp-subagent \
180-%endif
181183 --with-ais-prefix=%{_prefix} \
182-%if %with_ais_support == 0
183- --without-ais-support \
184-%endif
185-%if %with_heartbeat_support == 0
186- --without-heartbeat-support \
187-%endif
188184 %if %without_fatal_warnings
189185 --enable-fatal-warnings=no \
190186 %endif
191- --enable-pretty
192-
187+ --with-hapkgversion=%{version}
193188 export MAKE="make %{?jobs:-j%jobs}"
194189 make %{?jobs:-j%jobs}
195190 ###########################################################
@@ -197,21 +192,27 @@
197192 %install
198193 ###########################################################
199194 #make DESTDIR=$RPM_BUILD_ROOT install-strip
200-rm -rf $RPM_BUILD_ROOT
201-mkdir -p $RPM_BUILD_ROOT
202195 make DESTDIR=$RPM_BUILD_ROOT install
203-
196+chmod a+x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/crm_primitive.py
197+rm $RPM_BUILD_ROOT/%{_libdir}/service_crm.so
198+(
199+ cd $RPM_BUILD_ROOT/%{_sbindir}
200+ rm crm_standby crm_master crm_failcount
201+ ln crm_attribute crm_standby
202+ ln crm_attribute crm_master
203+ ln crm_attribute crm_failcount
204+)
204205 #%if %with_ais_support
205206 # mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/lcrso
206207 # cp $RPM_BUILD_ROOT/%{_libdir}/service_crm.so $RPM_BUILD_ROOT/%{_libexecdir}/lcrso/pacemaker.lcrso
207208 #%endif
208-
209209 # Cleanup
210210 [ -d $RPM_BUILD_ROOT/usr/man ] && rm -rf $RPM_BUILD_ROOT/usr/man
211211 [ -d $RPM_BUILD_ROOT/usr/share/libtool ] && rm -rf $RPM_BUILD_ROOT/usr/share/libtool
212212 find $RPM_BUILD_ROOT -name '*.a' -type f -print0 | xargs -0 rm -f
213213 find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f
214-
214+find $RPM_BUILD_ROOT -name '*.pyc' -type f -print0 | xargs -0 rm -f
215+find $RPM_BUILD_ROOT -name '*.pyo' -type f -print0 | xargs -0 rm -f
215216 ###########################################################
216217
217218 %clean
@@ -224,38 +225,19 @@
224225 rm -rf $RPM_BUILD_DIR/pacemaker
225226 ###########################################################
226227
227-%pre
228-%preun
228+%post -n libpacemaker3 -p /sbin/ldconfig
229229
230-# Use the following if more commands need to be executed
231-# %post
232-# /sbin/ldconfig
233-# [...]
234-# http://en.opensuse.org/SUSE_Package_Conventions/RPM_Macros
235-
236-%post -p /sbin/ldconfig
237-%postun -p /sbin/ldconfig
230+%postun -n libpacemaker3 -p /sbin/ldconfig
238231
239232 %files
240233 ###########################################################
241234 %defattr(-,root,root)
242235 %dir %{_libdir}/heartbeat
243-
244-%{_prefix}/share/pacemaker
245-%{_prefix}/share/heartbeat
246-%{_libdir}/heartbeat/*
247-
236+%dir %{_var}/run/heartbeat
248237 %dir %{_var}/lib/heartbeat
249-
250-%{_libdir}/libcib.so.*
251-%{_libdir}/libcrmcommon.so.*
252-%{_libdir}/libcrmcluster.so.*
253-#%{_libdir}/heartbeat/crm_primitive.py
254-%{_libdir}/libpe_status.so.*
255-%{_libdir}/libpe_rules.so.*
256-%{_libdir}/libpengine.so.*
257-%{_libdir}/libtransitioner.so.*
258-%{_libdir}/libstonithd.so.*
238+%{_datadir}/pacemaker
239+#%{_datadir}/heartbeat
240+%{_libdir}/heartbeat/*
259241 %{_sbindir}/cibadmin
260242 %{_sbindir}/crm_attribute
261243 %{_sbindir}/crm_diff
@@ -272,23 +254,36 @@
272254 %{_sbindir}/ccm_tool
273255 %{_sbindir}/attrd_updater
274256 %{_sbindir}/ptest
257+%{_sbindir}/crm_shadow
258+%{_sbindir}/cibpipe
275259 %doc %{_mandir}/man8/cibadmin.8*
276260 %doc %{_mandir}/man8/crm_resource.8*
277261 %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/heartbeat/crm
278262 %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/heartbeat/pengine
279263 %dir %attr (750, %{uname}, %{gname}) %{_var}/run/heartbeat/crm
264+%dir /usr/lib/ocf
265+%dir /usr/lib/ocf/resource.d
266+/usr/lib/ocf/resource.d/pacemaker
280267 %if %with_ais_support
281268 %{_libexecdir}/lcrso/pacemaker.lcrso
282269 %endif
283-%if %with_snmp_support == 1
284-/usr/share/snmp/mibs/LINUX-HA-MIB.mib
285-%endif
286270
287-%files devel
271+%files -n libpacemaker3
272+%defattr(-,root,root)
273+%{_libdir}/libcib.so.*
274+%{_libdir}/libcrmcommon.so.*
275+%{_libdir}/libcrmcluster.so.*
276+%{_libdir}/libpe_status.so.*
277+%{_libdir}/libpe_rules.so.*
278+%{_libdir}/libpengine.so.*
279+%{_libdir}/libtransitioner.so.*
280+%{_libdir}/libstonithd.so.*
281+
282+%files -n libpacemaker-devel
288283 %defattr(-,root,root)
289284 #%doc %{_datadir}/doc/%{name}-%{version}
290285 %{_includedir}/pacemaker
291286 %{_includedir}/heartbeat/fencing
292287 %{_libdir}/*.so
293288
294-%changelog pacemaker
289+%changelog
Show on old repository browser