Hello community, here is the log from the commit of package pacemaker-pygui for openSUSE:Factory checked in at Thu Mar 26 00:55:15 CET 2009. -------- --- pacemaker-pygui/pacemaker-pygui.changes 2009-02-10 07:44:11.000000000 +0100 +++ pacemaker-pygui/pacemaker-pygui.changes 2009-03-26 00:54:56.175673000 +0100 @@ -0,0 +1,32 @@ +------------------------------------------------------------------- +Fri Mar 20 07:18:46 CET 2009 - xwhu@suse.de + +- Adapt the newly changed header file + +------------------------------------------------------------------- +Tue Mar 10 12:15:07 CST 2009 - xwhu@suse.de + +- Adapt the API change of CRM + +------------------------------------------------------------------- +Fri Mar 6 12:19:12 CST 2009 - xwhu@suse.de + +- Fix segment of snmp subagent for cib callback +- Improve UI by hiding some advanced options in the simple mode + +------------------------------------------------------------------- +Thu Feb 26 15:06:54 CST 2009 - xwhu@suse.de + +- Remove the intermediate objects when cancel the "add" operation +- Alphabetically sort the list of supported cluster_properties +- Fix treating a cluster property of "time" as "integer" +- Change default attribute of Clone to globally-unique=false +- Add all of the pe-*.bz2 for selecting when viewing transition information +- Do not update the main window if cannot get the CIB default tip + +------------------------------------------------------------------- +Mon Feb 16 07:39:29 CET 2009 - xwhu@suse.de + +- bnc#474867, Shouldn't propose invalid ID in wizard mode + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- clone-real-id.diff dont_check_ais_messaging.diff frontend-validate.diff improve_stack_checking.diff return_code.diff snmp_agent_select.diff sort-by-call-id.diff New: ---- pacemaker-api.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pacemaker-pygui.spec ++++++ --- /var/tmp/diff_new_pack.Y19063/_old 2009-03-26 00:55:01.000000000 +0100 +++ /var/tmp/diff_new_pack.Y19063/_new 2009-03-26 00:55:01.000000000 +0100 @@ -30,7 +30,7 @@ Name: pacemaker-pygui Summary: Management Tools for Pacemaker based HA solution Version: 1.4 -Release: 11 +Release: 14 License: GPL v2 or later Url: http://hg.clusterlabs.org/pacemaker/pygui Group: Productivity/Clustering/HA @@ -39,13 +39,15 @@ Source2: pacemaker-starter.glade #Patch0: cluster_report.diff #Patch1: quit_on_display_error.diff -Patch2: snmp_agent_select.diff -Patch3: frontend-validate.diff -Patch4: clone-real-id.diff -Patch5: return_code.diff -Patch6: sort-by-call-id.diff -Patch7: improve_stack_checking.diff -Patch8: dont_check_ais_messaging.diff +#Patch2: snmp_agent_select.diff +#Patch3: frontend-validate.diff +#Patch4: clone-real-id.diff +#Patch5: return_code.diff +#Patch6: sort-by-call-id.diff +#Patch7: improve_stack_checking.diff +#Patch8: dont_check_ais_messaging.diff +#Patch9: dont-propose-id-in-wizard-mode.diff +Patch10: pacemaker-api.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Requires: pyxml graphviz-python python-gtk python-lxml @@ -113,13 +115,15 @@ %setup -n pygui #%patch0 -p1 #%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +#%patch2 -p1 +#%patch3 -p1 +#%patch4 -p1 +#%patch5 -p1 +#%patch6 -p1 +#%patch7 -p1 +#%patch8 -p1 +#%patch9 -p1 +%patch10 -p1 ########################################################### %build @@ -180,9 +184,10 @@ #pushd $RPM_BUILD_ROOT/usr/bin #ln -sf ../share/heartbeat-gui/pacemaker_starter.py pacemaker_starter #popd +rm -rf $RPM_BUILD_ROOT/usr/share/doc/packages/pacemaker-mgmt 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 +install -m 644 -T snmp_subagent/README.hbagent $RPM_BUILD_ROOT/usr/share/doc/packages/pacemaker-pygui/README.hbagent +install -m 644 snmp_subagent/README.hbagentv2 $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 @@ -220,7 +225,7 @@ %{_includedir}/heartbeat/mgmt/mgmt_client.h %{_includedir}/heartbeat/mgmt/mgmt_common.h %{_includedir}/heartbeat/mgmt/mgmt_tls.h -%{_includedir}/heartbeat/pygui_config.h +%{_includedir}/heartbeat/mgmt_config.h %files ########################################################### @@ -228,6 +233,7 @@ %dir %{_libdir}/heartbeat %{_sysconfdir}/pam.d/hbmgmtd %{_bindir}/hb_gui +%{_bindir}/crm_gui #%{_bindir}/pacemaker_starter %{_libdir}/heartbeat-gui %{_libdir}/heartbeat-gui/haclient.py @@ -241,16 +247,32 @@ %{_libdir}/heartbeat-gui/_pymgmt.so* %{_libdir}/heartbeat/hbagent %{_datadir}/heartbeat-gui -%{_datadir}/heartbeat-gui/*.png +#%{_datadir}/heartbeat-gui/*.png #%{_datadir}/heartbeat-gui/*.glade -%{_datadir}/heartbeat-gui/*.py +#%{_datadir}/heartbeat-gui/*.py %{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.mo -%{_datadir}/snmp/mibs/LINUX-HA-MIB.mib +%{_datadir}/snmp/mibs/LINUX-HA-MIB.txt %{_datadir}/heartbeat/SNMPAgentSanityCheck %{_docdir}/pacemaker-pygui %{_docdir}/pacemaker-pygui/* %changelog +* Fri Mar 20 2009 xwhu@suse.de +- Adapt the newly changed header file +* Tue Mar 10 2009 xwhu@suse.de +- Adapt the API change of CRM +* Fri Mar 06 2009 xwhu@suse.de +- Fix segment of snmp subagent for cib callback +- Improve UI by hiding some advanced options in the simple mode +* Thu Feb 26 2009 xwhu@suse.de +- Remove the intermediate objects when cancel the "add" operation +- Alphabetically sort the list of supported cluster_properties +- Fix treating a cluster property of "time" as "integer" +- Change default attribute of Clone to globally-unique=false +- Add all of the pe-*.bz2 for selecting when viewing transition information +- Do not update the main window if cannot get the CIB default tip +* Mon Feb 16 2009 xwhu@suse.de +- bnc#474867, Shouldn't propose invalid ID in wizard mode * Tue Feb 10 2009 xwhu@suse.de - Fix configure problem with latest openais update * Fri Feb 06 2009 xwhu@suse.de @@ -262,13 +284,13 @@ - bnc#467977, document for SNMP agent * Wed Jan 21 2009 xwhu@suse.de - bnc#467809, pacemaker-pygui depends on python-gtk -* Thu Dec 11 2008 xwhu@suse.de +* Fri Dec 12 2008 xwhu@suse.de - bnc#456430, add a wizard for adding new resources -* Thu Dec 04 2008 xwhu@suse.de +* Fri Dec 05 2008 xwhu@suse.de - bnc#455988, GUI should only add provider for ocf resources - bnc#456380, GUI segfault on wrong DISPLAY setting - Add support for transition graph - GUI for node local openais configuration - Enable snmp agent for pacemaker on openais -* Fri Sep 12 2008 xwhu@suse.de +* Sat Sep 13 2008 xwhu@suse.de - First checking ++++++ pacemaker-api.patch ++++++ Index: pygui/mgmt/daemon/mgmt_crm.c =================================================================== --- pygui.orig/mgmt/daemon/mgmt_crm.c +++ pygui/mgmt/daemon/mgmt_crm.c @@ -266,7 +266,7 @@ get_parent(resource_t* child) while (cur != NULL) { resource_t* rsc = (resource_t*)cur->data; if(is_not_set(rsc->flags, pe_rsc_orphan) || rsc->role != RSC_ROLE_STOPPED) { - GList* child_list = rsc->fns->children(rsc); + GList* child_list = rsc->children; if (g_list_find(child_list, child) != NULL) { free_data_set(data_set); return rsc; @@ -610,7 +610,7 @@ on_get_crm_metadata(char* argv[], int ar return strdup(MSG_FAIL); } - snprintf(cmd, sizeof(cmd), BIN_DIR"/%s metadata", argv[1]); + snprintf(cmd, sizeof(cmd), HA_LIBHBDIR"/%s metadata", argv[1]); if ((fstream = popen(cmd, "r")) == NULL){ mgmt_log(LOG_ERR, "error on popen %s: %s", cmd, strerror(errno)); @@ -1165,7 +1165,7 @@ on_get_sub_rsc(char* argv[], int argc) data_set = get_data_set(); GET_RESOURCE() - cur = rsc->fns->children(rsc); + cur = rsc->children; ret = strdup(MSG_OK); while (cur != NULL) { Index: pygui/snmp_subagent/hbagentv2.c =================================================================== --- pygui.orig/snmp_subagent/hbagentv2.c +++ pygui/snmp_subagent/hbagentv2.c @@ -168,7 +168,7 @@ update_resources_recursively(GListPtr re }); /* end slist_iter(node) */ /* add resources recursively for group/clone/master */ - index = update_resources_recursively(rsc->fns->children(rsc), + index = update_resources_recursively(rsc->children, nodelist, index); }); /* end slist_iter(rsc) */ ++++++ pygui.tar.bz2 ++++++ ++++ 6604 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org