• R/O
  • SSH

pm_crmgen: Commit

※リポジトリは、https://github.com/linux-ha-japan/pm_crmgen-1.0 へ移行しました。

Pacemaker 1.0 設定編集ツール

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


Commit MetaInfo

Revisionee3782e61ae6bf9da8b381cf2e4643e6a0077e90 (tree)
Time2010-06-25 10:41:03
AuthorKazunori INOUE <inouekazu@inte...>
CommiterKazunori INOUE

Log Message

Add pm_crmgen_Env_1.00-1.xls file for packaging

Change Summary

Incremental Difference

diff -r 53234afc8345 -r ee3782e61ae6 Makefile.am
--- a/Makefile.am Tue Jun 22 20:30:15 2010 +0900
+++ b/Makefile.am Fri Jun 25 10:41:03 2010 +0900
@@ -1,7 +1,10 @@
11 MAINTAINERCLEANFILES = Makefile.in
22 crmgendir = @HA_NOARCHDATAHBDIR@/pm-crmgen
33 crmgen_SCRIPTS = pm_crmgen.py
4-SHAREDIR=$(crmgendir)
4+crmgen_DATA = pm_crmgen_Env_1.00-1.xls
5+
6+SHAREDIR = $(crmgendir)
7+EXTRA_DIST = $(crmgen_DATA)
58
69 install-data-hook:
710 for dir in $(DESTDIR)$(crmgendir) $(DESTDIR)@bindir@; \
diff -r 53234afc8345 -r ee3782e61ae6 Makefile.in
--- a/Makefile.in Tue Jun 22 20:30:15 2010 +0900
+++ b/Makefile.in Fri Jun 25 10:41:03 2010 +0900
@@ -14,6 +14,7 @@
1414
1515 @SET_MAKE@
1616
17+
1718 srcdir = @srcdir@
1819 top_srcdir = @top_srcdir@
1920 VPATH = @srcdir@
@@ -46,11 +47,19 @@
4647 configure.lineno configure.status.lineno
4748 mkinstalldirs = $(install_sh) -d
4849 CONFIG_CLEAN_FILES =
49-am__installdirs = "$(DESTDIR)$(crmgendir)"
50+am__installdirs = "$(DESTDIR)$(crmgendir)" "$(DESTDIR)$(crmgendir)"
5051 crmgenSCRIPT_INSTALL = $(INSTALL_SCRIPT)
5152 SCRIPTS = $(crmgen_SCRIPTS)
5253 SOURCES =
5354 DIST_SOURCES =
55+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
56+am__vpath_adj = case $$p in \
57+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
58+ *) f=$$p;; \
59+ esac;
60+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
61+crmgenDATA_INSTALL = $(INSTALL_DATA)
62+DATA = $(crmgen_DATA)
5463 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
5564 distdir = $(PACKAGE)-$(VERSION)
5665 top_distdir = $(distdir)
@@ -141,7 +150,9 @@
141150 MAINTAINERCLEANFILES = Makefile.in
142151 crmgendir = @HA_NOARCHDATAHBDIR@/pm-crmgen
143152 crmgen_SCRIPTS = pm_crmgen.py
153+crmgen_DATA = pm_crmgen_Env_1.00-1.xls
144154 SHAREDIR = $(crmgendir)
155+EXTRA_DIST = $(crmgen_DATA)
145156 all: all-am
146157
147158 .SUFFIXES:
@@ -198,6 +209,23 @@
198209 rm -f "$(DESTDIR)$(crmgendir)/$$f"; \
199210 done
200211 uninstall-info-am:
212+install-crmgenDATA: $(crmgen_DATA)
213+ @$(NORMAL_INSTALL)
214+ test -z "$(crmgendir)" || $(mkdir_p) "$(DESTDIR)$(crmgendir)"
215+ @list='$(crmgen_DATA)'; for p in $$list; do \
216+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
217+ f=$(am__strip_dir) \
218+ echo " $(crmgenDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(crmgendir)/$$f'"; \
219+ $(crmgenDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(crmgendir)/$$f"; \
220+ done
221+
222+uninstall-crmgenDATA:
223+ @$(NORMAL_UNINSTALL)
224+ @list='$(crmgen_DATA)'; for p in $$list; do \
225+ f=$(am__strip_dir) \
226+ echo " rm -f '$(DESTDIR)$(crmgendir)/$$f'"; \
227+ rm -f "$(DESTDIR)$(crmgendir)/$$f"; \
228+ done
201229 tags: TAGS
202230 TAGS:
203231
@@ -234,7 +262,7 @@
234262 || exit 1; \
235263 fi; \
236264 done
237- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
265+ -find $(distdir) -type d ! -perm -755 -exec chmod a+rwx,go+rx {} \; -o \
238266 ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
239267 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
240268 ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
@@ -333,9 +361,9 @@
333361 exit 1; } >&2
334362 check-am: all-am
335363 check: check-am
336-all-am: Makefile $(SCRIPTS)
364+all-am: Makefile $(SCRIPTS) $(DATA)
337365 installdirs:
338- for dir in "$(DESTDIR)$(crmgendir)"; do \
366+ for dir in "$(DESTDIR)$(crmgendir)" "$(DESTDIR)$(crmgendir)"; do \
339367 test -z "$$dir" || $(mkdir_p) "$$dir"; \
340368 done
341369 install: install-am
@@ -382,7 +410,7 @@
382410
383411 info-am:
384412
385-install-data-am: install-crmgenSCRIPTS
413+install-data-am: install-crmgenDATA install-crmgenSCRIPTS
386414 @$(NORMAL_INSTALL)
387415 $(MAKE) $(AM_MAKEFLAGS) install-data-hook
388416
@@ -412,19 +440,20 @@
412440
413441 ps-am:
414442
415-uninstall-am: uninstall-crmgenSCRIPTS uninstall-info-am
443+uninstall-am: uninstall-crmgenDATA uninstall-crmgenSCRIPTS \
444+ uninstall-info-am
416445
417446 .PHONY: all all-am am--refresh check check-am clean clean-generic dist \
418447 dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
419448 distcheck distclean distclean-generic distcleancheck distdir \
420449 distuninstallcheck dvi dvi-am html html-am info info-am \
421- install install-am install-crmgenSCRIPTS install-data \
422- install-data-am install-data-hook install-exec install-exec-am \
423- install-info install-info-am install-man install-strip \
424- installcheck installcheck-am installdirs maintainer-clean \
425- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
426- pdf-am ps ps-am uninstall uninstall-am uninstall-crmgenSCRIPTS \
427- uninstall-info-am
450+ install install-am install-crmgenDATA install-crmgenSCRIPTS \
451+ install-data install-data-am install-data-hook install-exec \
452+ install-exec-am install-info install-info-am install-man \
453+ install-strip installcheck installcheck-am installdirs \
454+ maintainer-clean maintainer-clean-generic mostlyclean \
455+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
456+ uninstall-crmgenDATA uninstall-crmgenSCRIPTS uninstall-info-am
428457
429458
430459 install-data-hook:
diff -r 53234afc8345 -r ee3782e61ae6 pm_crmgen.spec
--- a/pm_crmgen.spec Tue Jun 22 20:30:15 2010 +0900
+++ b/pm_crmgen.spec Fri Jun 25 10:41:03 2010 +0900
@@ -5,6 +5,7 @@
55 %define version 1.00
66 %define release 1
77 %define prefix /usr
8+%define ORGARCH pm-crmgen
89 #
910 #
1011 Summary: Pacemaker crm-file generator
@@ -18,6 +19,7 @@
1819 BuildRequires: make
1920 BuildArch: noarch
2021 Requires: python >= 2.4, python < 3.0
22+Requires: pacemaker >= 1.0.9
2123
2224 ########################################
2325 %description
@@ -27,10 +29,7 @@
2729 %prep
2830 ########################################
2931 rm -rf $RPM_BUILD_ROOT
30-
31-########################################
32-%setup -q
33-########################################
32+%setup -q -n %{ORGARCH}
3433
3534 ########################################
3635 %build
@@ -57,20 +56,19 @@
5756 then
5857 rm -rf $RPM_BUILD_ROOT
5958 fi
60-rm -rf $RPM_BUILD_DIR/%{name}-%{version}
59+rm -rf $RPM_BUILD_DIR/%{name}
6160
6261 ########################################
6362 %post
6463 ########################################
65-true
64+
6665 ########################################
6766 %preun
6867 ########################################
69-true
68+
7069 ########################################
7170 %postun
7271 ########################################
73-true
7472
7573 ########################################
7674 %files
@@ -79,5 +77,6 @@
7977 %{prefix}/bin/pm_crmgen
8078 %dir %{prefix}/share/pacemaker/%{name}
8179 %{prefix}/share/pacemaker/%{name}/pm_crmgen.py
80+%{prefix}/share/pacemaker/%{name}/pm_crmgen_Env_1.00-1.xls
8281 %ghost %{prefix}/share/pacemaker/%{name}/pm_crmgen.pyc
8382 %ghost %{prefix}/share/pacemaker/%{name}/pm_crmgen.pyo
diff -r 53234afc8345 -r ee3782e61ae6 pm_crmgen_Env_1.00-1.xls
Binary file pm_crmgen_Env_1.00-1.xls has changed
Show on old repository browser