Gentoo Archives: gentoo-commits

From: "Alexys Jacob (ultrabug)" <ultrabug@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-cluster/pacemaker-gui/files: pacemaker-gui-2.0.0-noGTK.patch
Date: Tue, 27 Dec 2011 14:12:13
Message-Id: 20111227141156.8CE662004C@flycatcher.gentoo.org
1 ultrabug 11/12/27 14:11:56
2
3 Added: pacemaker-gui-2.0.0-noGTK.patch
4 Log:
5 fix #392201. EAPI4. Drop the useless init.d and change the log message instructions.
6
7 (Portage version: 2.1.10.40/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-noGTK.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-noGTK.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-noGTK.patch?rev=1.1&content-type=text/plain
14
15 Index: pacemaker-gui-2.0.0-noGTK.patch
16 ===================================================================
17 --- a/lib/mgmt/Makefile.am 2011-12-27 13:00:29.229415108 +0100
18 +++ b/lib/mgmt/Makefile.am 2011-12-27 14:39:54.886062765 +0100
19 @@ -24,15 +24,12 @@
20 -I$(top_builddir) -I$(top_srcdir)
21
22 halibdir = $(libdir)/@HB_PKG@
23 -guilibdir = $(libdir)/heartbeat-gui
24 havarlibdir = $(localstatedir)/lib/@HB_PKG@
25 COMMONLIBS = $(GLIBLIB)
26 MGMT_DIR = mgmt
27 mgmtdir = $(HA_VARLIBHBDIR)/$(MGMT_DIR)
28 apigid = @HA_APIGROUP@
29
30 -EXTRA_DIST = pymgmt.i
31 -
32 lib_LTLIBRARIES = libhbmgmttls.la libhbmgmtclient.la libhbmgmtcommon.la
33 libhbmgmttls_la_SOURCES = mgmt_tls_lib.c
34 libhbmgmttls_la_LIBADD = $(COMMONLIBS) $(GNUTLSLIBS)
35 @@ -46,18 +43,4 @@
36 libhbmgmtcommon_la_LIBADD = $(COMMONLIBS) $(top_builddir)/replace/libreplace.la
37 libhbmgmtcommon_la_CFLAGS = $(INCLUDES)
38
39 -guilib_LTLIBRARIES = _pymgmt.la
40 -_pymgmt_la_SOURCES = pymgmt_wrap.c mgmt_client_lib.c mgmt_tls_lib.c mgmt_common_lib.c
41 -_pymgmt_la_CFLAGS = @PYTHON_INCLUDES@ -I$(top_builddir)/include -w
42 -_pymgmt_la_LDFLAGS = -module
43 -_pymgmt_la_LIBADD = $(top_builddir)/replace/libreplace.la $(GNUTLSLIBS)
44 -
45 -guilib_DATA = pymgmt.py
46 -
47 -pymgmt_wrap.c pymgmt.py: pymgmt.i
48 - $(SWIG) -python $^
49 -
50 install-exec-local:
51 - $(mkinstalldirs) $(DESTDIR)$(mgmtdir)
52 - -chgrp $(apigid) $(DESTDIR)/$(mgmtdir)
53 - chmod 770 $(DESTDIR)/$(mgmtdir)
54 --- a/Makefile.am 2011-12-27 13:00:29.239415185 +0100
55 +++ b/Makefile.am 2011-12-27 14:36:22.964472730 +0100
56 @@ -84,10 +84,6 @@
57 ssh $(OBS_SERVER) -- "cd $(OBS_PREFIX)/server:ha-clustering:Factory/$(OBS_PROJECT); /usr/bin/osc commit -m \"New $(OBS_PROJECT) snapshot - $(shell $(HG) id)\""
58
59 install-exec-local:
60 - -mkdir -p $(DESTDIR)$(bindir)
61 - -cd $(DESTDIR)$(libdir)/heartbeat-gui && rm -f haclient.py && ln -s $(datadir)/heartbeat-gui/haclient.py .
62 - -cd $(DESTDIR)$(bindir) && rm -f crm_gui && ln -s $(datadir)/heartbeat-gui/haclient.py crm_gui
63 - -cd $(DESTDIR)$(bindir) && rm -f hb_gui && ln -s $(datadir)/heartbeat-gui/haclient.py hb_gui
64
65 dist-clean-local:
66 rm -f autoconf automake autoheader