Mailinglist Archive: opensuse-commit (1177 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package pacemaker-pygui for openSUSE:Factory
checked in at Fri Jan 23 14:35:41 CET 2009.


--------
--- pacemaker-pygui/pacemaker-pygui.changes     2009-01-21 03:00:29.000000000 
+0100
+++ /mounts/work_src_done/STABLE/pacemaker-pygui/pacemaker-pygui.changes        
2009-01-23 06:58:49.000000000 +0100
@@ -0,0 +1,8 @@
+Fri Jan 23 11:52:55 CST 2009 - xwhu@xxxxxxx
+
+- bnc#467964, instance attributes for stonith
+- bnc#467967, long description makes window too long
+- bnc#468418, hbagent crash on uninitialized fdset
+- bnc#467977, document for SNMP agent
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  cluster_report.diff
  quit_on_display_error.diff

New:
----
  snmp_agent_select.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pacemaker-pygui.spec ++++++
--- /var/tmp/diff_new_pack.x14932/_old  2009-01-23 14:34:19.000000000 +0100
+++ /var/tmp/diff_new_pack.x14932/_new  2009-01-23 14:34:19.000000000 +0100
@@ -30,15 +30,16 @@
 Name:           pacemaker-pygui
 Summary:        Management Tools for Pacemaker based HA solution
 Version:        1.4
-Release:        6
+Release:        7
 License:        GPL v2 or later
 Url:            http://hg.clusterlabs.org/pacemaker/pygui
 Group:          Productivity/Clustering/HA
 Source:         pygui.tar.bz2
 Source1:        pacemaker_starter.py
 Source2:        pacemaker-starter.glade
-Patch0:         cluster_report.diff
-Patch1:         quit_on_display_error.diff
+#Patch0:         cluster_report.diff
+#Patch1:         quit_on_display_error.diff
+Patch2:         snmp_agent_select.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 AutoReqProv:    on
 Requires:       pyxml graphviz-python python-gtk
@@ -104,8 +105,9 @@
 %prep
 ###########################################################
 %setup -n pygui
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
+#%patch1 -p1
+%patch2 -p1
 ###########################################################
 
 %build
@@ -161,11 +163,14 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/heartbeat-gui
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/heartbeat-gui
-pushd $RPM_BUILD_ROOT/usr/bin
-ln -sf ../share/heartbeat-gui/pacemaker_starter.py pacemaker_starter
-popd
+#install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/heartbeat-gui
+#install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/heartbeat-gui
+#pushd $RPM_BUILD_ROOT/usr/bin
+#ln -sf ../share/heartbeat-gui/pacemaker_starter.py pacemaker_starter
+#popd
+mkdir -p  $RPM_BUILD_ROOT/usr/share/doc/packages/pacemaker-pygui
+install -m 644 -T snmp_subagent/README 
$RPM_BUILD_ROOT/usr/share/doc/packages/pacemaker-pygui/README.subagent
+install -m 644 snmp_subagent/README_hbagentv2.txt 
$RPM_BUILD_ROOT/usr/share/doc/packages/pacemaker-pygui
 # Cleanup
 [ -d $RPM_BUILD_ROOT/usr/man ] && rm -rf $RPM_BUILD_ROOT/usr/man
 [ -d $RPM_BUILD_ROOT/usr/share/libtool ] && rm -rf 
$RPM_BUILD_ROOT/usr/share/libtool
@@ -211,7 +216,7 @@
 %dir %{_libdir}/heartbeat
 %{_sysconfdir}/pam.d/hbmgmtd
 %{_bindir}/hb_gui
-%{_bindir}/pacemaker_starter
+#%{_bindir}/pacemaker_starter
 %{_libdir}/heartbeat-gui
 %{_libdir}/heartbeat-gui/haclient.py
 %{_libdir}/heartbeat-gui/pymgmt.py
@@ -225,13 +230,20 @@
 %{_libdir}/heartbeat/hbagent
 %{_datadir}/heartbeat-gui
 %{_datadir}/heartbeat-gui/*.png
-%{_datadir}/heartbeat-gui/*.glade
+#%{_datadir}/heartbeat-gui/*.glade
 %{_datadir}/heartbeat-gui/*.py
 %{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.mo
 %{_datadir}/snmp/mibs/LINUX-HA-MIB.mib
 %{_datadir}/heartbeat/SNMPAgentSanityCheck
+%{_docdir}/pacemaker-pygui
+%{_docdir}/pacemaker-pygui/*
 
 %changelog
+* Fri Jan 23 2009 xwhu@xxxxxxx
+- bnc#467964, instance attributes for stonith
+- bnc#467967, long description makes window too long
+- bnc#468418, hbagent crash on uninitialized fdset
+- bnc#467977, document for SNMP agent
 * Wed Jan 21 2009 xwhu@xxxxxxx
 - bnc#467809, pacemaker-pygui depends on python-gtk
 * Thu Dec 11 2008 xwhu@xxxxxxx

++++++ pygui.tar.bz2 ++++++
++++ 6904 lines of diff (skipped)

++++++ snmp_agent_select.diff ++++++
Index: pygui/snmp_subagent/hbagent.c
===================================================================
--- pygui.orig/snmp_subagent/hbagent.c  2008-12-11 19:34:45.000000000 +0800
+++ pygui/snmp_subagent/hbagent.c       2009-01-22 22:56:46.000000000 +0800
@@ -1512,9 +1512,9 @@
                /* 0 == don't block */
                /* agent_check_and_process(1); */
 
-#if SUPPORT_HEARTBEAT
                FD_ZERO(&fdset);
-                FD_SET(hb_fd, &fdset);
+#if SUPPORT_HEARTBEAT
+               FD_SET(hb_fd, &fdset);
                numfds = hb_fd + 1;
 
                if (clmInitialized) {

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx