October 2009 - openSUSE Commits - openSUSE Mailing Lists

commit cluster-glue for openSUSE:Factory
by root＠Hilbert.suse.de 27 Oct '09

27 Oct '09

Hello community, here is the log from the commit of package cluster-glue for openSUSE:Factory checked in at Tue Oct 27 17:22:05 CET 2009. -------- calling whatdependson for head-i586 Old: ---- cluster-glue-Fedora_11.spec cluster-glue-RHEL_5.spec cluster-glue.Fedora.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cluster-glue.spec ++++++ --- /var/tmp/diff_new_pack.E5TcdP/_old 2009-10-27 17:22:02.000000000 +0100 +++ /var/tmp/diff_new_pack.E5TcdP/_new 2009-10-27 17:22:02.000000000 +0100 @@ -24,7 +24,7 @@ Name: cluster-glue Summary: Reusable cluster components Version: 1.0 -Release: 1 +Release: 2 License: GPL v2 or later ; LGPL v2.1 or later Url: http://www.linux-ha.org Group: Productivity/Clustering/HA ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cluster-glue for openSUSE:Factory
by root＠Hilbert.suse.de 27 Oct '09

27 Oct '09

Hello community, here is the log from the commit of package cluster-glue for openSUSE:Factory checked in at Tue Oct 27 17:20:57 CET 2009. -------- --- cluster-glue/cluster-glue.changes 2009-08-03 10:17:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/cluster-glue/cluster-glue.changes 2009-08-24 10:30:47.000000000 +0200 @@ -2 +2 @@ -Mon Aug 3 10:08:17 CEST 2009 - abeekhof(a)suse.de +Mon Aug 24 10:27:23 CEST 2009 - abeekhof(a)suse.de @@ -4 +4,37 @@ -- Don't use macros for the group names +- Use the hacluster/haclient user/group instead of daemon on Fedora + and derivatives + +------------------------------------------------------------------- +Mon Aug 17 15:36:51 CEST 2009 - abeekhof(a)suse.de + +- Include relevant Obsoletes: directives for upgrading + +------------------------------------------------------------------- +Fri Aug 14 19:36:46 CEST 2009 - abeekhof(a)suse.de + +- Remove bogus conflicts on heartbeat +- Upstream version cs: 10b6d4ec44a1 + + Prefer glibtool over libtool for BSD and friends + + Medium: logd: add init script and example configuration file. + + High: logd: Fix init script. Remove apphbd references. + + logd: configuration file is optional. + + logd: print status on finished operations. + + High: sbd: actually install the binary. + + Medium: stonith: remove references to heartbeat artifacts. + +------------------------------------------------------------------- +Wed Aug 12 12:03:48 CEST 2009 - abeekhof(a)suse.de + +- Fix building on Fedora and derivatives + +------------------------------------------------------------------- +Tue Aug 11 13:04:20 CEST 2009 - abeekhof(a)suse.de + +- Upstream version cs: aa5b5e48df62 + + Med: hb_report: report on more packages and with more state. + + The -E option to lrmadmin does not take an argument + + Provide a default value for docdir and ensure it is expanded + + Low: clplumbing: fix a potential resource leak in cl_random (bnc#525393). + + Med: hb_report: Include dlm_tool debugging information if available. + + hb_report: Include more possible error output. + + Ensure hb_report is built/packaged calling whatdependson for head-i586 New: ---- cluster-glue-Fedora_11.spec cluster-glue-RHEL_5.spec cluster-glue.Fedora.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cluster-glue-Fedora_11.spec ++++++ # # spec file for package cluster-glue (Version 1.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define gname haclient %define uname hacluster %define nogroup nobody # When downloading directly from Mercurial, it will automatically add this prefix # Invoking 'hg archive' wont but you can add one with: hg archive -t tgz -p "Reusable-Cluster-Components-" -r $upstreamversion $upstreamversion.tar.gz %define upstreamprefix Reusable-Cluster-Components- %define upstreamversion 75cab275433e Name: cluster-glue Summary: Reusable cluster components Version: 1.0 Release: 1 License: GPL v2 or later ; LGPL v2.1 or later Url: http://www.clusterlabs.org Group: System Environment/Base Source0: cluster-glue.tar.gz Obsoletes: heartbeat-common ## Setup/build bits BuildRoot: %{_tmppath}/%{name}-%{version}-build # Build dependencies BuildRequires: autoconf automake libtool pkgconfig which BuildRequires: bzip2-devel glib2-devel libxml2-devel python-devel BuildRequires: OpenIPMI-devel openssl-devel %if 0%{?fedora} BuildRequires: chrpath libcurl-devel libnet-devel %endif %if 0%{?fedora} || 0%{?centos} > 4 || 0%{?rhel} > 4 BuildRequires: libtool-ltdl-devel openhpi-devel BuildRequires: net-snmp-devel >= 5.4 %else BuildRequires: gcc-c++ %endif %if 0%{?fedora} < 12 BuildRequires: e2fsprogs-devel %else BuildRequires: libuuid-devel %endif %prep %setup -q -n cluster-glue ./autogen.sh %{configure} CFLAGS="${CFLAGS} $(echo '%{optflags}')" \ --enable-fatal-warnings=no \ --with-daemon-group=%{gname} \ --with-daemon-user=%{uname} \ --localstatedir=%{_var} \ --libdir=%{_libdir} %build make %{_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} ## tree fix up # Dont package static libs find %{buildroot} -name '*.a' -exec rm {} \; find %{buildroot} -name '*.la' -exec rm {} \; find %{buildroot} -type f -exec chrpath -d {} >/dev/null 2>&1 \; %clean rm -rf %{buildroot} # cluster-glue %description A collection of common tools that are useful for writing cluster managers such as Pacemaker. Provides a local resource manager that understands the OCF and LSB standards, and an interface to common STONITH devices. %files %defattr(-,root,root) %dir %{_datadir}/heartbeat %{_sysconfdir}/init.d/logd %{_datadir}/heartbeat/ha_cf_support.sh %{_datadir}/heartbeat/openais_conf_support.sh %{_datadir}/heartbeat/utillib.sh %{_sbindir}/ha_logger %{_sbindir}/hb_report %{_sbindir}/lrmadmin %{_sbindir}/meatclient %{_sbindir}/stonith %{_sbindir}/sbd %dir %{_libdir}/heartbeat %dir %{_libdir}/heartbeat/plugins %dir %{_libdir}/heartbeat/plugins/RAExec %dir %{_libdir}/heartbeat/plugins/InterfaceMgr %{_libdir}/heartbeat/lrmd %{_libdir}/heartbeat/ha_logd %{_libdir}/heartbeat/plugins/RAExec/*.so %{_libdir}/heartbeat/plugins/InterfaceMgr/*.so %dir %{_libdir}/stonith %dir %{_libdir}/stonith/plugins %dir %{_libdir}/stonith/plugins/stonith2 %{_libdir}/stonith/plugins/external %{_libdir}/stonith/plugins/stonith2/*.so %{_libdir}/stonith/plugins/stonith2/*.py* %{_libdir}/stonith/plugins/xen0-ha-dom0-stonith-helper %dir %{_var}/lib/heartbeat %dir %{_var}/lib/heartbeat/cores %dir %attr (0700, root, root) %{_var}/lib/heartbeat/cores/root %dir %attr (0700, nobody, %{nogroup}) %{_var}/lib/heartbeat/cores/nobody %dir %attr (0700, %{uname}, %{gname}) %{_var}/lib/heartbeat/cores/%{uname} %if 0%{?fedora} %doc %{_docdir}/glue/stonith %else %doc %{_docdir}/stonith %endif %doc %{_mandir}/man8/* %doc %{_mandir}/man1/* %doc AUTHORS %doc COPYING # cluster-glue-libs %package -n cluster-glue-libs License: GPLv2+ and LGPLv2+ Summary: Reusable cluster libraries Group: Development/Libraries Requires: %{name} = %{version}-%{release} # Directives to allow upgrade from combined heartbeat packages in Fedora11 Provides: heartbeat-stonith = 3.0.0-1 Provides: heartbeat-pils = 3.0.0-1 Obsoletes: heartbeat-stonith < 3.0.0-1 Obsoletes: heartbeat-pils < 3.0.0-1 Obsoletes: libheartbeat2 %description -n cluster-glue-libs A collection of libraries that are useful for writing cluster managers such as Pacemaker. %pre getent group %{gname} >/dev/null || groupadd -r %{gname} getent passwd %{uname} >/dev/null || \ useradd -r -g %{gname} -d %{_var}/lib/heartbeat/cores/hacluster -s /sbin/nologin \ -c "cluster user" %{uname} exit 0 %post -n cluster-glue-libs -p /sbin/ldconfig %postun -n cluster-glue-libs -p /sbin/ldconfig %files -n cluster-glue-libs %defattr(-,root,root) %{_libdir}/lib*.so.* %doc AUTHORS %doc COPYING.LIB # cluster-glue-libs-devel %package -n cluster-glue-libs-devel License: GPLv2+ and LGPLv2+ Summary: Headers and libraries for writing cluster managers Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: cluster-glue-libs = %{version}-%{release} Obsoletes: libheartbeat-devel %description -n cluster-glue-libs-devel Headers and shared libraries for a useful for writing cluster managers such as Pacemaker. %files -n cluster-glue-libs-devel %defattr(-,root,root) %dir %{_libdir}/glue %dir %{_libdir}/glue/plugins %dir %{_libdir}/glue/plugins/test %dir %{_libdir}/heartbeat %dir %{_datadir}/glue %{_libdir}/lib*.so %{_libdir}/heartbeat/ipctest %{_libdir}/heartbeat/ipctransientclient %{_libdir}/heartbeat/ipctransientserver %{_libdir}/heartbeat/transient-test.sh %{_libdir}/heartbeat/base64_md5_test %{_libdir}/heartbeat/logtest %{_includedir}/clplumbing %{_includedir}/heartbeat %{_includedir}/stonith %{_includedir}/pils %{_datadir}/glue/lrmtest %{_libdir}/glue/plugins/test/test.so %doc AUTHORS %doc COPYING %doc COPYING.LIB %changelog cluster-glue-RHEL_5.spec: same change cluster-glue.Fedora.spec: same change ++++++ cluster-glue.spec ++++++ --- /var/tmp/diff_new_pack.FgcHOv/_old 2009-10-27 17:18:47.000000000 +0100 +++ /var/tmp/diff_new_pack.FgcHOv/_new 2009-10-27 17:18:47.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cluster-glue (Version 0.9) +# spec file for package cluster-glue (Version 1.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,10 @@ %define uid 90 %define gname haclient %define uname hacluster -%define nogroup nobody -%define nogroup nogroup Name: cluster-glue Summary: Reusable cluster components -Version: 0.9 +Version: 1.0 Release: 1 License: GPL v2 or later ; LGPL v2.1 or later Url: http://www.linux-ha.org @@ -34,9 +32,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on BuildRequires: autoconf automake e2fsprogs-devel glib2-devel libtool libxml2-devel pkgconfig python-devel -BuildRequires: libcurl-devel libnet net-snmp-devel -# OpenIPMI-devel openhpi-devel +BuildRequires: OpenIPMI-devel libnet net-snmp-devel openhpi-devel +Obsoletes: heartbeat-common Requires(pre): /usr/sbin/groupadd /usr/bin/getent /usr/sbin/useradd +# SLES10 needs tcpd-devel but doesn't have libcurl +%if 0%{?suse_version} < 1020 +BuildRequires: tcpd-devel +%else +BuildRequires: libcurl-devel +%endif %description A collection of common tools derived from the Heartbeat project that are @@ -48,6 +52,7 @@ License: GPL v2 only ; GPL v2 or later ; LGPL v2.1 or later Summary: The Pacemaker scalable High-Availability cluster resource manager Group: Productivity/Clustering/HA +Obsoletes: libheartbeat2 Requires: %{name} = %{version}-%{release} %description -n libglue1 @@ -60,6 +65,7 @@ Group: Development/Libraries/C and C++ Requires: %{name} = %{version}-%{release} Requires: libglue1 = %{version}-%{release} +Obsoletes: libheartbeat-devel %description -n libglue-devel Headers and shared libraries for a useful for writing cluster managers @@ -74,7 +80,11 @@ CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" export CFLAGS ./autogen.sh +%if 0%{?suse_version} < 1020 +%configure --enable-fatal-warnings=no --with-daemon-group=%{gname} --with-daemon-user=%{uname} +%else %configure --enable-fatal-warnings=no --with-daemon-group=%{gname} --with-daemon-user=%{uname} --docdir=%{_docdir} +%endif export MAKE="make %{?jobs:-j%jobs}" make %{?jobs:-j%jobs} ########################################################### @@ -87,6 +97,11 @@ find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f find $RPM_BUILD_ROOT -name '*.pyc' -type f -print0 | xargs -0 rm -f find $RPM_BUILD_ROOT -name '*.pyo' -type f -print0 | xargs -0 rm -f +test -d $RPM_BUILD_ROOT/sbin || mkdir $RPM_BUILD_ROOT/sbin +( + cd $RPM_BUILD_ROOT/sbin + ln -s /etc/init.d/logd rclogd +) ########################################################### %clean @@ -130,7 +145,7 @@ %dir %{_var}/lib/heartbeat %dir %{_var}/lib/heartbeat/cores %dir %attr (0700, root, root) %{_var}/lib/heartbeat/cores/root -%dir %attr (0700, nobody, %{nogroup}) %{_var}/lib/heartbeat/cores/nobody +%dir %attr (0700, nobody, nobody) %{_var}/lib/heartbeat/cores/nobody %dir %attr (0700, %{uname}, %{gname}) %{_var}/lib/heartbeat/cores/%{uname} %dir %{_libdir}/heartbeat/plugins %dir %{_libdir}/heartbeat/plugins/RAExec @@ -138,15 +153,28 @@ %dir %{_libdir}/stonith %dir %{_libdir}/stonith/plugins %dir %{_libdir}/stonith/plugins/stonith2 +%dir %{_datadir}/heartbeat +%{_datadir}/heartbeat/ha_cf_support.sh +%{_datadir}/heartbeat/openais_conf_support.sh +%{_datadir}/heartbeat/utillib.sh %{_sbindir}/ha_logger +%{_sbindir}/hb_report %{_sbindir}/lrmadmin %{_sbindir}/meatclient %{_sbindir}/stonith +%{_sbindir}/sbd +%{_sysconfdir}/init.d/logd +%if 0%{?suse_version} < 1020 +%doc %{_datadir}/doc/stonith +%else %doc %{_docdir}/stonith +%endif %doc %{_mandir}/man8/* %doc %{_mandir}/man1/* %doc AUTHORS %doc COPYING +%doc logd/logd.cf +/sbin/rclogd %{_libdir}/heartbeat/lrmd %{_libdir}/heartbeat/ha_logd %{_libdir}/heartbeat/plugins/RAExec/*.so ++++++ cluster-glue.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/.hg_archival.txt new/cluster-glue/.hg_archival.txt --- old/cluster-glue/.hg_archival.txt 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/.hg_archival.txt 2009-08-14 15:06:26.000000000 +0200 @@ -1,2 +1,2 @@ repo: e3ffdd7ae81c596b2be7e1e110d2c1255161340e -node: 2e136fee6761a79fd819fe06e6fc7db730d5526f +node: 0fbe5d0e9ea6d180225a31eac162f0c0a8839d95 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/.hgtags new/cluster-glue/.hgtags --- old/cluster-glue/.hgtags 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/.hgtags 2009-08-14 15:06:26.000000000 +0200 @@ -35,3 +35,4 @@ e3855af19554339204b5b2b2a199a7bc31e22843 STABLE-2.0.2 e6637f62c87ada212a83942ec5b2a4bf30b98c3f Series-Root-1.2 f6c2cd2593f365f984ce051db61466738ac05dcd Beta-0.4.9f +940fa13f6a0a929d15a01af9a0b62c16e4d2706a glue-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/Makefile.am new/cluster-glue/Makefile.am --- old/cluster-glue/Makefile.am 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/Makefile.am 2009-08-14 15:06:26.000000000 +0200 @@ -19,9 +19,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure DRF/config-h.in \ DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar -SUBDIRS = include $(LIBLTDL_DIR) replace lib lrm logd - -ACLOCAL_AMFLAGS = -I libltdl/m4 +SUBDIRS = include $(LIBLTDL_DIR) replace lib lrm logd hb_report RPM_OPTS = --define "_sourcedir $(RPM_ROOT)" \ --define "_specdir $(RPM_ROOT)" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/autogen.sh new/cluster-glue/autogen.sh --- old/cluster-glue/autogen.sh 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/autogen.sh 2009-08-14 15:06:26.000000000 +0200 @@ -105,7 +105,7 @@ fi done -for command in glibtool libtool14 libtool15 libtool +for command in libtool14 libtool15 libtool glibtool do URL=$gnu/$pkg/ if @@ -117,19 +117,19 @@ done if [ -z $autoconf ]; then - echo You must have autoconf installed to compile the linux-ha package. + echo You must have autoconf installed to compile the cluster-glue package. echo Download the appropriate package for your system, echo or get the source tarball at: $gnu/autoconf/ exit 1 elif [ -z $automake ]; then - echo You must have automake installed to compile the linux-ha package. + echo You must have automake installed to compile the cluster-glue package. echo Download the appropriate package for your system, echo or get the source tarball at: $gnu/automake/ exit 1 elif [ -z $libtool ]; then - echo You must have libtool installed to compile the linux-ha package. + echo You must have libtool installed to compile the cluster-glue package. echo Download the appropriate package for your system, echo or get the source tarball at: $gnu/libtool/ exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/configure.ac new/cluster-glue/configure.ac --- old/cluster-glue/configure.ac 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/configure.ac 2009-08-14 15:06:26.000000000 +0200 @@ -19,8 +19,7 @@ dnl checks for library functions dnl checks for system services -AC_INIT(glue, 1.0.0, pacemaker(a)oss.clusterlabs.org) -CRM_DTD_VERSION="1.0" +AC_INIT(glue, 1.0.0, linux-ha-dev(a)lists.linux-ha.org) PKG_FEATURES="" HB_PKG=heartbeat @@ -259,9 +258,15 @@ eval infodir="`eval echo ${infodir}`" eval mandir="`eval echo ${mandir}`" +dnl docdir is a recent addition to autotools +eval docdir="`eval echo ${docdir}`" +if test "x$docdir" = "x"; then + docdir="`eval echo ${datadir}/doc`" +fi +AC_SUBST(docdir) + dnl Home-grown variables eval INITDIR="${INITDIR}" -eval docdir="`eval echo ${docdir}`" for j in prefix exec_prefix bindir sbindir libexecdir datadir sysconfdir \ sharedstatedir localstatedir libdir includedir oldincludedir infodir \ @@ -631,6 +636,7 @@ AC_CHECK_HEADERS(sys/ioctl.h) AC_CHECK_HEADERS(sys/param.h) AC_CHECK_HEADERS(sys/poll.h) +AC_CHECK_HEADERS(sys/reboot.h) AC_CHECK_HEADERS(sys/resource.h) AC_CHECK_HEADERS(sys/select.h) AC_CHECK_HEADERS(sys/socket.h) @@ -759,6 +765,14 @@ AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[[#include <time.h>]]) AC_CHECK_TYPES([nfds_t],,,[[#include <poll.h>]]) +AC_MSG_CHECKING(if clock_t is long enough) +if test $ac_cv_sizeof_long -ge 8; then + AC_MSG_RESULT(yes) + AC_DEFINE(CLOCK_T_IS_LONG_ENOUGH, 1, [Set if CLOCK_T is adequate by itself for the "indefinite future" (>= 100 years)]) +else + AC_MSG_RESULT(no) +fi + dnl ======================================================================== dnl Functions dnl ======================================================================== @@ -1206,8 +1220,11 @@ lrm/test/LRMBasicSanityCheck \ lrm/test/testcases/Makefile \ logd/Makefile \ +logd/logd \ replace/Makefile \ - ) +hb_report/Makefile \ + hb_report/hb_report \ +) dnl Now process the entire list of files added by previous dnl calls to AC_CONFIG_FILES() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/hb_report/Makefile.am new/cluster-glue/hb_report/Makefile.am --- old/cluster-glue/hb_report/Makefile.am 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/hb_report/Makefile.am 2009-08-14 15:06:26.000000000 +0200 @@ -22,4 +22,4 @@ hanoarchdir = $(datadir)/heartbeat hanoarch_SCRIPTS = utillib.sh ha_cf_support.sh openais_conf_support.sh -sbin_SCRIPTS = hb_report ocf-tester +sbin_SCRIPTS = hb_report diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/hb_report/hb_report.in new/cluster-glue/hb_report/hb_report.in --- old/cluster-glue/hb_report/hb_report.in 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/hb_report/hb_report.in 2009-08-14 15:06:26.000000000 +0200 @@ -17,7 +17,10 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -. @sysconfdir@/ha.d/shellfuncs +. /usr/lib/ocf/resource.d/heartbeat/.ocf-shellfuncs + +HA_NOARCHBIN=@datadir@/heartbeat + . $HA_NOARCHBIN/utillib.sh unset LANG @@ -508,6 +511,20 @@ df set +x } +dlm_dump() { + if which dlm_tool >/dev/null 2>&1 ; then + echo NOTICE - Lockspace overview: + dlm_tool ls + dlm_tool ls | grep name | + while read X N ; do + echo NOTICE - Lockspace $N: + dlm_tool lockdump $N + done + echo NOTICE - Lockspace history: + dlm_tool dump + fi +} + # # replace sensitive info with '****' @@ -792,11 +809,19 @@ # the very first thing we must figure out is which cluster # stack is used CORES_DIRS=$HA_VARLIB/cores -COMMON_PACKAGES="pacemaker heartbeat-common heartbeat-resources" +PACKAGES="pacemaker libpacemaker3 pacemaker-pygui +openais libopenais2 +resource-agents cluster-glue libglue1 ldirectord +heartbeat heartbeat-common heartbeat-resources libheartbeat2 +ocfs2-tools ocfs2-tools-o2cb ocfs2-kmp-default ocfs2-kmp-pae ocfs2-kmp-xen ocfs2-kmp-debug ocfs2-kmp-trace +drbd drbd-kmp-xen drbd-kmp-pae drbd-kmp-default drbd-kmp-debug drbd-kmp-trace +lvm2 lvm2-clvm +libdlm libdlm2 +kernel-default kernel-pae kernel-xen +" case "$CLUSTER_TYPE" in openais) CONF=/etc/ais/openais.conf - PACKAGES="openais $COMMON_PACKAGES" CF_SUPPORT=$HA_NOARCHBIN/openais_conf_support.sh CORES_DIRS="$CORES_DIRS /var/lib/openais" MEMBERSHIP_TOOL_OPTS="" @@ -804,7 +829,6 @@ ;; heartbeat) CONF=$HA_CF - PACKAGES="heartbeat $COMMON_PACKAGES" CF_SUPPORT=$HA_NOARCHBIN/ha_cf_support.sh MEMBERSHIP_TOOL_OPTS="-H" ;; @@ -842,7 +866,8 @@ BT_F=backtraces.txt SYSINFO_F=sysinfo.txt SYSSTATS_F=sysstats.txt -export ANALYSIS_F DESCRIPTION_F HALOG_F BT_F SYSINFO_F SYSSTATS_F +DLM_DUMP_F=dlm_dump.txt +export ANALYSIS_F DESCRIPTION_F HALOG_F BT_F SYSINFO_F SYSSTATS_F DLM_DUMP_F CRM_MON_F=crm_mon.txt MEMBERSHIP_F=members.txt HB_UUID_F=hb_uuid.txt @@ -979,7 +1004,8 @@ touch_DC_if_dc $DESTDIR/$WE sanitize $DESTDIR/$WE check_perms > $DESTDIR/$WE/$PERMISSIONS_F 2>&1 - sys_info > $DESTDIR/$WE/$SYSINFO_F + sys_info > $DESTDIR/$WE/$SYSINFO_F 2>&1 + dlm_dump > $DESTDIR/$WE/$DLM_DUMP_F 2>&1 sys_stats > $DESTDIR/$WE/$SYSSTATS_F 2>&1 for l in $EXTRA_LOGS; do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/hb_report/utillib.sh new/cluster-glue/hb_report/utillib.sh --- old/cluster-glue/hb_report/utillib.sh 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/hb_report/utillib.sh 2009-08-14 15:06:26.000000000 +0200 @@ -500,34 +500,48 @@ } warning "no lsb_release, no /etc/*-release, no /etc/debian_version: no distro information" } + pkg_ver() { + if which dpkg >/dev/null 2>&1 ; then + pkg_mgr="deb" + fi + if which rpm >/dev/null 2>&1 ; then + pkg_mgr="rpm" + fi + if which pkg_info >/dev/null 2>&1 ; then + pkg_mgr="pkg_info" + fi + if which pkginfo >/dev/null 2>&1 ; then + pkg_mgr="pkginfo" + fi + if [ -z "$pkg_mgr" ]; then + echo "Unknown package manager!" + return + fi + # for Linux .deb based systems - for pkg; do - which dpkg > /dev/null 2>&1 && { - dpkg-query -f '${Name} ${Version}' -W $pkg 2>/dev/null && break - [ $? -eq 0 ] && + for pkg ; do + case $pkg_mgr in + deb) + if dpkg-query -f '${Name} ${Version}' -W $pkg 2>/dev/null ; then debsums -s $pkg 2>/dev/null - break - } - # for Linux .rpm based systems - which rpm > /dev/null 2>&1 && { - rpm -q --qf '%{name} %{version}-%{release}' $pkg && - echo && - rpm --verify $pkg - break - } - # for OpenBSD - which pkg_info > /dev/null 2>&1 && { + fi + ;; + rpm) + if rpm -q --qf '%{name} %{version}-%{release} - %{distribution} %{arch}\n' $pkg ; then + rpm --verify $pkg + fi + ;; + pkg_info) pkg_info | grep $pkg - break - } - # for Solaris - which pkginfo > /dev/null 2>&1 && { + ;; + pkginfo) pkginfo | awk '{print $3}' # format? - } - # more packagers? + ;; + esac done } + crm_info() { $HA_BIN/crmd version 2>&1 } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/clplumbing/cl_random.c new/cluster-glue/lib/clplumbing/cl_random.c --- old/cluster-glue/lib/clplumbing/cl_random.c 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/lib/clplumbing/cl_random.c 2009-08-14 15:06:26.000000000 +0200 @@ -196,9 +196,11 @@ if (fread(buf, 1, sizeof(buf), fs)!= sizeof(buf)){ cl_log(LOG_INFO, "%s: reading file %s failed" , __FUNCTION__, randdevname[idev]); + fclose(fs); }else{ + fclose(fs); return (unsigned int)cl_binary_to_int(buf, sizeof(buf)); - } + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/external/drac5.in new/cluster-glue/lib/plugins/stonith/external/drac5.in --- old/cluster-glue/lib/plugins/stonith/external/drac5.in 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/lib/plugins/stonith/external/drac5.in 2009-08-14 15:06:26.000000000 +0200 @@ -18,7 +18,7 @@ #echo "started with: $@" | debug -. @HA_HBCONF_DIR@/shellfuncs +. /usr/lib/ocf/resource.d/heartbeat/.ocf-shellfuncs trap 'if [ -n "$outf" ]; then cat "$outf" >&2; rmtempfile "$outf"; fi' 0 outf=`maketempfile` || exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/external/hmchttp.in new/cluster-glue/lib/plugins/stonith/external/hmchttp.in --- old/cluster-glue/lib/plugins/stonith/external/hmchttp.in 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/lib/plugins/stonith/external/hmchttp.in 2009-08-14 15:06:26.000000000 +0200 @@ -23,7 +23,7 @@ # Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. # -. @HA_HBCONF_DIR@/shellfuncs +. /usr/lib/ocf/resource.d/heartbeat/.ocf-shellfuncs #set -x hostlist=`echo $hostlist | tr ',' ' '` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/external/ibmrsa.in new/cluster-glue/lib/plugins/stonith/external/ibmrsa.in --- old/cluster-glue/lib/plugins/stonith/external/ibmrsa.in 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/lib/plugins/stonith/external/ibmrsa.in 2009-08-14 15:06:26.000000000 +0200 @@ -27,7 +27,7 @@ #echo "started with: $@" | debug -. @HA_HBCONF_DIR@/shellfuncs +. /usr/lib/ocf/resource.d/heartbeat/.ocf-shellfuncs trap 'if [ -n "$outf" ]; then cat "$outf" >&2; rmtempfile "$outf"; fi' 0 outf=`maketempfile` || exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/external/rackpdu new/cluster-glue/lib/plugins/stonith/external/rackpdu --- old/cluster-glue/lib/plugins/stonith/external/rackpdu 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/lib/plugins/stonith/external/rackpdu 2009-08-14 15:06:26.000000000 +0200 @@ -28,7 +28,7 @@ # Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. # -. /etc/ha.d/shellfuncs +. /usr/lib/ocf/resource.d/heartbeat/.ocf-shellfuncs SWITCH_ON="1" SWITCH_OFF="2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lib/stonith/Makefile.am new/cluster-glue/lib/stonith/Makefile.am --- old/cluster-glue/lib/stonith/Makefile.am 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/lib/stonith/Makefile.am 2009-08-14 15:06:26.000000000 +0200 @@ -26,10 +26,7 @@ ## include files ## binaries -sbin_PROGRAMS = stonith meatclient -if ON_LINUX -sbin_PROGRAMS += sbd -endif +sbin_PROGRAMS = stonith meatclient sbd stonith_SOURCES = main.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/logd/Makefile.am new/cluster-glue/logd/Makefile.am --- old/cluster-glue/logd/Makefile.am 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/logd/Makefile.am 2009-08-14 15:06:26.000000000 +0200 @@ -30,6 +30,8 @@ LIBRT = @LIBRT@ AM_CFLAGS = @CFLAGS@ +initddir = @INITDIR@ + ## binary progs ha_sbin_PROGRAMS = ha_logger halib_PROGRAMS = ha_logd logtest @@ -46,3 +48,6 @@ logtest_SOURCES = logtest.c logtest_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la + +initd_SCRIPTS = logd + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/logd/ha_logd new/cluster-glue/logd/ha_logd --- old/cluster-glue/logd/ha_logd 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/logd/ha_logd 1970-01-01 01:00:00.000000000 +0100 @@ -1,113 +0,0 @@ -#! /bin/sh - -# ha_logd - temporary wrapper script for .libs/ha_logd -# Generated by ltmain.sh - GNU libtool 1.5.24 (1.1220.2.455 2007/06/24 02:13:29) -# -# The ha_logd program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='/usr/bin/sed -e 1s/^X//' -sed_quote_subst='s/$[\\`\\"$\\\\]$/\\\1/g' - -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command="" - -# This environment variable determines our operation mode. -if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then - # install mode needs the following variable: - notinst_deplibs=' ../lib/clplumbing/libplumb.la ../lib/clplumbing/libplumbgpl.la /Users/beekhof/Development/heartbeat/glue-lrm/lib/pils/libpils.la' -else - # When we are sourced in execute mode, $file and $echo are already set. - if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then - echo="/bin/echo" - file="$0" - # Make sure echo works. - if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then - # Yippee, $echo works! - : - else - # Restart under the correct shell, and then maybe $echo will work. - exec /bin/sh "$0" --no-reexec ${1+"$@"} - fi - fi - - # Find the directory that this script lives in. - thisdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "x$thisdir" = "x$file" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=`ls -ld "$file" | /usr/bin/sed -n 's/.*-> //p'` - while test -n "$file"; do - destdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - - # If there was a directory component, then change thisdir. - if test "x$destdir" != "x$file"; then - case "$destdir" in - [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;; - *) thisdir="$thisdir/$destdir" ;; - esac - fi - - file=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - file=`ls -ld "$thisdir/$file" | /usr/bin/sed -n 's/.*-> //p'` - done - - # Try to get the absolute directory name. - absdir=`cd "$thisdir" && pwd` - test -n "$absdir" && thisdir="$absdir" - - program='ha_logd' - progdir="$thisdir/.libs" - - - if test -f "$progdir/$program"; then - # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/beekhof/Development/heartbeat/glue-lrm/lib/clplumbing/.libs:/Users/beekhof/Development/heartbeat/glue-lrm/lib/pils/.libs:$DYLD_LIBRARY_PATH" - - # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH - # The second colon is a workaround for a bug in BeOS R4 sed - DYLD_LIBRARY_PATH=`$echo "X$DYLD_LIBRARY_PATH" | $Xsed -e 's/::*$//'` - - export DYLD_LIBRARY_PATH - - if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then - # Run the actual program with our arguments. - - exec "$progdir/$program" ${1+"$@"} - - $echo "$0: cannot exec $program $*" - exit 1 - fi - else - # The program doesn't exist. - $echo "$0: error: \`$progdir/$program' does not exist" 1>&2 - $echo "This script is just a wrapper for $program." 1>&2 - /bin/echo "See the libtool documentation for more information." 1>&2 - exit 1 - fi -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/logd/ha_logd.c new/cluster-glue/logd/ha_logd.c --- old/cluster-glue/logd/ha_logd.c 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/logd/ha_logd.c 2009-08-14 15:06:26.000000000 +0200 @@ -36,10 +36,6 @@ #include <fcntl.h> #include <string.h> #include <stdarg.h> -#ifdef ENABLE_APPHB -# include <apphb.h> -static gboolean RegisteredWithApphbd = FALSE; -#endif #include <clplumbing/Gmain_timeout.h> #include <clplumbing/coredumps.h> #include <clplumbing/setproctitle.h> @@ -93,7 +89,6 @@ char logfile[MAXLINE]; char entity[MAXLINE]; int log_facility; - gboolean useapphbd; mode_t logmode; gboolean syslogfmtmsgs; } logd_config = @@ -112,7 +107,6 @@ static int set_logfile(const char* option); static int set_facility(const char * value); static int set_entity(const char * option); -static int set_useapphbd(const char* option); static int set_sendqlen(const char * option); static int set_recvqlen(const char * option); static int set_logmode(const char * option); @@ -130,7 +124,6 @@ {"logfile", set_logfile}, {"logfacility", set_facility}, {"entity", set_entity}, - {"useapphbd", set_useapphbd}, {"sendqlen", set_sendqlen}, {"recvqlen", set_recvqlen}, {"logmode", set_logmode}, @@ -214,28 +207,6 @@ } static int -set_useapphbd(const char* option) -{ - if (!option){ - cl_log(LOG_ERR,"set_useapphbd: option is NULL"); - return FALSE; - } - - cl_log(LOG_INFO, "setting useapphbd to %s", option); - if (0 == strcmp(option, "yes")){ - logd_config.useapphbd = TRUE; - return TRUE; - } else if (0 == strcmp(option, "no")){ - logd_config.useapphbd = FALSE; - return TRUE; - } else { - cl_log(LOG_INFO,"invalid useapphbd option"); - return FALSE; - } -} - - -static int set_sendqlen(const char * option) { int length; @@ -698,78 +669,6 @@ return ret; } -#define APPLOGDINSTANCE "logging daemon" - -static void -logd_init_register_with_apphbd(void) -{ -#ifdef ENABLE_APPHB - static int failcount = 0; - if (!logd_config.useapphbd || RegisteredWithApphbd) { - return; - } - - if (apphb_register(cmdname, APPLOGDINSTANCE) != 0) { - /* Log attempts once an hour or so... */ - if ((failcount % 60) == 0) { - cl_log(LOG_INFO, "Unable to register with apphbd." - "Continuing to try and register.\n"); - } - ++failcount; - return; - } - - RegisteredWithApphbd = TRUE; - cl_log(LOG_INFO, "Registered with apphbd as %s/%s.\n", - cmdname, APPLOGDINSTANCE); - - if (apphb_setinterval(logd_deadtime_ms) < 0 - || apphb_setwarn(logd_warntime_ms) < 0) { - cl_log(LOG_ERR, "Unable to setup with apphbd.\n"); - apphb_unregister(); - RegisteredWithApphbd = FALSE; - ++failcount; - }else{ - failcount = 0; - } -#endif -} - - -static gboolean -logd_reregister_with_apphbd(gpointer dummy) -{ - if (logd_config.useapphbd) { - logd_init_register_with_apphbd(); - } - return logd_config.useapphbd; -} - - -static gboolean -logd_apphb_hb(gpointer dummy) -{ -#ifdef ENABLE_APPHB - if (logd_config.useapphbd) { - if (RegisteredWithApphbd) { - if (apphb_hb() < 0) { - /* apphb_hb() will fail if apphbd exits */ - cl_log(LOG_ERR, "apphb_hb() failed.\n"); - apphb_unregister(); - RegisteredWithApphbd = FALSE; - } - } - /* - * Our timeout job (hb_reregister_with_apphbd) will - * reregister us if we become unregistered somehow... - */ - } -#endif - return TRUE; - -} - - static gboolean logd_term_action(int sig, gpointer userdata) { @@ -857,18 +756,6 @@ G_main_add_IPC_Channel(G_PRIORITY_DEFAULT, chan, FALSE,NULL,NULL,NULL); - if (logd_config.useapphbd) { - logd_reregister_with_apphbd(NULL); - Gmain_timeout_add_full(G_PRIORITY_LOW, - 60* 1000, - logd_reregister_with_apphbd, - NULL, NULL); - Gmain_timeout_add_full(G_PRIORITY_LOW, - logd_keepalive_ms, - logd_apphb_hb, - NULL, NULL); - } - g_main_run(mainloop); return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/logd/ha_logger new/cluster-glue/logd/ha_logger --- old/cluster-glue/logd/ha_logger 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/logd/ha_logger 1970-01-01 01:00:00.000000000 +0100 @@ -1,113 +0,0 @@ -#! /bin/sh - -# ha_logger - temporary wrapper script for .libs/ha_logger -# Generated by ltmain.sh - GNU libtool 1.5.24 (1.1220.2.455 2007/06/24 02:13:29) -# -# The ha_logger program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='/usr/bin/sed -e 1s/^X//' -sed_quote_subst='s/$[\\`\\"$\\\\]$/\\\1/g' - -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command="" - -# This environment variable determines our operation mode. -if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then - # install mode needs the following variable: - notinst_deplibs=' ../lib/clplumbing/libplumb.la /Users/beekhof/Development/heartbeat/glue-lrm/lib/pils/libpils.la' -else - # When we are sourced in execute mode, $file and $echo are already set. - if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then - echo="/bin/echo" - file="$0" - # Make sure echo works. - if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then - # Yippee, $echo works! - : - else - # Restart under the correct shell, and then maybe $echo will work. - exec /bin/sh "$0" --no-reexec ${1+"$@"} - fi - fi - - # Find the directory that this script lives in. - thisdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "x$thisdir" = "x$file" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=`ls -ld "$file" | /usr/bin/sed -n 's/.*-> //p'` - while test -n "$file"; do - destdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - - # If there was a directory component, then change thisdir. - if test "x$destdir" != "x$file"; then - case "$destdir" in - [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;; - *) thisdir="$thisdir/$destdir" ;; - esac - fi - - file=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - file=`ls -ld "$thisdir/$file" | /usr/bin/sed -n 's/.*-> //p'` - done - - # Try to get the absolute directory name. - absdir=`cd "$thisdir" && pwd` - test -n "$absdir" && thisdir="$absdir" - - program='ha_logger' - progdir="$thisdir/.libs" - - - if test -f "$progdir/$program"; then - # Add our own library path to DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="/Users/beekhof/Development/heartbeat/glue-lrm/lib/clplumbing/.libs:/Users/beekhof/Development/heartbeat/glue-lrm/lib/pils/.libs:$DYLD_LIBRARY_PATH" - - # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH - # The second colon is a workaround for a bug in BeOS R4 sed - DYLD_LIBRARY_PATH=`$echo "X$DYLD_LIBRARY_PATH" | $Xsed -e 's/::*$//'` - - export DYLD_LIBRARY_PATH - - if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then - # Run the actual program with our arguments. - - exec "$progdir/$program" ${1+"$@"} - - $echo "$0: cannot exec $program $*" - exit 1 - fi - else - # The program doesn't exist. - $echo "$0: error: \`$progdir/$program' does not exist" 1>&2 - $echo "This script is just a wrapper for $program." 1>&2 - /bin/echo "See the libtool documentation for more information." 1>&2 - exit 1 - fi -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/logd/logd.cf new/cluster-glue/logd/logd.cf --- old/cluster-glue/logd/logd.cf 1970-01-01 01:00:00.000000000 +0100 +++ new/cluster-glue/logd/logd.cf 2009-08-14 15:06:26.000000000 +0200 @@ -0,0 +1,44 @@ +# File to write debug messages to +# Default: /var/log/ha-debug +#debugfile /var/log/ha-debug + +# +# +# File to write other messages to +# Default: /var/log/ha-log +#logfile /var/log/ha-log + +# +# +# Facility to use for syslog()/logger +# Default: daemon +#logfacility daemon + + +# Entity to be shown at beginning of a message +# for logging daemon +# Default: "logd" +#entity logd + + +# Do we register to apphbd +# Default: no +#useapphbd no + +# There are two processes running for logging daemon +# 1. parent process which reads messages from all client channels +# and writes them to the child process +# +# 2. the child process which reads messages from the parent process through IPC +# and writes them to syslog/disk + + +# set the send queue length from the parent process to the child process +# +#sendqlen 256 + +# set the recv queue length in child process +# +#recvqlen 256 + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/logd/logd.in new/cluster-glue/logd/logd.in --- old/cluster-glue/logd/logd.in 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/logd/logd.in 2009-08-14 15:06:26.000000000 +0200 @@ -26,210 +26,75 @@ # # Short-Description: ha_logd logging daemon # Provides: ha_logd -# Required-Start: $network $syslog -# Required-Stop: $network $syslog +# Required-Start: $network $syslog $remote_fs +# Required-Stop: $network $syslog $remote_fs # X-Start-Before: heartbeat openais # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 ### END INIT INFO -[ -f @INITDEFDIR@/heartbeat ] && . @INITDEFDIR@/heartbeat - -: ${USE_LOGD=yes} +LOGD_CFG=@sysconfdir@/logd.cf LOGD_OPT="" -[ -n "$LOGD_CFG" ] && LOGD_OPT="$LOGD_OPT -c $LOGD_CFG" - -HA_DIR=@sysconfdir@/ha.d; export HA_DIR -. $HA_DIR/shellfuncs - -LOCKDIR=@localstatedir@/lock/subsys -RUNDIR=@localstatedir@/run - - -# Echo without putting a newline on the end -EchoNoNl() { - Echo @ECHO_N@ "$@@ECHO_C@" -} - -# Echo with escapes enabled... -EchoEsc() { - Echo @ECHO_E@ "$@" -} - -echo_failure() { - EchoEsc " ha_logd failure [rc=$1]. $rc_failed" - return $1 -} - -echo_success() { - : Cool! It started! - EchoEsc "$rc_done" -} +[ -f "$LOGD_CFG" ] && LOGD_OPT="-c $LOGD_CFG" +LOGD_BIN="@libdir@/@HB_PKG@/ha_logd" -if - [ -r /etc/SuSE-release ] -then - # rc.status is new since SuSE 7.0 - [ -r /etc/rc.status ] && . /etc/rc.status - [ -r /etc/rc.config ] && . /etc/rc.config - - # Determine the base and follow a runlevel link name. - base=${0##*/} - link=${base#*[SK][0-9][0-9]} - -fi -if - [ -z "$rc_done" ] -then - rc_done="Done." - rc_failed="Failed." - rc_skipped="Skipped." -fi - - -# exec 2>>/var/log/ha-debug - -# This should probably be it's own autoconf parameter -# because RH has moved it from time to time... -# and I suspect Conectiva and Mandrake also supply it. - -DISTFUNCS=/etc/rc.d/init.d/functions -SUBSYS=ha_logd - -[ -x $HA_BIN/ha_logd ] || exit 0 - -# -# Some environments like it if we use their functions... -# -if - [ ! -x $DISTFUNCS ] -then - # Provide our own versions of these functions - status() { - $HA_BIN/ha_logd -s - } - echo_failure() { - EchoEsc " ha_logd failure [rc=$1]. $rc_failed" - return $1 - } - echo_success() { - : Cool! It started! - EchoEsc "$rc_done" - } -else - . $DISTFUNCS -fi - -# -# See if they've configured things yet... -# -if - [ ! -f $LOGD_CFG ] -then - EchoNoNl "ha_logd not configured: $LOGD_CFG not found." - echo_failure 1 - exit 0 +if [ ! -f $LOGD_BIN ]; then + echo -n "ha_logd not installed." + exit 5 fi StartLogd() { - if [ "$USE_LOGD" != "yes" ]; then - return 0 - fi - - EchoNoNl "Starting ha_logd: " - - $HA_BIN/ha_logd -s >/dev/null 2>&1 - - if - [ $? -eq 0 ] - then - Echo "logd is already running" + echo -n "Starting ha_logd: " + $LOGD_BIN -s >/dev/null 2>&1 + if [ $? -eq 0 ]; then + echo "logd is already running" return 0 fi - - $HA_BIN/ha_logd -d $LOGD_OPT >/dev/null 2>&1 - if - [ $? -ne 0 ] - then - Echo "starting logd failed" + $LOGD_BIN -d $LOGD_OPT >/dev/null 2>&1 + if [ $? -ne 0 ]; then + echo "starting logd failed" + exit 1 fi - + echo "ok" + exit 0 } StopLogd() { - if [ "$USE_LOGD" != "yes" ]; then - return 0 - fi - - EchoNoNl "Stopping ha_logd: " + echo -n "Stopping ha_logd: " - $HA_BIN/ha_logd -s >/dev/null 2>&1 - - if - [ $? -ne 0 ] - then - Echo "logd is already stopped" + $LOGD_BIN -s >/dev/null 2>&1 + if [ $? -ne 0 ]; then + echo "logd is already stopped" return 0 fi - $HA_BIN/ha_logd -k >/dev/null 2>&1 - if - [ $? -ne 0 ] - then - Echo "stopping logd failed" - fi + $LOGD_BIN -k >/dev/null 2>&1 + if [ $? -ne 0 ]; then + echo "stopping logd failed" + exit 1 + fi + echo "stopped" + exit 0 } StatusLogd() { - $HA_BIN/ha_logd -s + $LOGD_BIN -s + exit $? } -RC=0 -# See how we were called. - case "$1" in - start) - StartLogd - RC=$? - Echo - if - [ $RC -eq 0 ] - then - [ ! -d $LOCKDIR ] && mkdir -p $LOCKDIR - touch $LOCKDIR/$SUBSYS - fi - ;; - - status) - StatusLogd - RC=$?;; - - stop) - StopLogd - RC=$? - Echo - if - [ $RC -eq 0 ] - then - rm -f $LOCKDIR/$SUBSYS - fi - ;; - + start) StartLogd ;; + status) StatusLogd ;; + stop) StopLogd ;; restart) sleeptime=1 - StopLogd - sleep $sleeptime - echo_success - Echo - StartLogd - Echo + $0 stop && sleep $sleeptime && $0 start + echo ;; *) - Echo "Usage: $0 {start|stop|status|restart}" + echo "Usage: $0 {start|stop|status|restart}" exit 1 esac -exit $RC - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lrm/admin/lrmadmin.c new/cluster-glue/lrm/admin/lrmadmin.c --- old/cluster-glue/lrm/admin/lrmadmin.c 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/lrm/admin/lrmadmin.c 2009-08-14 15:06:26.000000000 +0200 @@ -47,12 +47,12 @@ #include <clplumbing/GSource.h> #include <clplumbing/Gmain_timeout.h> -static const char *optstring = "A:D:X:dE:F:dg:p:M:O:P:c:S:LI:CT:n:h"; +static const char *optstring = "A:D:X:dEF:dg:p:M:O:P:c:S:LI:CT:n:h"; #ifdef HAVE_GETOPT_H static struct option long_options[] = { {"daemon", 0, NULL, 'd'}, - {"executera", 1, NULL, 'E'}, + {"executera", 0, NULL, 'E'}, {"flush", 1, NULL, 'F'}, {"state", 1, NULL, 'S'}, {"listall", 0, NULL, 'L'}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cluster-glue/lrm/test/regression.sh.in new/cluster-glue/lrm/test/regression.sh.in --- old/cluster-glue/lrm/test/regression.sh.in 2009-07-29 12:08:16.000000000 +0200 +++ new/cluster-glue/lrm/test/regression.sh.in 2009-08-14 15:06:26.000000000 +0200 @@ -93,7 +93,7 @@ export HA_logfile HA_debugfile HA_use_logd HA_logfacility mkdir -p $OUTDIR -. @sysconfdir@/ha.d/shellfuncs +. /usr/lib/ocf/resource.d/heartbeat/.ocf-shellfuncs args=`getopt hq $*` [ $? -ne 0 ] && usage ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit translation-update-upstream for openSUSE:Factory
by root＠Hilbert.suse.de 27 Oct '09

27 Oct '09

Hello community, here is the log from the commit of package translation-update-upstream for openSUSE:Factory checked in at Tue Oct 27 17:18:09 CET 2009. -------- --- translation-update-upstream/translation-update-upstream.changes 2009-10-16 16:33:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/translation-update-upstream/translation-update-upstream.changes 2009-10-27 16:25:33.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Oct 27 16:21:20 CET 2009 - sbrabec(a)suse.cz + +- Added several more packages. +- Fixed errors if one package has updates on more servers. +- Do not interfere with gnome-patch-translation (bnc#517629#c17). +- Added translation-update-upstream-embedded script (src rpm only). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- translation-update-upstream-20091015.tar.bz2 New: ---- translation-update-upstream-20091026.tar.bz2 translation-update-upstream-embedded-README translation-update-upstream-embedded.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ translation-update-upstream.spec ++++++ --- /var/tmp/diff_new_pack.Otbclu/_old 2009-10-27 17:18:01.000000000 +0100 +++ /var/tmp/diff_new_pack.Otbclu/_new 2009-10-27 17:18:01.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package translation-update-upstream (Version 20091015) +# spec file for package translation-update-upstream (Version 20091026) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,7 +21,7 @@ Name: translation-update-upstream License: GPL v2 or later Group: System/Localization -Version: 20091015 +Version: 20091026 Release: 1 Summary: Tool for Translation Update from Upstream Source: %{name}-%{version}.tar.bz2 @@ -34,6 +34,8 @@ Source7: msgheadermerge-compose Source8: msgheadermerge-parse Source9: msgheadermerge-empty.pot +Source10: %{name}-embedded-README +Patch: %{name}-embedded.patch # Files below are package maintainer tools, not used for package build: Source50: upstream-collect.sh Source51: upstream-collect.conf @@ -74,6 +76,11 @@ cp -a %{S:4} README cp -a %{S:5} HOWTO cp -a %{S:6} %{S:7} %{S:8} %{S:9} . +cp -a %{S:10} translation-update-upstream-embedded.README +sed 's:@DATADIR@:%{_datadir}:g;s:@LIBEXECDIR@:%{_prefix}/lib:g' <translation-update-upstream.in >translation-update-upstream +sed 's/@LIBEXECDIR@/\$BASE_DIR/g;s:@DATADIR@/translation-update-upstream:\$BASE_DIR/translation-update-upstream/po:g;s/translation-update-upstream\./translation-update-upstream-embedded./g' <translation-update-upstream.in >translation-update-upstream-embedded.sh +%patch +chmod +x translation-update-upstream-embedded.sh %build @@ -81,7 +88,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir} $RPM_BUILD_ROOT%{_prefix}/lib/translation-update-upstream cp -a po $RPM_BUILD_ROOT%{_datadir}/%{name} install -d $RPM_BUILD_ROOT%{_bindir} -sed 's:@DATADIR@:%{_datadir}:g;s:@LIBEXECDIR@:%{_prefix}/lib:g' <translation-update-upstream.in >translation-update-upstream install translation-update-upstream $RPM_BUILD_ROOT%{_bindir}/ install -m0755 msgheadermerge msgheadermerge-compose msgheadermerge-parse $RPM_BUILD_ROOT%{_prefix}/lib/translation-update-upstream/ install -m0644 msgheadermerge-empty.pot $RPM_BUILD_ROOT%{_prefix}/lib/translation-update-upstream/ ++++++ create-tlst-step2-create-gnome_gtp.sh ++++++ --- /var/tmp/diff_new_pack.Otbclu/_old 2009-10-27 17:18:01.000000000 +0100 +++ /var/tmp/diff_new_pack.Otbclu/_new 2009-10-27 17:18:01.000000000 +0100 @@ -17,7 +17,7 @@ # branches tried for all apps: KNOWN_BRANCHES="gnome-2-28" # branches tried apps with the same name base: -APP_BRANCHES="|gimp-2-6" +APP_BRANCHES="|gimp-2-6|gtk-2-18|glib-2-22" # FIXME: support for libgda:release-3-0-branch gnome-background:gnome-2-22 echo "# This file was generated $(LANG=C LC_ALL=C date) by create-tlst-step2-create-gnome_gtp.sh." >upstream-gnome_gtp.tlst @@ -40,6 +40,14 @@ done done # Packages known to have special name in GTP: + for LBRANCH in $KNOWN_BRANCHES master ; do + echo gconf gconf2 GConf2 $LBRANCH + done + echo glib glib2 glib20 master + echo gtk+ gtk2 gtk20 gtk-2-18 + echo gtk+ gtk2 gtk20 master + echo gtk+ gtk2 gtk20-properties gtk-2-18 + echo gtk+ gtk2 gtk20-properties master echo gnome-phone-manager phonemgr gnome-phone-manager master echo network-manager-applet NetworkManager-gnome nm-applet master # For other versions than sles10: @@ -74,9 +82,25 @@ gimp20-tips ) PO_DIR=po-tips ;; + gtk20-properties ) + PO_DIR=po-properties + ;; gnumeric-functions ) PO_DIR=po-functions ;; + # FIXME: Only some teams use GTP for gstreamer. Run 'find -name "*-fixes.po"' on processed downstream to find possible regressions. + gst-plugins-base-0.10 ) + PROJECT=gst-plugins-base + ;; + gst-plugins-good-0.10 ) + PROJECT=gst-plugins-good + ;; + gst-plugins-bad-0.10 ) + PROJECT=gst-plugins-bad + ;; + gst-plugins-ugly-0.10 ) + PROJECT=gst-plugins-ugly + ;; * ) PO_DIR=po ;; ++++++ translation-update-upstream-20091015.tar.bz2 -> translation-update-upstream-20091026.tar.bz2 ++++++ ++++ 127526 lines of diff (skipped) ++++++ translation-update-upstream-embedded-README ++++++ translation-update-upstream-embedded.sh is a script that can be used without translation-update-upstream package. How to use it: 1. Create .tlst and .hook files and rin ./upstream-collect.sh as you do with translation-update-upstream. 2. Create an archive that contains: - directory translation-update-upstream with: - translation-update-upstream-embedded.sh - msgheadermerge* - directory po that contains contents of the archive created in step 1. 3. Instead of call of translation-update-upstream in the spec file use translation-update-upstream/translation-update-upstream-embedded.sh. Arguments and style of use are the same. ++++++ translation-update-upstream-embedded.patch ++++++ --- translation-update-upstream-embedded.sh +++ translation-update-upstream-embedded.sh @@ -34,6 +34,7 @@ fi } +BASE_DIR=$PWD DIR=${1:-po} DOMAIN=$2 @@ -91,7 +92,7 @@ echo "WARNING: Missing $DOMAIN in translation-update-upstream configuration! No updates available." fi else - echo "ERROR: Package translation-update-upstream is not installed. Please update your BuildRequires!" + echo "ERROR: Incorrect use of translation-update-upstream-embedded!" exit 1 fi fi ++++++ upstream-collect.sh ++++++ --- /var/tmp/diff_new_pack.Otbclu/_old 2009-10-27 17:18:03.000000000 +0100 +++ /var/tmp/diff_new_pack.Otbclu/_new 2009-10-27 17:18:03.000000000 +0100 @@ -67,6 +67,19 @@ fi EOF chmod +x ~/.upstream-collect.tmp/translation-update-upstream + +# Strings in installed instance of gnome-patch-translation may interfere +# with upstream-collect.sh. Use of dummies allows to import upstream +# strings, that are part of openSUSE patches. +for FILE in gnome-patch-translation-prepare gnome-patch-translation-update ; do + cat >~/.upstream-collect.tmp/$FILE <<EOF +#!/bin/sh +echo "Dummy $FILE for upstream-collect.sh. Skipping gnome-patch-translation." +mkdir -p gnome-patch-translation +EOF + chmod +x ~/.upstream-collect.tmp/$FILE +done + export PATH=~/.upstream-collect.tmp:$PATH if ! $FULL_PROCESS ; then @@ -96,13 +109,13 @@ cd .. fi +SERIAL=0 for TLST in *.tlst ; do exec <$WORK_DIR/$TLST - SERIAL=0 while read PACKAGE DOMAIN METHOD REPO DIR BRANCH ; do - # Continue for empty lines and comments + # Continue for empty lines and comments if test "${PACKAGE###}" != "$PACKAGE" ; then continue fi @@ -117,7 +130,7 @@ if ! $DEBUG ; then if test "$OLD_PACKAGE" != "$PACKAGE" ; then if test -n "$RPMPKGDIR" ; then - rm -rf $RPMPKGDIR + rm -rf $RPMPKGDIR $WORK_DIR/STAMPS/$PACKAGE/.builddir_ok fi fi OLD_PACKAGE=$PACKAGE @@ -257,6 +270,7 @@ gimp20-tags ) GTP_NAME_BASE=gimp-tags ;; gimp20-tips ) GTP_NAME_BASE=gimp-tips ;; gnumeric-functions ) GTP_NAME_BASE=gnumeric-functions ;; + gtk20-properties ) GTP_NAME_BASE=gtk+-properties ;; esac curl http://$REPO/${REPODIR%%/*}.${BRANCH:-master}/ | sed -n 's:^.*href="$[^"]*\.po$".*$:\1:p' | while read ; do @@ -299,9 +313,9 @@ fi # Do the magic: # step 2: Merge new po and previous updates (if any). - if test -f $RPMPODIR/${PO%.po}-updates.po ; then - $WORK_DIR/msgheadermerge $RPMPODIR/${PO%.po}-updates.po $PO ${PO%.po}-uheader.po - msgcat --force-po --use-first ${PO%.po}-uheader.po ${PO%.po}-backport.po $RPMPODIR/${PO%.po}-updates.po -o ${PO%.po}-join.po + if test -f $WORK_DIR/UPDATE/po/$DOMAIN/$PO ; then + $WORK_DIR/msgheadermerge $WORK_DIR/UPDATE/po/$DOMAIN/$PO $PO ${PO%.po}-uheader.po + msgcat --force-po --use-first ${PO%.po}-uheader.po ${PO%.po}-backport.po $WORK_DIR/UPDATE/po/$DOMAIN/$PO -o ${PO%.po}-join.po else cp -a ${PO%.po}-backport.po ${PO%.po}-join.po fi @@ -354,7 +368,7 @@ if ! $DEBUG ; then if test -n "$RPMPKGDIR" ; then - rm -rf $RPMPKGDIR + rm -rf $RPMPKGDIR $WORK_DIR/STAMPS/$PACKAGE/.builddir_ok fi fi ++++++ upstream-gnome-generic.tlst ++++++ --- /var/tmp/diff_new_pack.Otbclu/_old 2009-10-27 17:18:03.000000000 +0100 +++ /var/tmp/diff_new_pack.Otbclu/_new 2009-10-27 17:18:03.000000000 +0100 @@ -4,4 +4,4 @@ gstreamer-0_10-plugins-good gst-plugins-good-0.10 cgit git://anongit.freedesktop.org/gstreamer/gst-plugins-good gst-plugins-good/po gstreamer-0_10-plugins-bad gst-plugins-bad-0.10 cgit git://anongit.freedesktop.org/gstreamer/gst-plugins-bad gst-plugins-bad/po gstreamer-0_10-plugins-ugly gst-plugins-ugly-0.10 cgit git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly gst-plugins-ugly/po -pidgin pidgin tbz http://downloads.sourceforge.net/pidgin/pidgin-2.6.2.tar.bz2 pidgin-2.6.2/po +pidgin pidgin tbz http://downloads.sourceforge.net/pidgin/pidgin-2.6.3.tar.bz2 pidgin-2.6.3/po ++++++ upstream-gnome_gtp.tlst ++++++ --- /var/tmp/diff_new_pack.Otbclu/_old 2009-10-27 17:18:03.000000000 +0100 +++ /var/tmp/diff_new_pack.Otbclu/_new 2009-10-27 17:18:03.000000000 +0100 @@ -1,4 +1,4 @@ -# This file was generated Wed Oct 14 17:02:43 CEST 2009 by create-tlst-step2-create-gnome_gtp.sh. +# This file was generated Tue Oct 27 15:31:01 CET 2009 by create-tlst-step2-create-gnome_gtp.sh. # package domain method repository dir branch NetworkManager NetworkManager gtp l10n.gnome.org/POT NetworkManager/po NetworkManager-gnome nm-applet gtp l10n.gnome.org/POT network-manager-applet/po @@ -36,6 +36,7 @@ ekiga ekiga gtp l10n.gnome.org/POT ekiga/po empathy empathy gtp l10n.gnome.org/POT empathy/po gnome-2-28 empathy empathy gtp l10n.gnome.org/POT empathy/po +eog eog gtp l10n.gnome.org/POT eog/po gnome-2-28 eog eog gtp l10n.gnome.org/POT eog/po epiphany epiphany gtp l10n.gnome.org/POT epiphany/po gnome-2-28 epiphany epiphany gtp l10n.gnome.org/POT epiphany/po @@ -51,6 +52,7 @@ evolution-exchange evolution-exchange-2.28 gtp l10n.gnome.org/POT evolution-exchange/po evolution-webcal evolution-webcal gtp l10n.gnome.org/POT evolution-webcal/po f-spot f-spot gtp l10n.gnome.org/POT f-spot/po +file-roller file-roller gtp l10n.gnome.org/POT file-roller/po gnome-2-28 file-roller file-roller gtp l10n.gnome.org/POT file-roller/po gDesklets gdesklets gtp l10n.gnome.org/POT gdesklets/po gbrainy gbrainy gtp l10n.gnome.org/POT gbrainy/po @@ -58,8 +60,10 @@ gcalctool gcalctool gtp l10n.gnome.org/POT gcalctool/po gconf-editor gconf-editor gtp l10n.gnome.org/POT gconf-editor/po gnome-2-28 gconf-editor gconf-editor gtp l10n.gnome.org/POT gconf-editor/po +gconf2 GConf2 gtp l10n.gnome.org/POT gconf/po gnome-2-28 gdl gdl-1 gtp l10n.gnome.org/POT gdl/po gnome-2-28 gdl gdl-1 gtp l10n.gnome.org/POT gdl/po +gdm gdm gtp l10n.gnome.org/POT gdm/po gnome-2-28 gdm gdm gtp l10n.gnome.org/POT gdm/po gedit gedit gtp l10n.gnome.org/POT gedit/po gnome-2-28 gedit gedit gtp l10n.gnome.org/POT gedit/po @@ -77,11 +81,11 @@ gimp gimp20-std-plug-ins gtp l10n.gnome.org/POT gimp/po-plug-ins gimp gimp20-tips gtp l10n.gnome.org/POT gimp/po-tips gimp-2-6 gimp gimp20-tips gtp l10n.gnome.org/POT gimp/po-tips -# broken: -#gimp-gap gimp20-gap gtp l10n.gnome.org/POT gimp-gap/po +gimp-gap gimp20-gap gtp l10n.gnome.org/POT gimp-gap/po glabels glabels gtp l10n.gnome.org/POT glabels/po glade3 glade3 gtp l10n.gnome.org/POT glade3/po gnome-2-28 glade3 glade3 gtp l10n.gnome.org/POT glade3/po +glib2 glib20 gtp l10n.gnome.org/POT glib/po gnome-applets gnome-applets-2.0 gtp l10n.gnome.org/POT gnome-applets/po gnome-2-28 gnome-applets gnome-applets-2.0 gtp l10n.gnome.org/POT gnome-applets/po gnome-backgrounds gnome-backgrounds gtp l10n.gnome.org/POT gnome-backgrounds/po @@ -89,6 +93,7 @@ gnome-bluetooth gnome-bluetooth2 gtp l10n.gnome.org/POT gnome-bluetooth/po gnome-2-28 gnome-bluetooth gnome-bluetooth2 gtp l10n.gnome.org/POT gnome-bluetooth/po gnome-commander gnome-commander gtp l10n.gnome.org/POT gnome-commander/po +gnome-control-center gnome-control-center-2.0 gtp l10n.gnome.org/POT gnome-control-center/po gnome-2-28 gnome-control-center gnome-control-center-2.0 gtp l10n.gnome.org/POT gnome-control-center/po gnome-desktop gnome-desktop-2.0 gtp l10n.gnome.org/POT gnome-desktop/po gnome-doc-utils gnome-doc-utils gtp l10n.gnome.org/POT gnome-doc-utils/po gnome-2-28 @@ -96,6 +101,7 @@ gnome-games gnome-games gtp l10n.gnome.org/POT gnome-games/po gnome-2-28 gnome-games gnome-games gtp l10n.gnome.org/POT gnome-games/po gnome-keyring gnome-keyring gtp l10n.gnome.org/POT gnome-keyring/po +gnome-mag gnome-mag gtp l10n.gnome.org/POT gnome-mag/po gnome-2-28 gnome-mag gnome-mag gtp l10n.gnome.org/POT gnome-mag/po gnome-main-menu gnome-main-menu gtp l10n.gnome.org/POT gnome-main-menu/po gnome-media gnome-media-2.0 gtp l10n.gnome.org/POT gnome-media/po @@ -119,6 +125,7 @@ gnome-themes gnome-themes gtp l10n.gnome.org/POT gnome-themes/po gnome-2-28 gnome-themes gnome-themes gtp l10n.gnome.org/POT gnome-themes/po gnome-themes-extras gnome-themes-extras gtp l10n.gnome.org/POT gnome-themes-extras/po +gnome-user-share gnome-user-share gtp l10n.gnome.org/POT gnome-user-share/po gnome-2-28 gnome-user-share gnome-user-share gtp l10n.gnome.org/POT gnome-user-share/po gnome-utils gnome-utils-2.0 gtp l10n.gnome.org/POT gnome-utils/po gnome-2-28 gnome-utils gnome-utils-2.0 gtp l10n.gnome.org/POT gnome-utils/po @@ -131,13 +138,17 @@ gok gok gtp l10n.gnome.org/POT gok/po goobox goobox gtp l10n.gnome.org/POT goobox/po gstreamer-0_10 gstreamer-0.10 gtp l10n.gnome.org/POT gstreamer/po -gstreamer-0_10-plugins-bad gst-plugins-bad-0.10 gtp l10n.gnome.org/POT gstreamer/po -gstreamer-0_10-plugins-base gst-plugins-base-0.10 gtp l10n.gnome.org/POT gstreamer/po -gstreamer-0_10-plugins-good gst-plugins-good-0.10 gtp l10n.gnome.org/POT gstreamer/po -gstreamer-0_10-plugins-ugly gst-plugins-ugly-0.10 gtp l10n.gnome.org/POT gstreamer/po +gstreamer-0_10-plugins-bad gst-plugins-bad-0.10 gtp l10n.gnome.org/POT gst-plugins-bad/po +gstreamer-0_10-plugins-base gst-plugins-base-0.10 gtp l10n.gnome.org/POT gst-plugins-base/po +gstreamer-0_10-plugins-good gst-plugins-good-0.10 gtp l10n.gnome.org/POT gst-plugins-good/po +gstreamer-0_10-plugins-ugly gst-plugins-ugly-0.10 gtp l10n.gnome.org/POT gst-plugins-ugly/po # broken: #gtetrinet gtetrinet gtp l10n.gnome.org/POT gtetrinet/po gthumb gthumb gtp l10n.gnome.org/POT gthumb/po +gtk2 gtk20 gtp l10n.gnome.org/POT gtk+/po gtk-2-18 +gtk2 gtk20 gtp l10n.gnome.org/POT gtk+/po +gtk2 gtk20-properties gtp l10n.gnome.org/POT gtk+/po-properties gtk-2-18 +gtk2 gtk20-properties gtp l10n.gnome.org/POT gtk+/po-properties gtksourceview gtksourceview-2.0 gtp l10n.gnome.org/POT gtksourceview/po gnome-2-28 gtksourceview gtksourceview-2.0 gtp l10n.gnome.org/POT gtksourceview/po gucharmap gucharmap gtp l10n.gnome.org/POT gucharmap/po gnome-2-28 @@ -168,6 +179,7 @@ libwnck libwnck gtp l10n.gnome.org/POT libwnck/po memprof memprof gtp l10n.gnome.org/POT memprof/po mergeant mergeant gtp l10n.gnome.org/POT mergeant/po +metacity metacity gtp l10n.gnome.org/POT metacity/po gnome-2-28 metacity metacity gtp l10n.gnome.org/POT metacity/po mousetweaks mousetweaks gtp l10n.gnome.org/POT mousetweaks/po gnome-2-28 mousetweaks mousetweaks gtp l10n.gnome.org/POT mousetweaks/po @@ -187,6 +199,7 @@ planner planner gtp l10n.gnome.org/POT planner/po pybliographer pybliographer gtp l10n.gnome.org/POT pybliographer/po rhythmbox rhythmbox gtp l10n.gnome.org/POT rhythmbox/po +sabayon sabayon gtp l10n.gnome.org/POT sabayon/po gnome-2-28 sabayon sabayon gtp l10n.gnome.org/POT sabayon/po seahorse seahorse gtp l10n.gnome.org/POT seahorse/po seahorse-plugins seahorse-plugins gtp l10n.gnome.org/POT seahorse-plugins/po ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zypper for openSUSE:Factory
by root＠Hilbert.suse.de 27 Oct '09

27 Oct '09

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at Tue Oct 27 16:54:15 CET 2009. -------- --- zypper/zypper.changes 2009-10-21 18:42:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2009-10-23 16:35:50.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Oct 23 15:09:58 CEST 2009 - ma(a)suse.de + +- Fix 'dup --from' not to perform a complete distupgrade. (bnc #549490) +- Require at least libzypp version used at buildtime. (bnc #549205) +- 1.2.7 + +------------------------------------------------------------------- +Fri Oct 23 12:50:35 CEST 2009 - jkupec(a)suse.cz + +- Fixed unintentional hiding of the 'p' install summary option + (bnc #549183) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- zypper-1.2.6.tar.bz2 New: ---- zypper-1.2.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.EJYQ72/_old 2009-10-27 16:53:43.000000000 +0100 +++ /var/tmp/diff_new_pack.EJYQ72/_new 2009-10-27 16:53:43.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package zypper (Version 1.2.6) +# spec file for package zypper (Version 1.2.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,6 +23,7 @@ BuildRequires: augeas-devel >= 0.5.0 readline-devel >= 5.1 BuildRequires: cmake >= 2.4.6 gcc-c++ >= 4.1 Requires: procps +%requires_ge libzypp Recommends: logrotate cron License: GPL v2 or later Group: System/Packages @@ -30,7 +31,7 @@ AutoReqProv: on PreReq: permissions Summary: Command line software manager using libzypp -Version: 1.2.6 +Version: 1.2.7 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc @@ -117,4 +118,5 @@ # declare ownership of the log file but prevent # it from being erased by rpm -e %ghost %config(noreplace) %{_var}/log/zypper.log + %changelog ++++++ zypper-1.2.6.tar.bz2 -> zypper-1.2.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/VERSION.cmake new/zypper-1.2.7/VERSION.cmake --- old/zypper-1.2.6/VERSION.cmake 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/VERSION.cmake 2009-10-27 13:30:40.000000000 +0100 @@ -31,7 +31,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "2") -SET(VERSION_PATCH "6") +SET(VERSION_PATCH "7") -# LAST RELEASED: 1.2.6 +# LAST RELEASED: 1.2.7 #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/package/zypper.changes new/zypper-1.2.7/package/zypper.changes --- old/zypper-1.2.6/package/zypper.changes 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/package/zypper.changes 2009-10-27 13:30:40.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Oct 23 15:09:58 CEST 2009 - ma(a)suse.de + +- Fix 'dup --from' not to perform a complete distupgrade. (bnc #549490) +- Require at least libzypp version used at buildtime. (bnc #549205) +- 1.2.7 + +------------------------------------------------------------------- +Fri Oct 23 12:50:35 CEST 2009 - jkupec(a)suse.cz + +- Fixed unintentional hiding of the 'p' install summary option + (bnc #549183) + +------------------------------------------------------------------- Wed Oct 21 17:49:07 CEST 2009 - ma(a)suse.de - Fix abort on 'zypper lu -a'. (bnc #548752) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/cs.po new/zypper-1.2.7/po/cs.po --- old/zypper-1.2.6/po/cs.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/cs.po 2009-10-27 13:30:40.000000000 +0100 @@ -708,11 +708,11 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "Zámek %lu byl úspěšně odstraněn." -msgstr[1] "Zámky %lu byly úspěšně odstraněny." -msgstr[2] "Zámky %lu byly úspěšně odstraněny." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "Zámek %zu byl úspěšně odstraněn." +msgstr[1] "Zámky %zu byly úspěšně odstraněny." +msgstr[2] "Zámky %zu byly úspěšně odstraněny." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/da.po new/zypper-1.2.7/po/da.po --- old/zypper-1.2.6/po/da.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/da.po 2009-10-27 13:30:40.000000000 +0100 @@ -710,10 +710,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu lås er blevet fjernet." -msgstr[1] "%lu låse er blevet fjernet." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu lås er blevet fjernet." +msgstr[1] "%zu låse er blevet fjernet." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/de.po new/zypper-1.2.7/po/de.po --- old/zypper-1.2.6/po/de.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/de.po 2009-10-27 13:30:40.000000000 +0100 @@ -708,10 +708,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu Sperre wurde erfolgreich entfernt." -msgstr[1] "%lu Sperren wurden erfolgreich entfernt." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu Sperre wurde erfolgreich entfernt." +msgstr[1] "%zu Sperren wurden erfolgreich entfernt." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/en_GB.po new/zypper-1.2.7/po/en_GB.po --- old/zypper-1.2.6/po/en_GB.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/en_GB.po 2009-10-27 13:30:40.000000000 +0100 @@ -669,8 +669,8 @@ #: ../src/locks.cc:232 #, fuzzy, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." msgstr[0] "Repository %s has been successfully modified." msgstr[1] "Repository %s has been successfully modified." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/en_US.po new/zypper-1.2.7/po/en_US.po --- old/zypper-1.2.6/po/en_US.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/en_US.po 2009-10-27 13:30:40.000000000 +0100 @@ -643,8 +643,8 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." msgstr[0] "" msgstr[1] "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/es.po new/zypper-1.2.7/po/es.po --- old/zypper-1.2.6/po/es.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/es.po 2009-10-27 13:30:40.000000000 +0100 @@ -716,10 +716,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu bloqueo fue eliminado satisfactoriamente." -msgstr[1] "%lu bloqueos fueron eliminados satisfactoriamente." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu bloqueo fue eliminado satisfactoriamente." +msgstr[1] "%zu bloqueos fueron eliminados satisfactoriamente." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/fi.po new/zypper-1.2.7/po/fi.po --- old/zypper-1.2.6/po/fi.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/fi.po 2009-10-27 13:30:40.000000000 +0100 @@ -708,10 +708,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "Lukon %lu poistaminen onnistui." -msgstr[1] "%lu lukkoa poistettiin onnistuneesti." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "Lukon %zu poistaminen onnistui." +msgstr[1] "%zu lukkoa poistettiin onnistuneesti." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/fr.po new/zypper-1.2.7/po/fr.po --- old/zypper-1.2.6/po/fr.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/fr.po 2009-10-27 13:30:40.000000000 +0100 @@ -719,10 +719,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "Le verrouillage %lu a été supprimé avec succès." -msgstr[1] "Les verrouillages spécifiés %lu ont été supprimés avec succès." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "Le verrouillage %zu a été supprimé avec succès." +msgstr[1] "Les verrouillages spécifiés %zu ont été supprimés avec succès." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/gl.po new/zypper-1.2.7/po/gl.po --- old/zypper-1.2.6/po/gl.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/gl.po 2009-10-27 13:30:40.000000000 +0100 @@ -704,10 +704,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu bloqueo fue eliminado satisfactoriamente." -msgstr[1] "%lu bloqueos foros eliminados satisfactoriamente." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu bloqueo fue eliminado satisfactoriamente." +msgstr[1] "%zu bloqueos foros eliminados satisfactoriamente." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/hu.po new/zypper-1.2.7/po/hu.po --- old/zypper-1.2.6/po/hu.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/hu.po 2009-10-27 13:30:40.000000000 +0100 @@ -711,10 +711,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "A %lu zárolás feloldása sikeres." -msgstr[1] "A %lu zárolások feloldása sikeres." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "A %zu zárolás feloldása sikeres." +msgstr[1] "A %zu zárolások feloldása sikeres." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/it.po new/zypper-1.2.7/po/it.po --- old/zypper-1.2.6/po/it.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/it.po 2009-10-27 13:30:40.000000000 +0100 @@ -707,10 +707,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "Il blocco %lu è stato rimosso con successo." -msgstr[1] "I blocchi %lu sono stati rimossi con successo." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "Il blocco %zu è stato rimosso con successo." +msgstr[1] "I blocchi %zu sono stati rimossi con successo." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/ja.po new/zypper-1.2.7/po/ja.po --- old/zypper-1.2.6/po/ja.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/ja.po 2009-10-27 13:30:40.000000000 +0100 @@ -700,9 +700,9 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu 個のパッケージロックを解除しました。" +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu 個のパッケージロックを解除しました。" #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/km.po new/zypper-1.2.7/po/km.po --- old/zypper-1.2.6/po/km.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/km.po 2009-10-27 13:30:40.000000000 +0100 @@ -699,9 +699,9 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "សោ %lu ត្រូវបានយកចេញដោយស្វ័យប្រវត្តិ ។" +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "សោ %lz ត្រូវបានយកចេញដោយស្វ័យប្រវត្តិ ។" #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/ko.po new/zypper-1.2.7/po/ko.po --- old/zypper-1.2.6/po/ko.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/ko.po 2009-10-27 13:30:40.000000000 +0100 @@ -709,9 +709,9 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu 잠금이 성공적으로 제거 되었습니다." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu 잠금이 성공적으로 제거 되었습니다." # progress stages #: ../src/locks.cc:239 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/nb.po new/zypper-1.2.7/po/nb.po --- old/zypper-1.2.6/po/nb.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/nb.po 2009-10-27 13:30:40.000000000 +0100 @@ -700,10 +700,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu lås er fjernet." -msgstr[1] "%lu lås er fjernet." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu lås er fjernet." +msgstr[1] "%zu lås er fjernet." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/nl.po new/zypper-1.2.7/po/nl.po --- old/zypper-1.2.6/po/nl.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/nl.po 2009-10-27 13:30:40.000000000 +0100 @@ -705,10 +705,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu blokkering is met succes verwijderd." -msgstr[1] "%lu blokkeringen zijn met succes verwijderd." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu blokkering is met succes verwijderd." +msgstr[1] "%zu blokkeringen zijn met succes verwijderd." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/pl.po new/zypper-1.2.7/po/pl.po --- old/zypper-1.2.6/po/pl.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/pl.po 2009-10-27 13:30:40.000000000 +0100 @@ -707,11 +707,11 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "Usunięto blokadę %lu." -msgstr[1] "Usunięto blokady %lu." -msgstr[2] "Usunięto blokad %lu." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "Usunięto blokadę %zu." +msgstr[1] "Usunięto blokady %zu." +msgstr[2] "Usunięto blokad %zu." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/pt.po new/zypper-1.2.7/po/pt.po --- old/zypper-1.2.6/po/pt.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/pt.po 2009-10-27 13:30:40.000000000 +0100 @@ -708,10 +708,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "A tranca %lu foi removida com sucesso." -msgstr[1] "As trancas %lu foram removidas com sucesso." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "A tranca %zu foi removida com sucesso." +msgstr[1] "As trancas %zu foram removidas com sucesso." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/pt_BR.po new/zypper-1.2.7/po/pt_BR.po --- old/zypper-1.2.6/po/pt_BR.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/pt_BR.po 2009-10-27 13:30:40.000000000 +0100 @@ -706,10 +706,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu trava foi removida com sucesso." -msgstr[1] "%lu travas foram removidas com sucesso." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu trava foi removida com sucesso." +msgstr[1] "%zu travas foram removidas com sucesso." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/ru.po new/zypper-1.2.7/po/ru.po --- old/zypper-1.2.6/po/ru.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/ru.po 2009-10-27 13:30:40.000000000 +0100 @@ -700,11 +700,11 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu блокировка успешно удалена." -msgstr[1] "%lu блокировки успешно удалены." -msgstr[2] "%lu блокировок успешно удалено." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu блокировка успешно удалена." +msgstr[1] "%zu блокировки успешно удалены." +msgstr[2] "%zu блокировок успешно удалено." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/sk.po new/zypper-1.2.7/po/sk.po --- old/zypper-1.2.6/po/sk.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/sk.po 2009-10-27 13:30:40.000000000 +0100 @@ -704,11 +704,11 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "'%lu' zámok bol úspešne odstránený." -msgstr[1] "'%lu' zámky boli úspešne odstránené." -msgstr[2] "'%lu' zámkov bolo úspešne odstránených." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "'%zu' zámok bol úspešne odstránený." +msgstr[1] "'%zu' zámky boli úspešne odstránené." +msgstr[2] "'%zu' zámkov bolo úspešne odstránených." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/th.po new/zypper-1.2.7/po/th.po --- old/zypper-1.2.6/po/th.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/th.po 2009-10-27 13:30:40.000000000 +0100 @@ -708,9 +708,9 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "เอาการล็อค %lu ตัวออกไปแล้ว" +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "เอาการล็อค %zu ตัวออกไปแล้ว" #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/uk.po new/zypper-1.2.7/po/uk.po --- old/zypper-1.2.6/po/uk.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/uk.po 2009-10-27 13:30:40.000000000 +0100 @@ -705,11 +705,11 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu блокування було успішно знято." -msgstr[1] "%lu блокування було успішно знято." -msgstr[2] "%lu блокувань було успішно знято." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu блокування було успішно знято." +msgstr[1] "%zu блокування було успішно знято." +msgstr[2] "%zu блокувань було успішно знято." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/zh_CN.po new/zypper-1.2.7/po/zh_CN.po --- old/zypper-1.2.6/po/zh_CN.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/zh_CN.po 2009-10-27 13:30:40.000000000 +0100 @@ -709,9 +709,9 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "成功移除 %lu 锁定。" +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "成功移除 %zu 锁定。" #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/zh_TW.po new/zypper-1.2.7/po/zh_TW.po --- old/zypper-1.2.6/po/zh_TW.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/zh_TW.po 2009-10-27 13:30:40.000000000 +0100 @@ -701,9 +701,9 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu 鎖定已成功移除。" +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu 鎖定已成功移除。" #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/src/locks.cc new/zypper-1.2.7/src/locks.cc --- old/zypper-1.2.6/src/locks.cc 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/src/locks.cc 2009-10-27 13:30:40.000000000 +0100 @@ -6,7 +6,7 @@ #include "zypp/Locks.h" #include "output/Out.h" -#include "main.h" +#include "main.h" #include "Table.h" #include "utils/misc.h" #include "locks.h" @@ -41,14 +41,14 @@ th << _("Catalog") << _("Importance"); else th << _("Type") << _("Repository"); - + t << th; unsigned i = 1; for_(it, locks.begin(), locks.end()) { TableRow tr; - + // # tr << str::numstring (i); @@ -177,7 +177,7 @@ { advance(it, i-1); locks.removeLock(*it); - + zypper.out().info(_("Specified lock has been successfully removed.")); } else //package name @@ -213,7 +213,7 @@ last = *it; } } - + if (res == 1) //only one with identical name, then remove it locks.removeLock(last); else @@ -229,8 +229,8 @@ //removed something else zypper.out().info(str::form(_PL( - "%lu lock has been successfully removed.", - "%lu locks have been succesfully removed.", + "%zu lock has been successfully removed.", + "%zu locks have been succesfully removed.", start - locks.size()), start - locks.size())); } catch(const Exception & e) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/src/repos.cc new/zypper-1.2.7/src/repos.cc --- old/zypper-1.2.6/src/repos.cc 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/src/repos.cc 2009-10-27 13:30:40.000000000 +0100 @@ -281,13 +281,11 @@ bool match_repo(Zypper & zypper, string str, RepoInfo *repo) { RepoManager & manager = zypper.repoManager(); - list<RepoInfo> known; - known.insert(known.end(), manager.repoBegin(), manager.repoEnd()); bool found = false; - unsigned int number = 1; // repo number - for (list<RepoInfo>::const_iterator known_it = known.begin(); - known_it != known.end(); ++known_it, number++) + + for (RepoManager::RepoConstIterator known_it = manager.repoBegin(); + known_it != manager.repoEnd(); ++known_it, number++) { unsigned int tmp = 0; safe_lexical_cast (str, tmp); // try to make an int out of the string @@ -492,7 +490,7 @@ it->name().c_str(), "no-cd")); gData.repos.erase(it++); } - if (no_remote && MediaAccess::downloads(*it->baseUrlsBegin())) + if (no_remote && (*it->baseUrlsBegin()).schemeIsDownloading()) { zypper.out().info(str::form( _("Ignoring repository '%s' because of '%s' option."), @@ -1652,7 +1650,7 @@ { if (!it->baseUrlsEmpty()) { - if ( !MediaAccess::downloads( *it->baseUrlsBegin()) ) + if ( ! (*it->baseUrlsBegin()).schemeIsDownloading() ) { string alias = it->alias(); toModify.insert( alias ); @@ -1667,7 +1665,7 @@ { if (!it->baseUrlsEmpty()) { - if ( MediaAccess::downloads( *it->baseUrlsBegin()) ) + if ( (*it->baseUrlsBegin()).schemeIsDownloading() ) { string alias = it->alias(); toModify.insert( alias ); @@ -2787,10 +2785,10 @@ if (url.isValid()) { bool modify = false; - if (local && !MediaAccess::downloads( url ) ) + if (local && ! url.schemeIsDownloading() ) modify = true; - if (!modify && remote && MediaAccess::downloads( url ) ) + if (!modify && remote && url.schemeIsDownloading() ) modify = true; if (!modify && schemes.find(url.getScheme()) != schemes.end()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/src/solve-commit.cc new/zypper-1.2.7/src/solve-commit.cc --- old/zypper-1.2.6/src/solve-commit.cc 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/src/solve-commit.cc 2009-10-27 13:30:40.000000000 +0100 @@ -326,7 +326,9 @@ dump_pool(); set_solver_flags(zypper); - // set repositories to upgrade to (--from) + // Test for repositories to upgrade to (--from) + // If those are specified addUpgradeRepo and solve, + // otherwise perform a full dist upgrade. list<RepoInfo> specified; list<string> not_found; @@ -338,18 +340,26 @@ if (!not_found.empty()) throw ExitRequestException("Some of specified repositories were not found."); - set<string> aliases; - for_(it, specified.begin(), specified.end()) - aliases.insert(it->alias()); - - for_(it, God->pool().knownRepositoriesBegin(), God->pool().knownRepositoriesEnd()) - if (aliases.find(it->alias()) != aliases.end()) + if ( ! specified.empty() ) + { + // Here: do upgrade for the specified repos: + Resolver_Ptr resolver( God->resolver() ); + ResPool pool ( God->pool() ); + for_( it, specified.begin(), specified.end() ) { - MIL << "Adding upgrade repository: " << it->alias() << endl; - God->resolver()->addUpgradeRepo(*it); + Repository repo( pool.reposFind( it->alias() ) ); + MIL << "Adding upgrade repository: " << repo.alias() << endl; + resolver->addUpgradeRepo( repo ); } - // compute the upgrade + DBG << "Calling the solver..." << endl; + //! \todo Somehow tell set_solver_flags/set_ignore_recommends_of_installed that + //! this is no full upgrade. Until then set setIgnoreAlreadyRecommended again here: + resolver->setIgnoreAlreadyRecommended( true ); + return resolver->resolvePool(); + } + + // Here: compute the full upgrade zypper.out().info(_("Computing upgrade..."), Out::HIGH); DBG << "Calling the solver doUpgrade()..." << endl; @@ -551,7 +561,7 @@ // string will do. //! \todo add c for changelog and x for explain (show the dep tree) popts.setOptions(_("y/n/p/v/a/r/m/d/g"), 0); - popts.setShownCount(2); + popts.setShownCount(3); if (!(zypper.runtimeData().force_resolution && show_p_option)) popts.disable(2); // translators: help text for 'y' option in the 'Continue?' prompt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/zypper.spec.cmake new/zypper-1.2.7/zypper.spec.cmake --- old/zypper-1.2.6/zypper.spec.cmake 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/zypper.spec.cmake 2009-10-27 13:30:40.000000000 +0100 @@ -15,6 +15,7 @@ BuildRequires: readline-devel >= 5.1 augeas-devel >= 0.5.0 BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6 Requires: procps +%requires_ge libzypp Recommends: logrotate cron License: GPL v2 or later Group: System/Packages @@ -37,7 +38,7 @@ install patches, hardware drivers, verify dependencies, and more. Zypper can be used interactively or non-interactively by user, from scripts, -or front-ends. +or front-ends. Authors: -------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gstreamer-0_10-plugins-ugly for openSUSE:Factory
by root＠Hilbert.suse.de 27 Oct '09

27 Oct '09

Hello community, here is the log from the commit of package gstreamer-0_10-plugins-ugly for openSUSE:Factory checked in at Tue Oct 27 16:50:54 CET 2009. -------- --- GNOME/gstreamer-0_10-plugins-ugly/gstreamer-0_10-plugins-ugly.changes 2009-08-12 14:02:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/gstreamer-0_10-plugins-ugly/gstreamer-0_10-plugins-ugly.changes 2009-10-26 17:23:50.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 26 17:22:56 CET 2009 - sbrabec(a)suse.cz + +- Added support for translation-update-upstream (FATE#301344). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-0_10-plugins-ugly.spec ++++++ --- /var/tmp/diff_new_pack.9J6L0y/_old 2009-10-27 16:50:21.000000000 +0100 +++ /var/tmp/diff_new_pack.9J6L0y/_new 2009-10-27 16:50:21.000000000 +0100 @@ -20,7 +20,7 @@ Name: gstreamer-0_10-plugins-ugly Version: 0.10.12 -Release: 1 +Release: 2 # Patched code is built by default. # Use rpmbuild -D 'BUILD_ORIG 1' to build original code. # Use rpmbuild -D 'BUILD_ORIG 1' -D 'BUILD_ORIG_ADDON 1' to build patched build plus original as addon. @@ -38,6 +38,7 @@ BuildRequires: libsidplay1-devel BuildRequires: pyxml BuildRequires: sgml-skel +BuildRequires: translation-update-upstream BuildRequires: xorg-x11-devel %if 0%{?BUILD_ORIG} BuildRequires: a52dec-devel @@ -227,6 +228,7 @@ %if ! 0%{?BUILD_ORIG} %patch1 %endif +translation-update-upstream po gst-plugins-ugly-0.10 %build %if %suse_version >= 1110 ++++++ gstreamer010-plugins-ugly-patched.patch ++++++ --- /var/tmp/diff_new_pack.9J6L0y/_old 2009-10-27 16:50:21.000000000 +0100 +++ /var/tmp/diff_new_pack.9J6L0y/_new 2009-10-27 16:50:21.000000000 +0100 @@ -48,3 +48,10 @@ $(top_srcdir)/gst/realmedia/rademux.h \ $(top_srcdir)/gst/realmedia/rdtmanager.h \ $(top_srcdir)/gst/realmedia/rtspreal.h \ +--- po/POTFILES.in ++++ po/POTFILES.in +@@ -3,4 +3,3 @@ + ext/dvdread/dvdreadsrc.c + ext/lame/gstlame.c + ext/twolame/gsttwolame.c +-gst/asfdemux/gstasfdemux.c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-gtk for openSUSE:Factory
by root＠Hilbert.suse.de 27 Oct '09

27 Oct '09

Hello community, here is the log from the commit of package yast2-gtk for openSUSE:Factory checked in at Tue Oct 27 16:48:34 CET 2009. -------- --- yast2-gtk/yast2-gtk.changes 2009-10-23 15:17:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-gtk/yast2-gtk.changes 2009-10-27 06:29:39.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Oct 27 05:23:28 UTC 2009 - coolo(a)novell.com + +- cherry pick gcc 4.4 issues + +------------------------------------------------------------------- @@ -11 +16 @@ -- revert to 11.1 code (bnc#547075). +- revert to 11.1 code (bcn#547075). calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-gtk.spec ++++++ --- /var/tmp/diff_new_pack.75P2BI/_old 2009-10-27 16:48:25.000000000 +0100 +++ /var/tmp/diff_new_pack.75P2BI/_new 2009-10-27 16:48:25.000000000 +0100 @@ -21,7 +21,7 @@ Name: yast2-gtk Version: 2.20.5 -Release: 1 +Release: 2 License: LGPL v2.1 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -80,5 +80,4 @@ %{_libdir}/YaST2/plugin/libpy2gtk.so.* %{_libdir}/YaST2/plugin/libpy2gtk.so %{_datadir}/YaST2/gtk - %changelog ++++++ yast2-gtk-2.20.5.tar.bz2 ++++++ ++++ 3421 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-gtk-2.20.5/configure.in new/yast2-gtk-2.20.5/configure.in --- old/yast2-gtk-2.20.5/configure.in 2009-10-22 11:20:02.000000000 +0200 +++ new/yast2-gtk-2.20.5/configure.in 2009-10-27 06:29:03.000000000 +0100 @@ -1,6 +1,6 @@ dnl configure.in for yast2-gtk dnl -dnl -- This file is generated by y2autoconf 2.18.10 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-gtk, 2.20.5, http://bugs.opensuse.org/, yast2-gtk) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-gtk-2.20.5/missing new/yast2-gtk-2.20.5/missing --- old/yast2-gtk-2.20.5/missing 2009-10-22 11:20:37.000000000 +0200 +++ new/yast2-gtk-2.20.5/missing 2009-10-27 06:29:18.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-gtk-2.20.5/src/YGBarGraph.cc new/yast2-gtk-2.20.5/src/YGBarGraph.cc --- old/yast2-gtk-2.20.5/src/YGBarGraph.cc 2009-10-21 16:00:27.000000000 +0200 +++ new/yast2-gtk-2.20.5/src/YGBarGraph.cc 2009-10-27 06:24:16.000000000 +0100 @@ -38,7 +38,7 @@ static GdkColor ycolorToGdk (const YColor &ycolor) { - GdkColor color = { 0, ycolor.red() << 8, ycolor.green() << 8, ycolor.blue() << 8 }; + GdkColor color = { 0, guint16(ycolor.red() << 8), guint16(ycolor.green() << 8), guint16(ycolor.blue() << 8) }; return color; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-firstboot for openSUSE:Factory
by root＠Hilbert.suse.de 27 Oct '09

27 Oct '09

Hello community, here is the log from the commit of package yast2-firstboot for openSUSE:Factory checked in at Tue Oct 27 16:48:17 CET 2009. -------- --- yast2-firstboot/yast2-firstboot.changes 2009-08-20 16:38:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-firstboot/yast2-firstboot.changes 2009-10-27 13:47:01.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Oct 27 13:32:11 CET 2009 - jsuchome(a)suse.cz + +- package firstboot_language_keyboard.ycp file (fate#306296) +- 2.18.10 + +------------------------------------------------------------------- +Tue Oct 27 13:25:19 CET 2009 - jsuchome(a)suse.cz + +- fixed example firstboot.xml: correct client name +- 2.18.9 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-firstboot-2.18.8.tar.bz2 New: ---- yast2-firstboot-2.18.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firstboot.spec ++++++ --- /var/tmp/diff_new_pack.mjkDGr/_old 2009-10-27 16:47:58.000000000 +0100 +++ /var/tmp/diff_new_pack.mjkDGr/_new 2009-10-27 16:47:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-firstboot (Version 2.18.8) +# spec file for package yast2-firstboot (Version 2.18.10) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-firstboot -Version: 2.18.8 +Version: 2.18.10 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-firstboot-2.18.8.tar.bz2 +Source0: yast2-firstboot-2.18.10.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later X11/MIT @@ -54,7 +54,7 @@ created to personalize the system. %prep -%setup -n yast2-firstboot-2.18.8 +%setup -n yast2-firstboot-2.18.10 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-firstboot-2.18.8.tar.bz2 -> yast2-firstboot-2.18.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.8/VERSION new/yast2-firstboot-2.18.10/VERSION --- old/yast2-firstboot-2.18.8/VERSION 2009-08-20 16:38:07.000000000 +0200 +++ new/yast2-firstboot-2.18.10/VERSION 2009-10-27 13:32:38.000000000 +0100 @@ -1 +1 @@ -2.18.8 +2.18.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.8/configure new/yast2-firstboot-2.18.10/configure --- old/yast2-firstboot-2.18.8/configure 2009-07-30 15:34:03.000000000 +0200 +++ new/yast2-firstboot-2.18.10/configure 2009-10-27 13:39:46.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-firstboot 2.18.7. +# Generated by GNU Autoconf 2.63 for yast2-firstboot 2.18.10. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-firstboot' PACKAGE_TARNAME='yast2-firstboot' -PACKAGE_VERSION='2.18.7' -PACKAGE_STRING='yast2-firstboot 2.18.7' +PACKAGE_VERSION='2.18.10' +PACKAGE_STRING='yast2-firstboot 2.18.10' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1282,7 +1282,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-firstboot 2.18.7 to adapt to many kinds of systems. +\`configure' configures yast2-firstboot 2.18.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1353,7 +1353,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-firstboot 2.18.7:";; + short | recursive ) echo "Configuration of yast2-firstboot 2.18.10:";; esac cat <<\_ACEOF @@ -1433,7 +1433,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-firstboot configure 2.18.7 +yast2-firstboot configure 2.18.10 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1447,7 +1447,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-firstboot $as_me 2.18.7, which was +It was created by yast2-firstboot $as_me 2.18.10, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2294,7 +2294,7 @@ # Define the identity of the package. PACKAGE='yast2-firstboot' - VERSION='2.18.7' + VERSION='2.18.10' cat >>confdefs.h <<_ACEOF @@ -2518,7 +2518,7 @@ -VERSION="2.18.7" +VERSION="2.18.10" RPMNAME="yast2-firstboot" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" @@ -3578,7 +3578,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-firstboot $as_me 2.18.7, which was +This file was extended by yast2-firstboot $as_me 2.18.10, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3628,7 +3628,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-firstboot config.status 2.18.7 +yast2-firstboot config.status 2.18.10 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.8/configure.in new/yast2-firstboot-2.18.10/configure.in --- old/yast2-firstboot-2.18.8/configure.in 2009-07-30 15:33:59.000000000 +0200 +++ new/yast2-firstboot-2.18.10/configure.in 2009-10-27 13:39:42.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-firstboot, 2.18.7, http://bugs.opensuse.org/, yast2-firstboot) +AC_INIT(yast2-firstboot, 2.18.10, http://bugs.opensuse.org/, yast2-firstboot) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.7" +VERSION="2.18.10" RPMNAME="yast2-firstboot" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.8/src/Makefile.am new/yast2-firstboot-2.18.10/src/Makefile.am --- old/yast2-firstboot-2.18.8/src/Makefile.am 2009-08-20 16:36:34.000000000 +0200 +++ new/yast2-firstboot-2.18.10/src/Makefile.am 2009-10-27 13:30:39.000000000 +0100 @@ -8,6 +8,7 @@ firstboot_write.ycp \ firstboot_desktop.ycp \ firstboot_language.ycp \ + firstboot_language_keyboard.ycp \ firstboot_timezone.ycp \ firstboot_license.ycp \ firstboot_welcome.ycp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.8/src/Makefile.in new/yast2-firstboot-2.18.10/src/Makefile.in --- old/yast2-firstboot-2.18.8/src/Makefile.in 2009-08-20 16:38:11.000000000 +0200 +++ new/yast2-firstboot-2.18.10/src/Makefile.in 2009-10-27 13:39:46.000000000 +0100 @@ -202,6 +202,7 @@ firstboot_write.ycp \ firstboot_desktop.ycp \ firstboot_language.ycp \ + firstboot_language_keyboard.ycp \ firstboot_timezone.ycp \ firstboot_license.ycp \ firstboot_welcome.ycp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.8/src/control/firstboot.xml new/yast2-firstboot-2.18.10/src/control/firstboot.xml --- old/yast2-firstboot-2.18.8/src/control/firstboot.xml 2009-07-16 15:59:29.000000000 +0200 +++ new/yast2-firstboot-2.18.10/src/control/firstboot.xml 2009-10-27 13:26:56.000000000 +0100 @@ -3,7 +3,7 @@ xmlns:config="http://www.suse.com/1.0/configns">  @@ -87,7 +87,7 @@ <label>Language and Keyboard</label> <enabled config:type="boolean">true</enabled>  - <name>firstboot_language</name> + <name>firstboot_language_keyboard</name> </module> <module> <label>Language</label> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.8/src/firstboot_language.ycp new/yast2-firstboot-2.18.10/src/firstboot_language.ycp --- old/yast2-firstboot-2.18.8/src/firstboot_language.ycp 2009-08-20 16:35:12.000000000 +0200 +++ new/yast2-firstboot-2.18.10/src/firstboot_language.ycp 2009-08-20 16:38:39.000000000 +0200 @@ -12,7 +12,7 @@ * Modify: * * - * $Id: firstboot_language.ycp 58220 2009-07-30 13:46:08Z jsuchome $ + * $Id: firstboot_language.ycp 58401 2009-08-20 14:38:29Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.8/src/firstboot_language_keyboard.ycp new/yast2-firstboot-2.18.10/src/firstboot_language_keyboard.ycp --- old/yast2-firstboot-2.18.8/src/firstboot_language_keyboard.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-firstboot-2.18.10/src/firstboot_language_keyboard.ycp 2009-07-30 15:46:14.000000000 +0200 @@ -0,0 +1,251 @@ +/** + * File: + * firstboot_language_keyboard.ycp + * + * Module: + * Firsboot + * + * Authors: + * Jiri Suchomel <jsuchome(a)suse.cz> + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * This client shows dialog for choosing the language and keyboard layout + * + * $Id: firstboot_language_keyboard.ycp 58220 2009-07-30 13:46:08Z jsuchome $ + * + */ +{ + textdomain "firstboot"; + + import "Console"; + import "Directory"; + import "GetInstArgs"; + import "Keyboard"; + import "Label"; + import "Language"; + import "Popup"; + import "Report"; + import "Timezone"; + import "Wizard"; + import "Icon"; + + // ------------------------------------- main part of the client ----------- + + map argmap = GetInstArgs::argmap(); + + string language = Language::language; + + // language preselected in /etc/install.inf + string preselected = Language::preselected; + + boolean text_mode = Language::GetTextMode (); + + /* ---------------------------------------------------------------------- + * Build dialog + * ----------------------------------------------------------------------*/ + // heading text + string heading_text = _("Language and Keyboard Layout"); + + term languagesel = `ComboBox ( + `id (`language), + `opt (`notify, `hstretch), + // combo box label + _("&Language"), Language::GetLanguageItems (`first_screen) + ); + + term keyboardsel = `ComboBox ( + `id (`keyboard), + `opt (`notify, `hstretch), + // combo box label + _("&Keyboard Layout"), + Keyboard::GetKeyboardItems () + ); + + // this type of contents will be shown only for initial installation dialog + term contents = `VBox ( + `VWeight (3, `VStretch()), + `HSquash (`VBox ( + `HBox ( + `HSquash (Icon::Simple ("yast-language")), + `HSpacing (2), + `Left (languagesel) + ), + `VSpacing (1), + `HBox ( + `HSquash (Icon::Simple ("yast-keyboard")), + `HSpacing (2), + `Left (keyboardsel) + ) + )), + `VWeight (1, `VStretch()), + `VWeight (3, `VStretch()) + ); + + // help text for firstboot language + keyboard screen + string help_text = _(" +Choose the Language and the Keyboard layout to be used during +configuration and for the installed system. + +") + + // help text, continued + _(" +Click Next to proceed to the next dialog. + +") + + // help text, continued + _(" +Select Abort to abort the +installation process at any time. + +"); + + // Screen title for the first interactive dialog + + Wizard::SetContents (heading_text, contents, help_text, + argmap["enable_back"]:true , argmap["enable_next"]:true); + Wizard::EnableAbortButton (); + + UI::ChangeWidget (`id (`language), `Value, language); + + if (Keyboard::user_decision == true) { + UI::ChangeWidget (`id (`keyboard), `Value, Keyboard::current_kbd); + } else { + string kbd = Keyboard::GetKeyboardForLanguage (language, "english-us"); + UI::ChangeWidget (`id (`keyboard), `Value, kbd); + } + + Wizard::SetTitleIcon ("yast-language"); + + // Get the user input. + // + any ret = nil; + + UI::SetFocus(`id(`language)); + + string keyboard = ""; + + // Returns true if the dialog needs redrawing + boolean SetLanguageIfChanged (any ret) { + + if (language != Language::language) + { + y2milestone ("Language changed from %1 to %2", Language::language, language); + Timezone::ResetZonemap (); + + // Set it in the Language module. + Language::Set (language); + } + // Check and set CJK languages + if (ret == `language && Language::CJKLanguage (language) && + !Language::CJKLanguage (preselected) && Language::GetTextMode ()) + { + // popup message (user selected CJK language in text mode) + Popup::Message (_("The selected language cannot be used in text mode. English is used for +installation, but the selected language will be used for the new system.")); + Language::WfmSetGivenLanguage ("en_US"); + } + else if (ret == `language) + { + Console::SelectFont (language); + // no yast translation for nn_NO, use nb_NO as a backup + if (language == "nn_NO") + { + y2milestone ("Nynorsk not translated, using Bokmål"); + Language::WfmSetGivenLanguage ("nb_NO"); + } + else + Language::WfmSetLanguage (); + } + + if (ret == `language) { + // Display newly translated dialog. + Wizard::SetFocusToNextButton(); + return true; + } + + if (ret == `next) { + Keyboard::Set (keyboard); + + // Language has been set already. + // On first run store users decision as default. + y2milestone("Resetting to default language"); + Language::SetDefault(); + + // only one is installed in firstboot + Language::languages = language; + + Timezone::SetTimezoneForLanguage (language); + + // Bugzilla #354133 + y2milestone ("Adjusting package and text locale to %1", language); + Pkg::SetPackageLocale (language); + Pkg::SetTextLocale (language); + + y2milestone ("Language: '%1', system encoding '%2'", language, WFM::GetEncoding()); + + // install language dependent packages now + // Language::PackagesModified () does not work here as _on_entry variables are not set + if (language != Language::ReadSysconfigLanguage ()) + { + if (!Language::PackagesInit ([language])) + { + // error message + Report::Error (_("There is not enough space to install all additional packages.")); + } + else + { + Language::PackagesCommit (); + } + } + + Language::Save (); + Keyboard::Save (); + Timezone::Save (); + Console::Save (); + } + + return false; + } + + while (true) { + ret = UI::UserInput(); + y2milestone ("UserInput() returned %1", ret); + + if (ret == `back) { + break; + + } else if (ret == `abort && Popup::ConfirmAbort (`painless)) { + Wizard::RestoreNextButton(); + ret = `abort; + break; + + } else if (ret == `keyboard) { + Keyboard::user_decision = true; + + } + else if (ret == `next || ret == `language) + { + language = (string) UI::QueryWidget (`id (`language), `Value); + keyboard = (string) UI::QueryWidget (`id (`keyboard), `Value); + + if (ret == `next && !Language::CheckIncompleteTranslation (language)) + { + continue; + } + + if (SetLanguageIfChanged (ret)) + { + ret = `again; + break; + } + + // kbd must be restarted after YaST finishes (#303808) + SCR::Execute (.target.bash, sformat ("touch %1/firstboot_kbd_restart", Directory::vardir)); + + if (ret == `next) break; + } + } + + return (symbol) ret; +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vm-install for openSUSE:Factory
by root＠Hilbert.suse.de 27 Oct '09

27 Oct '09

Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at Tue Oct 27 16:47:47 CET 2009. -------- --- vm-install/vm-install.changes 2009-10-12 16:17:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/vm-install/vm-install.changes 2009-10-27 15:58:26.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Oct 27 08:54:29 MDT 2009 - carnold(a)novell.com + +- Added updated language files. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.fWLVq7/_old 2009-10-27 16:47:40.000000000 +0100 +++ /var/tmp/diff_new_pack.fWLVq7/_new 2009-10-27 16:47:40.000000000 +0100 @@ -27,7 +27,7 @@ Group: System/Emulators/PC AutoReqProv: yes Version: 0.4.9 -Release: 2 +Release: 3 Summary: Tool to Define a Virtual Machine and Install Its Operating System Source0: %{name}-0.4.9.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ vm-install-0.4.9.tar.bz2 ++++++ ++++ 53076 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit util-linux for openSUSE:Factory
by root＠Hilbert.suse.de 27 Oct '09

27 Oct '09

Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at Tue Oct 27 16:47:25 CET 2009. -------- --- util-linux/util-linux.changes 2009-10-20 12:14:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/util-linux/util-linux.changes 2009-10-26 18:47:27.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 26 17:45:53 UTC 2009 - crrodriguez(a)opensuse.org + +- fsck during boot up fails with Too many open files [bnc#503008] + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- util-linux-ng-bnc503008.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.lh0tLa/_old 2009-10-27 16:47:08.000000000 +0100 +++ /var/tmp/diff_new_pack.lh0tLa/_new 2009-10-27 16:47:08.000000000 +0100 @@ -29,7 +29,7 @@ Group: System/Base AutoReqProv: on Version: 2.16 -Release: 4 +Release: 5 Requires: %name-lang = %{version} Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2 @@ -68,6 +68,7 @@ Patch2: util-linux-2.14.1-mount_skip_sync.patch # crypto patch Patch3: util-linux-mount_losetup_crypto.patch +Patch4: util-linux-ng-bnc503008.patch ## ## adjtimex ## @@ -152,6 +153,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # cd adjtimex-* %patch50 -p1 ++++++ util-linux-ng-bnc503008.patch ++++++ commit fdf08588af55d07a99b411708a08f4ebe6819706 Author: Theodore Ts'o <tytso(a)mit.edu> Date: Sat Oct 3 12:50:06 2009 -0400 lib: fix file descriptor leak in is_mounted() Remove an extraneous fopen() that leaks memory and a file descriptor. Signed-off-by: "Theodore Ts'o" <tytso(a)mit.edu> diff --git a/lib/ismounted.c b/lib/ismounted.c index 28ae325..fbe91f9 100644 --- a/lib/ismounted.c +++ b/lib/ismounted.c @@ -70,9 +70,6 @@ static int check_mntent_file(const char *mtab_file, const char *file, char buf[1024], *device = 0, *mnt_dir = 0, *cp; *mount_flags = 0; - if ((f = fopen(mtab_file, "r")) == NULL) - return errno; - if ((f = setmntent (mtab_file, "r")) == NULL) return errno; if (stat(file, &st_buf) == 0) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tkinfo for openSUSE:Factory
by root＠Hilbert.suse.de 27 Oct '09

27 Oct '09

Hello community, here is the log from the commit of package tkinfo for openSUSE:Factory checked in at Tue Oct 27 16:46:55 CET 2009. -------- --- tkinfo/tkinfo.changes 2006-01-25 21:48:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/tkinfo/tkinfo.changes 2009-10-27 15:42:07.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Oct 27 15:38:47 CET 2009 - max(a)suse.de + +- Relax wildcard searching, so that info pages with version + numbers are also found under their basename (bnc#420627). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- tkinfo-alias.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tkinfo.spec ++++++ --- /var/tmp/diff_new_pack.xVzz2I/_old 2009-10-27 16:46:07.000000000 +0100 +++ /var/tmp/diff_new_pack.xVzz2I/_new 2009-10-27 16:46:07.000000000 +0100 @@ -23,10 +23,11 @@ License: Public Domain, Freeware Group: Productivity/Publishing/Texinfo Version: 2.8 -Release: 133 +Release: 134 Summary: Viewer for info-files Source: %name-%version.tar.bz2 Patch0: tkinfo.patch +Patch1: tkinfo-alias.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,6 +45,7 @@ %prep %setup %patch0 +%patch1 %build ++++++ tkinfo-alias.patch ++++++ --- tkinfo +++ tkinfo @@ -3727,6 +3727,14 @@ } } } + foreach suf $tki(infoSuffix) { + foreach extrasuf {"" .gz .Z .z .bz2} { + set filePath "$fileName-*$suf$extrasuf" + if {[catch {glob $filePath} result] == 0} { + return [lindex [lsort $result] 0] + } + } + } return "" } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0