March 2012 - openSUSE Commits - openSUSE Mailing Lists

commit sblim-cmpi-nfsv4 for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package sblim-cmpi-nfsv4 for openSUSE:Factory checked in at 2012-03-07 13:45:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sblim-cmpi-nfsv4 (Old) and /work/SRC/openSUSE:Factory/.sblim-cmpi-nfsv4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sblim-cmpi-nfsv4", Maintainer is "VDziewiecki(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sblim-cmpi-nfsv4/sblim-cmpi-nfsv4.changes 2011-09-23 12:45:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sblim-cmpi-nfsv4.new/sblim-cmpi-nfsv4.changes 2012-03-07 13:45:43.000000000 +0100 @@ -1,0 +2,20 @@ +Mon Feb 13 10:55:33 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Mon Sep 13 19:11:27 UTC 2010 - kkaempf(a)novell.com + +- Fix RHEL build + +------------------------------------------------------------------- +Thu Oct 1 18:23:54 CEST 2009 - mhrusecky(a)suse.cz + +- updated to 1.1.0 + - updated URL for CPL + - migrate provider licenses to EPL + - fixed upstream bugs: + * 1652311 fixes compile errors with gcc4 + * 1457924 Various Compile Warnings + +------------------------------------------------------------------- Old: ---- sblim-cmpi-nfsv4-1.0.11_syntax.patch sblim-cmpi-nfsv4-1.0.12.tar.bz2 New: ---- sblim-cmpi-nfsv4-1.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-cmpi-nfsv4.spec ++++++ --- /var/tmp/diff_new_pack.hZKP7Q/_old 2012-03-07 13:45:45.000000000 +0100 +++ /var/tmp/diff_new_pack.hZKP7Q/_new 2012-03-07 13:45:45.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package sblim-cmpi-nfsv4 (Version 1.0.12) +# spec file for package sblim-cmpi-nfsv4 # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,22 +15,29 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: sblim-cmpi-nfsv4 -BuildRequires: bison flex gcc-c++ openslp-devel openssl-devel pam-devel sblim-cmpi-base-devel sblim-indication_helper-devel sblim-testsuite +BuildRequires: bison +BuildRequires: flex +BuildRequires: gcc-c++ +BuildRequires: openssl-devel +BuildRequires: pam-devel +BuildRequires: sblim-cmpi-base-devel +BuildRequires: sblim-indication_helper-devel +BuildRequires: sblim-sfcb +BuildRequires: sblim-testsuite +%if 0%{?suse_version} +BuildRequires: openslp-devel +%endif Url: http://sblim.wiki.sourceforge.net/ Summary: SBLIM CMPI NFSv4 Instrumentation -Version: 1.0.12 -Release: 85 +License: EPL-1.0 Group: System/Management -License: IBM Public License +Version: 1.1.0 +Release: 0 Requires: sblim-cmpi-base >= 1.2.3, cim-server Source0: http://prdownloads.sourceforge.net/sblim/sblim-cmpi-nfsv4-%{version}.tar.bz2 -Patch3: sblim-cmpi-nfsv4-1.0.11_syntax.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: sblim-sfcb #!BuildIgnore: tog-pegasus %description @@ -44,14 +51,17 @@ %prep %setup -%patch3 %build %configure --disable-static %{__make} %install +%if 0%{?suse_version} %makeinstall docdir=%{_docdir}/%{name} +%else +make install DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-%{version} +%endif rm %buildroot%_libdir/cmpi/*.la rm %buildroot%_libdir/*.la @@ -59,24 +69,33 @@ %{__rm} -rf $RPM_BUILD_ROOT %post -%define mofs Linux_NFSv4SystemSetting Linux_NFSv4SystemConfiguration +%define mofs Linux_NFSv4SystemSetting,Linux_NFSv4SystemConfiguration +%define PEGASUS_MOF CIM_SystemSetting,CIM_NFS,CIM_SystemConfiguration,CIM_SystemSettingContext # compile MOF +/sbin/ldconfig +# Register Schema and Provider - this is higly provider specific +# tog-pegasus needs some schemes registered first +if [ -x /usr/bin/peg-loadmof.sh ]; then + peg-loadmof.sh -n root/cimv2 /usr/share/mof/cim-current/*/{%{PEGASUS_MOF}}.mof + rctog-pegasus try-restart +fi +# and then following script can handle registration for various providers d=%_datadir/%name -for i in %mofs; do - $d/provider-register.sh -t sfcb -r $d/$i.registration -m $d/$i.mof -done +$d/provider-register.sh -r $d/{%{mofs}}.registration -m $d/{%{mofs}}.mof %preun if [ "$1" = "0" ]; then d=%_datadir/%name - for i in %mofs; do - $d/provider-register.sh -t sfcb -d -r $d/$i.registration -m $d/$i.mof - done + $d/provider-register.sh -d -r $d/{%{mofs}}.registration -m $d/{%{mofs}}.mof fi %files %defattr(-,root,root) +%if 0%{?suse_version} %doc %{_docdir}/%{name} +%else +%doc %{_docdir}/%{name}-%{version} +%endif %{_libdir}/cmpi/*.so %{_libdir}/*.so %{_datadir}/%{name} ++++++ sblim-cmpi-nfsv4-1.0.12.tar.bz2 -> sblim-cmpi-nfsv4-1.1.0.tar.bz2 ++++++ ++++ 46378 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sblim-cmpi-nfsv3 for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package sblim-cmpi-nfsv3 for openSUSE:Factory checked in at 2012-03-07 13:45:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sblim-cmpi-nfsv3 (Old) and /work/SRC/openSUSE:Factory/.sblim-cmpi-nfsv3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sblim-cmpi-nfsv3", Maintainer is "VDziewiecki(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sblim-cmpi-nfsv3/sblim-cmpi-nfsv3.changes 2011-09-23 12:45:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sblim-cmpi-nfsv3.new/sblim-cmpi-nfsv3.changes 2012-03-07 13:45:35.000000000 +0100 @@ -1,0 +2,38 @@ +Mon Feb 13 10:55:31 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Wed Sep 7 10:21:40 UTC 2011 - kkaempf(a)suse.com + +- Fix resource leak + if fopen() is successful and valid_file() not, file is not closed + (Pavel Raiskup <praiskup(a)redhat.com>) + +------------------------------------------------------------------- +Wed Sep 7 10:18:31 UTC 2011 - kkaempf(a)suse.com + +- update to 1.1.1 + - Features: + - 3299507 obtain fully qualified hostname using etab entry + - Bugs: + - 3275169 bash error reported in provider bootstrap scripts + - 3303687 remove old cmpi version definition + +------------------------------------------------------------------- +Mon Sep 13 19:08:27 UTC 2010 - kkaempf(a)novell.com + +- Fix RHEL build + +------------------------------------------------------------------- +Tue Oct 6 14:17:51 CEST 2009 - mhrusecky(a)suse.cz + +- updated to 1.1.0 + - fixes: + * 1652246: fixes compile errors with gcc4 + * 1457924: various compile warnings + * 1833455: updated URL for CPL + * 2795176: migrate provider licenses to EPL + - sblim-cmpi-nfsv3-1.0.13_gcc4.patch not needed anymore + +------------------------------------------------------------------- Old: ---- sblim-cmpi-nfsv3-1.0.13_gcc4.patch sblim-cmpi-nfsv3-1.0.14.tar.bz2 New: ---- 0001-Missing-fclose-fix.patch sblim-cmpi-nfsv3-1.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-cmpi-nfsv3.spec ++++++ --- /var/tmp/diff_new_pack.QnGe4q/_old 2012-03-07 13:45:37.000000000 +0100 +++ /var/tmp/diff_new_pack.QnGe4q/_new 2012-03-07 13:45:37.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package sblim-cmpi-nfsv3 (Version 1.0.14) +# spec file for package sblim-cmpi-nfsv3 # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,23 +15,31 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: sblim-cmpi-nfsv3 Url: http://sblim.wiki.sourceforge.net/ -BuildRequires: bison flex gcc-c++ openslp-devel openssl-devel pam-devel sblim-cmpi-base-devel sblim-indication_helper-devel sblim-testsuite +BuildRequires: bison +BuildRequires: flex +BuildRequires: gcc-c++ +BuildRequires: openssl-devel +BuildRequires: pam-devel +BuildRequires: sblim-cmpi-base-devel +BuildRequires: sblim-indication_helper-devel +BuildRequires: sblim-sfcb +BuildRequires: sblim-testsuite +%if 0%{?suse_version} +BuildRequires: openslp-devel +%endif Summary: SBLIM CMPI NFSv3 Instrumentation -Version: 1.0.14 -Release: 85 +License: EPL-1.0 Group: System/Management -License: IBM Public License +Version: 1.1.1 +Release: 0 Requires: sblim-cmpi-base >= 1.2.3 -Requires: cim-server +Requires: cim-server, cim-schema Source: http://prdownloads.sourceforge.net/sblim/sblim-cmpi-nfsv3-%{version}.tar.bz2 -Patch: sblim-cmpi-nfsv3-1.0.13_gcc4.patch +Patch: 0001-Missing-fclose-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: sblim-sfcb #!BuildIgnore: tog-pegasus %description @@ -45,42 +53,57 @@ %prep %setup -n %{name}-%{version} -%patch +%patch -p1 %build %configure --disable-static %{__make} %install +%if 0%{?suse_version} %makeinstall docdir=%{_docdir}/%{name} +%else +make install DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-%{version} +%endif rm %buildroot%_libdir/cmpi/*.la rm %buildroot%_libdir/*.la %clean %{__rm} -rf %{buildroot} +%define PEGASUS_MOF CIM_SystemSetting,CIM_NFS,CIM_SystemConfiguration,CIM_SystemSettingContext + %post -%define mofs Linux_NFSv3SystemSetting Linux_NFSv3SystemConfiguration # compile MOF -d=%_datadir/%name -for i in %mofs; do - $d/provider-register.sh -t sfcb -r $d/$i.registration -m $d/$i.mof -done +/sbin/ldconfig +# Register Schema and Provider - this is higly provider specific +# tog-pegasus needs some schemes registered first +if [ -x /usr/bin/peg-loadmof.sh ]; then + peg-loadmof.sh -n root/cimv2 /usr/share/mof/cim-current/*/{%{PEGASUS_MOF}}.mof + rctog-pegasus try-restart +fi +# and then following script can handle registration for various providers +d=%{_datadir}/%{name} +$d/provider-register.sh -r $d/*.registration -m $d/*.mof %preun if [ "$1" = "0" ]; then - d=%_datadir/%name - for i in %mofs; do - $d/provider-register.sh -t sfcb -d -r $d/$i.registration -m $d/$i.mof - done + d=%{_datadir}/%{name} + $d/provider-register.sh -d -r $d/*.registration -m $d/*.mof fi +%postun -p /sbin/ldconfig + %files %defattr(-,root,root) %{_libdir}/cmpi/*.so %{_libdir}/*.so %{_datadir}/sblim-testsuite/* %{_datadir}/%{name}/ +%if 0%{?suse_version} %doc %{_docdir}/%{name} +%else +%doc %{_docdir}/%{name}-%{version} +%endif %changelog ++++++ 0001-Missing-fclose-fix.patch ++++++ >From 6d06b5b1dd12bf73be2673016d6536265854f084 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup <praiskup(a)redhat.com> Date: Wed, 3 Aug 2011 12:57:51 +0200 Subject: [PATCH 1/2] Missing fclose fix fclose was not called when valid_file() returned -1 (the file was correctly opened). --- util/Linux_NFSv3SystemConfigurationUtil.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/util/Linux_NFSv3SystemConfigurationUtil.c b/util/Linux_NFSv3SystemConfigurationUtil.c index 546c7e0..c40b53b 100644 --- a/util/Linux_NFSv3SystemConfigurationUtil.c +++ b/util/Linux_NFSv3SystemConfigurationUtil.c @@ -448,6 +448,8 @@ void * Linux_NFSv3_startReadingInstances() /* If etab file doesn't exist or is zero bytes, use exports */ if ( ((sourcefile = fopen(_CONFIGFILE_ETAB, "r")) == NULL) || (valid_file(_CONFIGFILE_ETAB) == -1) ) { + if (sourcefile) + fclose(sourcefile); _OSBASE_TRACE(4,("startReadingInstances() : %s not found or contains no entries. Using /etc/exports", _CONFIGFILE_ETAB)); if ((sourcefile = fopen(_CONFIGFILE,"r")) == NULL) { _OSBASE_TRACE(1,("startReadingInstances() : Cannot read from config file %s", _CONFIGFILE)); -- 1.7.3.1 ++++++ sblim-cmpi-nfsv3-1.0.14.tar.bz2 -> sblim-cmpi-nfsv3-1.1.1.tar.bz2 ++++++ ++++ 78202 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rrdtool for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package rrdtool for openSUSE:Factory checked in at 2012-03-07 13:45:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rrdtool (Old) and /work/SRC/openSUSE:Factory/.rrdtool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rrdtool", Maintainer is "VDziewiecki(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes 2012-01-31 10:22:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2012-03-07 13:45:27.000000000 +0100 @@ -1,0 +2,19 @@ +Mon Mar 5 11:41:55 UTC 2012 - vdziewiecki(a)suse.com + +- update to 1.4.7 + * check in /usr/lib64 for tclConfig.sh too + * remove perl 5.004 compatibility hack and make RRDs compile with newer + perls. + * added support for rrdgraph to use the yotta, zetta, zepto, yocto prefixes. + * configure option to disable building rrd_graph: --disable-rrd_graph + With support from Ulf Zimmermann (OpenLane) + * fixed segfault in rrdtool (xport, fetch, graph) when handling + error conditions. -- James Brown + * fix uninitialized variable in rrd_graph (#322) + * improved data reduction algorithm in graph: after fetching, data must be + reduced to at least chart resolution, else some data will not get plotted. + fix for #298 + * plug memory leak in lua bindings #301 + * improve cross compiling -- Michael Olbrich + +------------------------------------------------------------------- Old: ---- rrdtool-1.4.5.tar.bz2 New: ---- rrdtool-1.4.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rrdtool.spec ++++++ --- /var/tmp/diff_new_pack.8wRLXY/_old 2012-03-07 13:45:29.000000000 +0100 +++ /var/tmp/diff_new_pack.8wRLXY/_new 2012-03-07 13:45:29.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: rrdtool BuildRequires: cairo-devel BuildRequires: freetype2-devel @@ -42,11 +43,11 @@ BuildRequires: libtool BuildRequires: tcpd-devel Requires: perl = %{perl_version} -Version: 1.4.5 +Version: 1.4.7 Release: 0 %define cgilib_version 0.7 # http://oss.oetiker.ch/rrdtool/pub/rrdtool-%{version}.tar.gz -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.gz Patch1: rrdtool-lua_lib64.patch Patch2: rrdtool-tclversion.patch Patch3: rrdtool-tclsegfault.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit quilt for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package quilt for openSUSE:Factory checked in at 2012-03-07 13:45:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quilt (Old) and /work/SRC/openSUSE:Factory/.quilt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "quilt", Maintainer is "JDelvare(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2012-02-28 14:15:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2012-03-07 13:45:19.000000000 +0100 @@ -1,0 +2,21 @@ +Fri Mar 2 14:20:24 CET 2012 - jdelvare(a)suse.de + +- Fix interaction between quilt and vimdiff (bnc#749563). + +------------------------------------------------------------------- +Thu Mar 1 21:29:26 CET 2012 - jdelvare(a)suse.de + +- Fix build (/usr/lib/quilt is gone.) +- Turn into a noarch package. + +------------------------------------------------------------------- +Thu Mar 1 21:11:18 CET 2012 - jdelvare(a)suse.de + +- update to 0.60 + o Includes a rewrite of backup-files from C to bash, making it + possible to turn quilt into a noarch package. + o Includes several fixes to the mail command. + o Obsoletes fix-relative-import.patch. + o Obsoletes grep-support-spaces.patch. + +------------------------------------------------------------------- Old: ---- fix-relative-import.patch grep-support-spaces.patch quilt-0.51.tar.bz2 New: ---- quilt-0.60.tar.bz2 quilt-support-vimdiff.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quilt.spec ++++++ --- /var/tmp/diff_new_pack.pAEpw1/_old 2012-03-07 13:45:21.000000000 +0100 +++ /var/tmp/diff_new_pack.pAEpw1/_new 2012-03-07 13:45:21.000000000 +0100 @@ -24,7 +24,7 @@ Summary: A Tool for Working with Many Patches License: GPL-2.0+ Group: Productivity/Text/Utilities -Version: 0.51 +Version: 0.60 Release: 0 Requires: bzip2 Requires: coreutils @@ -46,13 +46,13 @@ Source: %{name}-%{version}.tar.bz2 Source1: suse-start-quilt-mode.el Patch1: expand.diff -Patch2: fix-relative-import.patch +patch2: quilt-support-vimdiff.patch Patch3: patch-wrapper-rpm.diff -Patch4: grep-support-spaces.patch Patch5: suse-workaround-pseudo-release.patch Patch6: quilt-stable-rebuild.patch Url: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Quilt allows you to easily manage large numbers of patches by keeping @@ -73,7 +73,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 @@ -132,7 +131,6 @@ /usr/bin/quilt /usr/share/quilt/ /usr/share/emacs/ -/usr/lib/quilt/ %config /etc/quilt.quiltrc %config /etc/bash_completion.d/quilt.sh %doc %{_mandir}/man1/guards.1.gz ++++++ quilt-0.51.tar.bz2 -> quilt-0.60.tar.bz2 ++++++ ++++ 6870 lines of diff (skipped) ++++++ quilt-stable-rebuild.patch ++++++ --- /var/tmp/diff_new_pack.pAEpw1/_old 2012-03-07 13:45:21.000000000 +0100 +++ /var/tmp/diff_new_pack.pAEpw1/_new 2012-03-07 13:45:21.000000000 +0100 @@ -1,8 +1,10 @@ -Index: quilt-0.51/Makefile.in -=================================================================== ---- quilt-0.51.orig/Makefile.in -+++ quilt-0.51/Makefile.in -@@ -227,8 +227,11 @@ doc/reference : bin/quilt $(QUILT:%=quil +--- + Makefile.in | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- quilt-0.60.orig/Makefile.in ++++ quilt-0.60/Makefile.in +@@ -215,8 +215,11 @@ doc/reference : bin/quilt $(QUILT:%=quil @unset LANG LC_MESSAGES LC_CTYPE LC_ALL; \ for i in $(QUILT); \ do \ @@ -10,8 +12,8 @@ + done | sort | while read j ; \ + do \ echo; \ -- quilt $$i -h; \ -+ quilt $$j -h; \ +- QUILT_PC=.fake_pc quilt $$i -h; \ ++ QUILT_PC=.fake_pc quilt $$j -h; \ echo; \ done | \ $(SED) -e 's/\$$EDITOR ([^)]*)/$$EDITOR/' \ ++++++ quilt-support-vimdiff.patch ++++++ From: Jean Delvare <jdelvare(a)suse.de> Subject: Fix interaction between quilt and vimdiff References: bnc#749563 Using vimdiff as a diff viewer in quilt breaks if QUILT_PAGER is set. So inhibit the pager in that case. Other diff viewers may be affected as well but I don't know how to fix this in a generic way, short of inhibiting the pager as soon as option --diff is passed to the diff command. Not sure if this desirable though, as I presume non-interactive alternative diff viewers must exist too. --- quilt/diff.in | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) --- a/quilt/diff.in +++ b/quilt/diff.in @@ -66,7 +66,9 @@ included. --diff=utility Use the specified utility for generating the diff. The utility - is invoked with the original and new file name as arguments. + is invoked with the original and new file name as arguments. If + using an interactive text-mode diff viewer that is not known to + quilt, you will have to unset QUILT_PAGER for proper result. --color[=always|auto|never] Use syntax coloring. @@ -211,6 +213,13 @@ done QUILT_DIFF_OPTS="$QUILT_DIFF_OPTS $opt_format" +# Inhibit pager for interactive text-mode diff viewers +case "$(basename $opt_diff)" in +vimdiff) + QUILT_PAGER= + ;; +esac + opt_files=( $(for file in "$@"; do echo "$SUBDIR$file" ; done) ) if [ $[0$opt_combine + 0$opt_snapshot + 0$opt_relative] -gt 1 ] -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-tox for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package python-tox for openSUSE:Factory checked in at 2012-03-07 13:45:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-tox (Old) and /work/SRC/openSUSE:Factory/.python-tox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-tox", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.python-tox.new/python-tox.changes 2012-03-07 13:45:14.000000000 +0100 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 21 09:01:57 UTC 2012 - saschpe(a)suse.de + +- Don't use nose, but custom script to run testsuite + +------------------------------------------------------------------- +Mon Feb 20 21:54:02 UTC 2012 - saschpe(a)gmx.de + +- Initial version + New: ---- python-tox.changes python-tox.spec tox-1.3.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-tox.spec ++++++ # # spec file for package python-tox # # Copyright (c) 2012 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/ # Name: python-tox Version: 1.3 Release: 0 License: GPL-2.0+ Summary: Virtualenv-based automation of test activities Url: http://codespeak.net/tox Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/t/tox/tox-%{version}.zip BuildRequires: python-Sphinx BuildRequires: python-devel BuildRequires: python-py BuildRequires: python-pytest BuildRequires: python-virtualenv BuildRequires: unzip Requires: python-argparse Requires: python-py Requires: python-virtualenv BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description Tox as is a generic virtualenv management and test command line tool you can use for: * checking your package installs correctly with different Python versions and interpreters * running your tests in each of the environments, configuring your test tool of choice * acting as a frontend to Continuous Integration servers, greatly reducing boilerplate and merging CI and shell-based testing. %prep %setup -q -n tox-%{version} %build python setup.py build cd doc && make html && rm -r _build/html/.buildinfo # Generate HTML documentation %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %check python setup.py test %files %defattr(-,root,root,-) %doc LICENSE README.txt doc/_build/html %{_bindir}/tox %{python_sitelib}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-pysvn for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package python-pysvn for openSUSE:Factory checked in at 2012-03-07 13:45:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pysvn (Old) and /work/SRC/openSUSE:Factory/.python-pysvn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pysvn", Maintainer is "Thomas.Schraitle(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/python-pysvn/python-pysvn.changes 2011-11-02 12:16:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-pysvn.new/python-pysvn.changes 2012-03-07 13:45:03.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Mar 4 08:32:56 UTC 2012 - coolo(a)suse.com + +- update to 1.7.6: + * supports subversion 1.7.3 (and earlier) + +------------------------------------------------------------------- +Wed Feb 1 10:30:58 UTC 2012 - saschpe(a)suse.de + +- Ran spec-cleaner + +------------------------------------------------------------------- Old: ---- pysvn-1.7.5.tar.bz2 New: ---- pysvn-1.7.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pysvn.spec ++++++ --- /var/tmp/diff_new_pack.lbUC00/_old 2012-03-07 13:45:04.000000000 +0100 +++ /var/tmp/diff_new_pack.lbUC00/_new 2012-03-07 13:45:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-pysvn # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,56 +15,49 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - -%define _realname pysvn Name: python-pysvn +Version: 1.7.6 +Release: 0 +Summary: Highlevel Subversion Python Bindings +License: Apache-2.0 Group: Development/Libraries/Python Url: http://pysvn.tigris.org -License: Apache-2.0 -BuildRequires: gcc gcc-c++ libapr1-devel libcom_err-devel libcom_err2 libexpat-devel neon-devel python python-devel python-xml subversion-devel -Requires: neon subversion -Version: 1.7.5 -Release: 1 -Source0: %{_realname}-%{version}.tar.bz2 +Source0: http://pysvn.barrys-emacs.org/source_kits/pysvn-%{version}.tar.gz Patch0: bnc445431_pysvn_svnenv.cpp.diff +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: libcom_err-devel +BuildRequires: libcom_err2 +BuildRequires: libexpat-devel +BuildRequires: neon-devel +BuildRequires: python-devel +BuildRequires: python-xml +BuildRequires: subversion-devel +BuildRequires: pkgconfig(apr-1) +Requires: neon +Requires: subversion BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Highlevel Subversion Python Bindings -%if 0%suse_version <= 1110 -%define _sitedir %py_sitedir/%_realname -%else -%define _sitedir %python_sitearch/%_realname +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %endif %description -pysvn is a highlevel and easy to use Python bindings to Subversion. -The pysvn project's goal is to enable Tools to be written in Python -that use Subversion. Windows, Mac OS X, Linux and other unix -platforms are supported. +pysvn is a highlevel and easy to use Python bindings to Subversion. The pysvn +project's goal is to enable Tools to be written in Python that use Subversion. +Windows, Mac OS X, Linux and other unix platforms are supported. Features: -* Supports all svn client features - -* Supports svn transaction features required to write svn pre-commit + * Supports all svn client features + * Supports svn transaction features required to write svn pre-commit hooks - -* Easy to learn and use - -* Python like interface - -* Good Documentation and examples - -* No need to understand the Subversion C API - - - -Authors: --------- - Barry Scott <barryscott(a)tigris.org> + * Easy to learn and use + * Python like interface + * Good Documentation and examples + * No need to understand the Subversion C API %prep -%setup -q -n %{_realname}-%{version} +%setup -q -n pysvn-%{version} %patch0 -p0 # patch in rpm compiler flags sed -i 's/CCFLAGS=-Wall/CCFLAGS=$(RPM_OPT_FLAGS) -Wall -Wno-deprecated/g' Source/setup_configure.py @@ -75,24 +68,20 @@ python setup.py configure # --norpath make %{?_smp_mflags} -#cd ../Tests -#make %{?_smp_mflags} %install -mkdir -p $RPM_BUILD_ROOT/%_sitedir -cp Source/pysvn/__init__.py $RPM_BUILD_ROOT/%_sitedir -cp Source/pysvn/_pysvn*.so $RPM_BUILD_ROOT/%_sitedir -%py_compile $RPM_BUILD_ROOT/%_sitedir +mkdir -p %{buildroot}/%{python_sitearch}/pysvn +cp Source/pysvn/{__init__.py,_pysvn*.so} %{buildroot}/%{python_sitearch}/pysvn +%py_compile %{buildroot}/%{python_sitearch}/pysvn rm -f Docs/generate_cpp_docs_from_html_docs.py -%clean -rm -rf $RPM_BUILD_ROOT +#%%check +#cd Tests +#make %{?_smp_mflags} %files %defattr(-,root,root) -%doc LICENSE.txt -%doc Docs -%doc Examples -%_sitedir +%doc LICENSE.txt Docs Examples +%{python_sitearch}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-PasteScript for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package python-PasteScript for openSUSE:Factory checked in at 2012-03-07 13:44:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-PasteScript (Old) and /work/SRC/openSUSE:Factory/.python-PasteScript.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-PasteScript", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-PasteScript/python-PasteScript.changes 2012-02-02 18:00:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-PasteScript.new/python-PasteScript.changes 2012-03-07 13:44:56.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 6 10:59:39 UTC 2012 - bwiedemann(a)suse.com + +- drop groups properly (fixes bnc#748875) + +------------------------------------------------------------------- New: ---- ianb-pastescript-a19e462769b4.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-PasteScript.spec ++++++ --- /var/tmp/diff_new_pack.Wy7LHO/_old 2012-03-07 13:44:57.000000000 +0100 +++ /var/tmp/diff_new_pack.Wy7LHO/_new 2012-03-07 13:44:57.000000000 +0100 @@ -16,6 +16,7 @@ # + Name: python-PasteScript Version: 1.7.5 Release: 0 @@ -24,6 +25,7 @@ License: MIT Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/P/PasteScript/PasteScript-%{version}… +Patch0: ianb-pastescript-a19e462769b4.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-PasteDeploy BuildRequires: python-devel @@ -48,6 +50,7 @@ %prep %setup -q -n PasteScript-%{version} +%patch0 mv docs/_build docs/html # Proper name for HTML docs sed -i "1d" tests/test_logging_config.py # Fix non-executable script ++++++ ianb-pastescript-a19e462769b4.diff ++++++ diff -ru paste/script/serve.py paste/script/serve.py --- paste/script/serve.py 2010-11-17 19:38:52.000000000 +0100 +++ paste/script/serve.py 2012-02-08 06:30:50.000000000 +0100 @@ -497,6 +497,11 @@ if self.verbose > 0: print 'Changing user to %s:%s (%s:%s)' % ( user, group or '(unknown)', uid, gid) + if hasattr(os, 'initgroups'): + os.initgroups(user, gid) + else: + os.setgroups([e.gr_gid for e in grp.getgrall() + if user in e.gr_mem] + [gid]) if gid: os.setgid(gid) if uid: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pfstools for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package pfstools for openSUSE:Factory checked in at 2012-03-07 13:44:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pfstools (Old) and /work/SRC/openSUSE:Factory/.pfstools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pfstools", Maintainer is "postadal(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pfstools/pfstools.changes 2011-11-21 15:49:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pfstools.new/pfstools.changes 2012-03-07 13:44:36.000000000 +0100 @@ -1,0 +2,29 @@ +Tue Mar 6 15:48:35 UTC 2012 - tabraham(a)novell.com + +- refreshed pfstools-octave.patch + +- Update to version 1.8.4 + * fixed: SegFault from pfsview when switching channels + * fixed: quoted arguments in pfsin/pfsout/pfsv/pfsindcraw/ + pfsinmulti (fixes bug 3279342) + +- Changes from version 1.8.3 + * fixed: pfsdisplayfunction properly interpolates display LUT + * fixed: bug #3080304 - configure uses non-portable test(1) syntax + * fixed: bug #1766263 - pfsinhdrgen fails silently on pfsin + failure. - partially + * fixed: pfsview the entire code converted from qt3 to qt4 (fixes + bug #3127946) + * fixed: "Fit window to content" works again in pfsview + * added: window icon in pfsview + * added: improved image file saving in pfsview + +- Changes from version 1.8.2 + * fixed: compiler incompatibility issue in pfspanoramic.cpp + * fixed: bug #2953028 "gcc 4.4.1 const cast error" + * fixed: spaces were improperly escaped in pfsin / pfsout (thanks + to Timo) + * added: new improved hdrhtml template from hdrlabs.com (thanks + to Christian) + +------------------------------------------------------------------- Old: ---- pfstools-1.8.1.tar.bz2 New: ---- pfstools-1.8.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pfstools.spec ++++++ --- /var/tmp/diff_new_pack.lsgOhT/_old 2012-03-07 13:44:52.000000000 +0100 +++ /var/tmp/diff_new_pack.lsgOhT/_new 2012-03-07 13:44:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pfstools # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,11 +16,9 @@ # - Name: pfstools -Version: 1.8.1 -Release: 2 -License: GPL-2.0+ ; LGPL-2.1+ +Version: 1.8.4 +Release: 0 Source: %{name}-%{version}.tar.bz2 Patch: %{name}-octave.patch Patch1: %{name}-gcc.patch @@ -28,12 +26,25 @@ Patch4: pfstools-stdlib.patch Patch5: pfstools-1.8.1-fix-return-in-nonvoid.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Group: Productivity/Multimedia/Other Url: http://www.mpi-sb.mpg.de/resources/pfstools/ -BuildRequires: ImageMagick-Magick++-devel Mesa OpenEXR-devel blas fftw3-devel freeglut-devel lapack libnetpbm-devel libtiff-devel libtool pkgconfig qt3-devel readline-devel +BuildRequires: ImageMagick-Magick++-devel +BuildRequires: Mesa +BuildRequires: OpenEXR-devel +BuildRequires: blas +BuildRequires: fftw3-devel +BuildRequires: freeglut-devel +BuildRequires: lapack +BuildRequires: libnetpbm-devel +BuildRequires: libqt4-devel +BuildRequires: libtiff-devel +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: readline-devel #BuildRequires: octave-devel Requires: dcraw Summary: High Dynamic Range Images and Video manipulation tools +License: GPL-2.0+ ; LGPL-2.1+ +Group: Productivity/Multimedia/Other %description pfstools package is a set of command line (and one GUI) programs for @@ -50,10 +61,10 @@ Rafal Mantiuk <mantiuk(a)mpi-sb.mpg.de> %package devel -License: GPL-2.0+ -Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Summary: High Dynamic Range Images and Video manipulation tools +License: GPL-2.0+ +Group: Development/Libraries/C and C++ %description devel pfstools package is a set of command line (and one GUI) programs for @@ -79,7 +90,7 @@ %build autoreconf -f -i -%configure --disable-static --with-pic --disable-octave +%configure --disable-static --with-pic --disable-octave --with-qtdir=/usr make %{?jobs:-j%jobs} %install ++++++ pfstools-1.8.1.tar.bz2 -> pfstools-1.8.4.tar.bz2 ++++++ ++++ 75587 lines of diff (skipped) ++++++ pfstools-octave.patch ++++++ --- /var/tmp/diff_new_pack.lsgOhT/_old 2012-03-07 13:44:53.000000000 +0100 +++ /var/tmp/diff_new_pack.lsgOhT/_new 2012-03-07 13:44:53.000000000 +0100 @@ -1,11 +1,11 @@ ---- src/octave/Makefile.am -+++ src/octave/Makefile.am +--- src/octave/Makefile.am.orig 2012-03-05 23:21:05.608611965 -0500 ++++ src/octave/Makefile.am 2012-03-05 23:21:42.870146129 -0500 @@ -28,7 +28,7 @@ %.oct: %.cpp %_help.h echo $(find %.help.h, $(help_files)) - $(MKOCTFILE) -v -s -I. -I$(top_srcdir)/src/pfs/ $(LIBS) -L../pfs/ -lpfs $< -o $@ -+ $(MKOCTFILE) -v -I. -I$(top_srcdir)/src/pfs/ $(LIBS) -L../pfs/libpfs-1.2.la $< -o $@ ++ $(MKOCTFILE) -v -I. -I$(top_srcdir)/src/pfs/ $(LIBS) -L../pfs/libpfs-1.2.la $< -o $@ + %_help.h: %.help - awk ' { print "\t\"" $$0 "\\n\""; } END { print ";" } ' <$< >$@ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Net-Whois-Raw for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package perl-Net-Whois-Raw for openSUSE:Factory checked in at 2012-03-07 13:44:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Net-Whois-Raw (Old) and /work/SRC/openSUSE:Factory/.perl-Net-Whois-Raw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Net-Whois-Raw", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Net-Whois-Raw/perl-Net-Whois-Raw.changes 2011-09-23 12:38:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Net-Whois-Raw.new/perl-Net-Whois-Raw.changes 2012-03-07 13:44:29.000000000 +0100 @@ -1,0 +2,47 @@ +Mon Feb 13 13:02:38 UTC 2012 - coolo(a)suse.com + +- update to 2.40 + - Fixed problem with passing server parameter from command line in pwhois + - Fixed problem with encoding detection in pwhois on Windows + - Added convertation to punycode in pwhois + + - Added domain name validation in pwhois + - Updated some 'not found' string + + - whois.relcom.ru is no more. Using whois.nic.ru instead. + - Removed crutches for whois.relcom.ru / www_whois + + - Further migration from whois.relcom.ru to whois.nic.ru + + - confess -> die :: no need to die such verbosely + + - Added whois server for .SO zone + + - Deleted whitespaces removing from the whois result + + - Added whois server for .CO.UA zone + + - Added whois server for .IN.UA zone + + - Added whois server for .XXX zone + - Fixed BZ whois (restored whois.belizenic.bz server) + + - Fixed regexp for .PRO whois check + + - Fixed whois server address for *.ua domains + + - Confess instead of die to simplify error tracing + + - internet tests updated + - Net::Whois::Raw::Data addons / updates, thanx to Guillaume + + - Now you can redefine SOCK_CLASS::getline method as you want + - require_once for Data::Dumper + + +------------------------------------------------------------------- +Mon Feb 13 10:52:16 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- Old: ---- Net-Whois-Raw-2.25.tar.bz2 New: ---- Net-Whois-Raw-2.40.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Net-Whois-Raw.spec ++++++ --- /var/tmp/diff_new_pack.971Gbo/_old 2012-03-07 13:44:32.000000000 +0100 +++ /var/tmp/diff_new_pack.971Gbo/_new 2012-03-07 13:44:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Net-Whois-Raw # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,62 +15,52 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: perl-Net-Whois-Raw +Version: 2.40 +Release: 0 %define cpan_name Net-Whois-Raw Summary: Get Whois information for domains -Version: 2.25 -Release: 1 -License: GPL+ or Artistic +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Net-Whois-Raw/ -#Source: http://www.cpan.org/modules/by-module/Net/Net-Whois-Raw-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.bz2 +Source: http://www.cpan.org/authors/id/D/DE/DESPAIR/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} BuildRequires: perl -BuildRequires: perl(Module::Build) BuildRequires: perl-macros -BuildRequires: perl(Encode) -BuildRequires: perl(Test::More) -# -BuildRequires: perl(Getopt::Long) >= 2 BuildRequires: perl(HTTP::Headers) BuildRequires: perl(HTTP::Request) BuildRequires: perl(LWP::UserAgent) +BuildRequires: perl(Module::Build) +BuildRequires: perl(Net::IDN::Punycode) >= 1 BuildRequires: perl(URI::URL) -# -Requires: perl(Getopt::Long) >= 2 +#BuildRequires: perl(DBI) +#BuildRequires: perl(Net::Whois::Raw) +#BuildRequires: perl(Net::Whois::Raw::Common) +#BuildRequires: perl(Net::Whois::Raw::Data) Requires: perl(HTTP::Headers) Requires: perl(HTTP::Request) Requires: perl(LWP::UserAgent) +Requires: perl(Net::IDN::Punycode) >= 1 Requires: perl(URI::URL) +%{perl_requires} %description Net::Whois::Raw queries WHOIS servers about domains. The module supports recursive WHOIS queries. Also queries via HTTP is supported for some TLDs. -Setting the variables $OMIT_MSG and $CHECK_FAIL will match the results against -a set of known patterns. The first flag will try to omit the copyright -message/disclaimer, the second will attempt to determine if the search failed -and return undef in such a case. - -IMPORTANT: these checks merely use pattern matching; they will work on several -servers but certainly not on all of them. - -Author: -------- - Ariel Brosh schop(a)cpan.org - Gabor Szabo gabor(a)perl.org.il - Corris Randall corris(a)cpan.org - Walery Studennikov despair(a)cpan.org +Setting the variables $OMIT_MSG and $CHECK_FAIL will match the results +against a set of known patterns. The first flag will try to omit the +copyright message/disclaimer, the second will attempt to determine if the +search failed and return undef in such a case. + +*IMPORTANT*: these checks merely use pattern matching; they will work on +several servers but certainly not on all of them. %prep %setup -q -n %{cpan_name}-%{version} -%{__chmod} 0644 pwhois +find . -type f -print0 | xargs -0 chmod 644 %build %{__perl} Build.PL installdirs=vendor @@ -80,14 +70,11 @@ ./Build test %install -./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 +./Build install destdir=%{buildroot} create_packlist=0 %perl_gen_filelist -%clean -%{__rm} -rf $RPM_BUILD_ROOT - %files -f %{name}.files -%defattr(-,root,root,-) +%defattr(-,root,root,755) %doc Changes COPYRIGHT pwhois README %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-NetAddr-IP for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package perl-NetAddr-IP for openSUSE:Factory checked in at 2012-03-07 13:44:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-NetAddr-IP (Old) and /work/SRC/openSUSE:Factory/.perl-NetAddr-IP.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-NetAddr-IP", Maintainer is "ms(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-NetAddr-IP/perl-NetAddr-IP.changes 2011-12-22 10:54:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-NetAddr-IP.new/perl-NetAddr-IP.changes 2012-03-07 13:44:27.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 7 09:06:38 UTC 2012 - andrea.turrini(a)gmail.com + +- fixed typo in perl-NetAddr-IP.spec description + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-NetAddr-IP.spec ++++++ --- /var/tmp/diff_new_pack.86N4vp/_old 2012-03-07 13:44:29.000000000 +0100 +++ /var/tmp/diff_new_pack.86N4vp/_new 2012-03-07 13:44:29.000000000 +0100 @@ -40,7 +40,7 @@ %description This module provides an object-oriented abstraction on top of IP addresses or IP subnets, that allows for easy manipulations. Version 4.xx of -NetAdder::IP will will work with older versions of Perl and is compatible +NetAdder::IP will work with older versions of Perl and is compatible with Math::BigInt. The internal representation of all IP objects is in 128 bit IPv6 notation. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-App-perlbrew for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package perl-App-perlbrew for openSUSE:Factory checked in at 2012-03-07 13:44:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-App-perlbrew (Old) and /work/SRC/openSUSE:Factory/.perl-App-perlbrew.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-App-perlbrew", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-App-perlbrew/perl-App-perlbrew.changes 2012-02-08 15:40:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-App-perlbrew.new/perl-App-perlbrew.changes 2012-03-07 13:44:12.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Feb 21 09:03:00 UTC 2012 - coolo(a)suse.com + +- updated to 0.41 + - Fix installation issue when the specified version is not listed in CPAN::Perl::Releases + - Fix sub-shell invocation for 'switch' and 'use' command. This is particularly for csh users, but it should also work for bash users. + - Make the stanalone perlbrew program smaller by using Perl::Strip + - use CPAN::Perl::Releases to decide the location of perl tarball -- less HTTP hits + - Prefer $PERLBREW_ROOT/bin/patchperl if it is there. + +------------------------------------------------------------------- Old: ---- App-perlbrew-0.39.tar.gz New: ---- App-perlbrew-0.41.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-App-perlbrew.spec ++++++ --- /var/tmp/diff_new_pack.lR1rKL/_old 2012-03-07 13:44:21.000000000 +0100 +++ /var/tmp/diff_new_pack.lR1rKL/_new 2012-03-07 13:44:21.000000000 +0100 @@ -16,75 +16,74 @@ # -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 -%define with_test 1 -%endif - Name: perl-App-perlbrew -Version: 0.39 -Release: 1 -License: MIT +Version: 0.41 +Release: 0 %define cpan_name App-perlbrew Summary: Manage perl installations in your $HOME -Url: http://search.cpan.org/dist/App-perlbrew/ +License: MIT Group: Development/Libraries/Perl +Url: http://search.cpan.org/dist/App-perlbrew/ Source: http://www.cpan.org/authors/id/G/GU/GUGOD/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(Devel::PatchPerl) >= 0.46 -BuildRequires: perl(Path::Class) -BuildRequires: perl(IO::All) -BuildRequires: perl(Try::Tiny) -BuildRequires: perl(File::Path::Tiny) -BuildRequires: perl(local::lib) >= 1.008 +BuildRequires: perl(CPAN::Perl::Releases) >= 0.40 BuildRequires: perl(Capture::Tiny) >= 0.13 -%if 0%{?with_test} +BuildRequires: perl(Devel::PatchPerl) >= 0.62 +BuildRequires: perl(File::Path::Tiny) >= 0.1 +BuildRequires: perl(IO::All) +BuildRequires: perl(Path::Class) +BuildRequires: perl(Test::Exception) +BuildRequires: perl(Test::Output) BuildRequires: perl(Test::Simple) >= 0.98 BuildRequires: perl(Test::Spec) -BuildRequires: perl(Test::Output) -BuildRequires: perl(Test::Exception) -%endif -Requires: perl(Devel::PatchPerl) >= 0.26 -Requires: perl(Path::Class) -Requires: perl(IO::All) -Requires: perl(Try::Tiny) -Requires: perl(File::Path::Tiny) +BuildRequires: perl(local::lib) >= 1.008 +#BuildRequires: perl(App::perlbrew) +#BuildRequires: perl(inc::Module::Install) +#BuildRequires: perl(JSON) +#BuildRequires: perl(LWP::Simple) +#BuildRequires: perl(Module::Build) +#BuildRequires: perl(Module::Install::Base) +#BuildRequires: perl(Parse::CPAN::Meta) +#BuildRequires: perl(YAML::Tiny) +Requires: perl(CPAN::Perl::Releases) >= 0.40 +Requires: perl(Capture::Tiny) >= 0.13 +Requires: perl(Devel::PatchPerl) >= 0.62 +Requires: perl(File::Path::Tiny) >= 0.1 Requires: perl(local::lib) >= 1.008 -Requires: perl(Capture::Tiny) %{perl_requires} %description perlbrew is a program to automate the building and installation of perl in -the users HOME. At the moment, it installs everything to -'~/perl5/perlbrew', and requires you to tweak your PATH by including a -bashrc/cshrc file it provides. You then can benefit from not having to run -'sudo' commands to install cpan modules because those are installed inside -your HOME too. It's a completely separate perl environment. +an easy way. It installs everything to '~/perl5/perlbrew', and requires you +to tweak your PATH by including a bashrc/cshrc file it provides. You then +can benefit from not having to run 'sudo' commands to install cpan modules +because those are installed inside your HOME too. It provides multiple +isolated perl environments, and a mechanism for you to switch between them. + +For the documentation of perlbrew usage see the perlbrew manpage command on +CPAN, or by running 'perlbrew help'. The following documentation features +the API of 'App::perlbrew' module, and may not be remotely close to what +your want to read. %prep %setup -q -n %{cpan_name}-%{version} +find . -type f -print0 | xargs -0 chmod 644 %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} -%if 0%{?with_test} - %check -PERLBREW_ROOT="$PWD/test-perlbrew-root" \ %{__make} test -%endif %install %perl_make_install %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files %defattr(-,root,root,755) %doc Changes doc LICENSE README ++++++ App-perlbrew-0.39.tar.gz -> App-perlbrew-0.41.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/Changes new/App-perlbrew-0.41/Changes --- old/App-perlbrew-0.39/Changes 2011-12-31 17:00:05.000000000 +0100 +++ new/App-perlbrew-0.41/Changes 2012-02-02 04:58:45.000000000 +0100 @@ -1,3 +1,12 @@ +0.41: +- Fix installation issue when the specified version is not listed in CPAN::Perl::Releases +- Fix sub-shell invocation for 'switch' and 'use' command. This is particularly for csh users, but it should also work for bash users. + +0.40: +- Make the stanalone perlbrew program smaller by using Perl::Strip +- use CPAN::Perl::Releases to decide the location of perl tarball -- less HTTP hits +- Prefer $PERLBREW_ROOT/bin/patchperl if it is there. + 0.39: - Fix GH #179. lib naming are more consistent. - Fix GH #171. bash users are suggestted to upgrad to this version. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/MANIFEST new/App-perlbrew-0.41/MANIFEST --- old/App-perlbrew-0.39/MANIFEST 2011-12-31 16:54:45.000000000 +0100 +++ new/App-perlbrew-0.41/MANIFEST 2012-02-02 04:57:45.000000000 +0100 @@ -38,6 +38,7 @@ t/11.editdist.t t/11.root_from_arg.t t/12.sitecustomize.t +t/13.perl_release.t t/command-available.t t/command-compgen.t t/command-display-rc.t @@ -48,6 +49,7 @@ t/command-install-patchperl.t t/command-lib.t t/command-list.t +t/current_perl.t t/installation-perlbrew.t t/installation.t t/installation2.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/META.yml new/App-perlbrew-0.41/META.yml --- old/App-perlbrew-0.39/META.yml 2011-12-31 17:01:13.000000000 +0100 +++ new/App-perlbrew-0.41/META.yml 2012-02-02 04:59:54.000000000 +0100 @@ -27,12 +27,13 @@ - inc - t requires: + CPAN::Perl::Releases: 0.40 Capture::Tiny: 0.13 - Devel::PatchPerl: 0.46 + Devel::PatchPerl: 0.62 File::Path::Tiny: 0.1 local::lib: 1.008 perl: 5.8.0 resources: license: http://opensource.org/licenses/mit-license.php repository: git://github.com/gugod/App-perlbrew.git -version: 0.39 +version: 0.41 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/Makefile.PL new/App-perlbrew-0.41/Makefile.PL --- old/App-perlbrew-0.39/Makefile.PL 2011-12-29 03:10:13.000000000 +0100 +++ new/App-perlbrew-0.41/Makefile.PL 2012-01-29 07:24:34.000000000 +0100 @@ -7,10 +7,11 @@ repository 'git://github.com/gugod/App-perlbrew.git'; requires - 'File::Path::Tiny' => '0.1', - 'Devel::PatchPerl' => '0.46', - 'local::lib' => '1.008', - 'Capture::Tiny' => '0.13'; + 'File::Path::Tiny' => '0.1', + 'Devel::PatchPerl' => '0.62', + 'local::lib' => '1.008', + 'Capture::Tiny' => '0.13', + 'CPAN::Perl::Releases' => '0.40'; test_requires 'Test::Simple' => '0.98', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/lib/App/perlbrew.pm new/App-perlbrew-0.41/lib/App/perlbrew.pm --- old/App-perlbrew-0.39/lib/App/perlbrew.pm 2011-12-31 17:00:05.000000000 +0100 +++ new/App-perlbrew-0.41/lib/App/perlbrew.pm 2012-02-02 04:58:45.000000000 +0100 @@ -7,8 +7,9 @@ use File::Spec::Functions qw( catfile catdir ); use File::Path::Tiny; use FindBin; +use CPAN::Perl::Releases; -our $VERSION = "0.39"; +our $VERSION = "0.41"; our $CONFIG; our $PERLBREW_ROOT = $ENV{PERLBREW_ROOT} || catdir($ENV{HOME}, "perl5", "perlbrew"); @@ -31,8 +32,13 @@ } sub current_perl { - my ($self) = @_; - return $self->env('PERLBREW_PERL') || '' + my ($self, $v) = @_; + + if ($v) { + $self->{current_perl} = $v; + } + + return $self->{current_perl} || $self->env('PERLBREW_PERL') || '' } sub BASHRC_CONTENT() { @@ -291,10 +297,11 @@ 'notest|n!', 'quiet|q!', 'verbose|v', - 'root=s', 'as=s', 'help|h', 'version', + 'root=s', + # options passed directly to Configure 'D=s@', 'U=s@', @@ -602,6 +609,35 @@ return @available_versions; } +sub perl_release { + my ($self, $version) = @_; + + my $tarballs = CPAN::Perl::Releases::perl_tarballs($version); + + my $x = (values %$tarballs)[0]; + + if ($x) { + my $dist_tarball = (split("/", $x))[-1]; + my $dist_tarball_url = "http://search.cpan.org//CPAN/authors/id/$x"; + return ($dist_tarball, $dist_tarball_url); + } + + my $mirror = $self->config->{mirror}; + my $header = $mirror ? { 'Cookie' => "cpan=$mirror->{url}" } : undef; + my $html = http_get("http://search.cpan.org/dist/perl-${version}", $header); + + unless ($html) { + die "ERROR: Failed to download perl-${version} tarball."; + } + + my ($dist_path, $dist_tarball) = + $html =~ m[<a href="(/CPAN/authors/id/.+/(perl-${version}.tar.(gz|bz2)))">Download</a>]; + die "ERROR: Cannot find the tarball for perl-$version\n" + if !$dist_path and !$dist_tarball; + my $dist_tarball_url = "http://search.cpan.org/CPAN/authors/id/${dist_path}"; + return ($dist_tarball, $dist_tarball_url); +} + sub run_command_init { my $self = shift; my $HOME = $self->env('HOME'); @@ -822,38 +858,37 @@ my $dist = shift; my ($dist_name, $dist_version) = $dist =~ m/^(.*)-([\d.]+(?:-RC\d+)?)$/; - my $mirror = $self->config->{mirror}; - my $header = $mirror ? { 'Cookie' => "cpan=$mirror->{url}" } : undef; - my $html = http_get("http://search.cpan.org/dist/$dist", $header); - - unless ($html) { - die "ERROR: Failed to download $dist tarball."; - } - - my ($dist_path, $dist_tarball) = - $html =~ m[<a href="(/CPAN/authors/id/.+/(${dist}.tar.(gz|bz2)))">Download</a>]; - die "ERROR: Cannot find the tarball for $dist\n" - if !$dist_path and !$dist_tarball; + my ($dist_tarball, $dist_tarball_url) = $self->perl_release($dist_version); my $dist_tarball_path = catfile($self->root, "dists", $dist_tarball); - my $dist_tarball_url = "http://search.cpan.org${dist_path}"; if (-f $dist_tarball_path) { - print "Use the previously fetched ${dist_tarball}\n"; + print "Use the previously fetched ${dist_tarball}\n" + if $self->{verbose}; } else { - print "Fetching $dist as $dist_tarball_path\n"; + print "Fetching $dist as $dist_tarball_path\n" + unless $self->{quiet}; + + my $mirror = $self->config->{mirror}; + my $header = $mirror ? { 'Cookie' => "cpan=$mirror->{url}" } : undef; + http_get( $dist_tarball_url, $header, sub { my ($body) = @_; + + die "ERROR: Failed to download $dist tarball.\n" + unless $body; + open my $BALL, "> $dist_tarball_path"; print $BALL $body; close $BALL; } ); } + my $dist_extracted_path = $self->do_extract_tarball($dist_tarball_path); $self->do_install_this($dist_extracted_path,$dist_version, $dist); return; @@ -939,6 +974,12 @@ } my $perlpath = $self->root . "/perls/$as"; + my $patchperl = $self->root . "/bin/patchperl"; + + unless (-x $patchperl && -f _) { + $patchperl = "patchperl"; + } + unshift @d_options, qq(prefix=$perlpath); push @d_options, "usedevel" if $dist_version =~ /5\.1[13579]|git|blead/; print "Installing $dist_extracted_dir into " . $self->path_with_tilde("@{[ $self->root ]}/perls/$as") . "\n"; @@ -971,7 +1012,7 @@ ( "cd $dist_extracted_dir", "rm -f config.sh Policy.sh", - "patchperl", + $patchperl, "sh Configure $configure_flags " . join( ' ', ( map { qq{'-D$_'} } @d_options ), @@ -1183,28 +1224,46 @@ } } -sub run_command_use { - my $self = shift; - my $perl = shift; - if ( !$perl ) { - my $current = $self->current_perl; - if ($current) { - print "Currently using $current\n"; - } else { - print "No version in use; defaulting to system\n"; +sub launch_sub_shell { + my ($self, $name) = @_; + my $shell = $self->env('SHELL'); + + my $shell_opt = ""; + + if ($shell =~ /\/zsh$/) { + $shell_opt = "-d -f"; + + if ($^O eq 'darwin') { + my $root_dir = $self->root; + print <<"WARNINGONMAC" +-------------------------------------------------------------------------------- +WARNING: zsh perlbrew sub-shell is not working on Mac OSX Lion. + +It is known that on MacOS Lion, zsh always resets the value of PATH on launching +a sub-shell. Effectively nullify the changes required by perlbrew sub-shell. You +may `echo \$PATH` to examine it and if you see perlbrew related paths are in the +end, instead of in the beginning, you are unfortunate. + +You are advertised to include the following line to your ~/.zshenv as a better +way to work with perlbrew: + + source $root_dir/etc/bashrc + +-------------------------------------------------------------------------------- +WARNINGONMAC } - return; + } + elsif ($shell =~ /\/bash$/) { + $shell_opt = "--noprofile --norc"; } - my $shell = $self->env('SHELL'); - my $shell_opt = ""; - my %env = ($self->perlbrew_env($perl), PERLBREW_SKIP_INIT => 1); + my %env = ($self->perlbrew_env($name), PERLBREW_SKIP_INIT => 1); unless ($ENV{PERLBREW_VERSION}) { my $root = $self->root; # The user does not source bashrc/csh in their shell initialization. - $env{PATH } = $env{PERLBREW_PATH } . ":" . join ":", grep { !/$root/ } split ":", $ENV{PATH}; + $env{PATH} = $env{PERLBREW_PATH} . ":" . join ":", grep { !/$root/ } split ":", $ENV{PATH}; $env{MANPATH} = $env{PERLBREW_MANPATH} . ":" . join ":", grep { !/$root/ } split ":", $ENV{MANPATH}; } @@ -1214,11 +1273,28 @@ } $command .= " $shell $shell_opt"; - print "\nA sub-shell is launched with $perl as the activated perl. Run 'exit' to finish it.\n\n"; - + print "\nA sub-shell is launched with $name as the activated perl. Run 'exit' to finish it.\n\n"; exec($command); } +sub run_command_use { + my $self = shift; + my $perl = shift; + + if ( !$perl ) { + my $current = $self->current_perl; + if ($current) { + print "Currently using $current\n"; + } else { + print "No version in use; defaulting to system\n"; + } + return; + } + + $self->launch_sub_shell($perl); + +} + sub run_command_switch { my ( $self, $dist, $alias ) = @_; @@ -1232,36 +1308,26 @@ die "Cannot use for alias something that starts with 'perl-'\n" if $alias && $alias =~ /^perl-/; - my $vers = $dist; - die "${dist} is not installed\n" unless -d catdir($self->root, "perls", $dist); - local $ENV{PERLBREW_PERL} = $dist; - my $HOME = $self->env('HOME'); - my $pb_home = $self->env("PERLBREW_HOME") || $PERLBREW_HOME; + if ($self->env("PERLBREW_BASHRC_VERSION")) { + local $ENV{PERLBREW_PERL} = $dist; + my $HOME = $self->env('HOME'); + my $pb_home = $self->env("PERLBREW_HOME") || $PERLBREW_HOME; - mkpath($pb_home); - system("$0 env $dist > " . catfile($pb_home, "init")); + mkpath($pb_home); + system("$0 env $dist > " . catfile($pb_home, "init")); - print "Switched to $vers. To use it immediately, run this line in this terminal:\n\n exec @{[ $self->env('SHELL') ]}\n\n"; + print "Switched to $dist.\n\n"; + } + else { + $self->launch_sub_shell($dist); + } } sub run_command_off { my $self = shift; - - my $shell = $self->env('SHELL'); - - $ENV{PERLBREW_PERL} = ""; - my %env = ($self->perlbrew_env, PERLBREW_SKIP_INIT => 1); - - my $command = "env "; - while (my ($k, $v) = each(%env)) { - $command .= "$k=$v "; - } - $command .= " $shell"; - - print "\nA sub-shell is launched with perlbrew turned off. Run 'exit' to finish it.\n\n"; - exec($command); + $self->launch_sub_shell; } sub run_command_switch_off { @@ -1508,17 +1574,24 @@ sub run_command_exec { my $self = shift; - my @args = @{$self->{original_argv}}; + my %opts; - if ($args[0] eq '--root') { - shift @args; - shift @args; - } + local (@ARGV) = @{$self->{original_argv}}; - shift @args; + shift @ARGV; # "exec" + Getopt::Long::GetOptions( + \%opts, + 'with=s', + ); - for my $i ( $self->installed_perls ) { + my @exec_with = $self->installed_perls; + + if ($opts{with}) { + @exec_with = grep { $_->{name} eq $opts{with} } @exec_with; + } + + for my $i ( @exec_with ) { next if -l $self->root . '/perls/' . $i->{name}; # Skip Aliases my %env = $self->perlbrew_env($i->{name}); next if !$env{PERLBREW_PERL}; @@ -1528,7 +1601,7 @@ local $ENV{MANPATH} = join(':', $env{PERLBREW_MANPATH}, $ENV{MANPATH}||""); print "$i->{name}\n==========\n"; - system @args; + $self->do_system(@ARGV); print "\n\n"; # print "\n<===\n\n\n"; } @@ -1848,6 +1921,19 @@ =head1 METHODS +=over 4 + +=item (Str) current_perl + +Return the "current perl" object attribute string, or, if absent, the value of +PERLBREW_PERL environment variable. + +=item (Str) current_perl (Str) + +Set the "current_perl" object attribute to the given value. + +=back + =head1 PROJECT DEVELOPMENT perlbrew project uses github @@ -1862,7 +1948,7 @@ =head1 COPYRIGHT -Copyright (c) 2010, 2011 Kang-min Liu C<< <gugod(a)gugod.org> >>. +Copyright (c) 2010, 2011, 2012 Kang-min Liu C<< <gugod(a)gugod.org> >>. =head1 LICENCE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/t/05.get_current_perl.t new/App-perlbrew-0.41/t/05.get_current_perl.t --- old/App-perlbrew-0.39/t/05.get_current_perl.t 2011-12-23 07:21:57.000000000 +0100 +++ new/App-perlbrew-0.41/t/05.get_current_perl.t 2012-02-02 04:58:43.000000000 +0100 @@ -16,11 +16,12 @@ mock_perlbrew_install("perl-5.14.2"); subtest "perlbrew version" => sub { - my $app = App::perlbrew->new(); + my $version = $App::perlbrew::VERSION; stdout_is( sub { - $app->run_command('version'); + my $app = App::perlbrew->new("version"); + $app->run; }, "t/05.get_current_perl.t - App::perlbrew/$version\n" ); @@ -33,5 +34,16 @@ is $app->current_perl, $v; } }; + + +subtest "Current perl can be decided from object attribute, which overrides env var." => sub { + local $ENV{PERLBREW_PERL} = "perl-5.12.3"; + + for my $v (qw(perl-5.12.3 perl-5.12.3 perl-5.14.1 perl-5.14.2)) { + my $app = App::perlbrew->new; + $app->{current_perl} = $v; + is $app->current_perl, $v; + } +}; done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/t/08.error_install.t new/App-perlbrew-0.41/t/08.error_install.t --- old/App-perlbrew-0.39/t/08.error_install.t 2011-08-08 17:02:58.000000000 +0200 +++ new/App-perlbrew-0.41/t/08.error_install.t 2012-02-02 04:58:43.000000000 +0100 @@ -5,19 +5,27 @@ use Test::More; use Test::Exception; use Path::Class; - -BEGIN { - $ENV{PERLBREW_ROOT} = file(__FILE__)->dir->subdir("mock_perlbrew_root"); -} +use File::Temp qw(tempdir); use App::perlbrew; -App::perlbrew::rmpath( $ENV{PERLBREW_ROOT} ); +$App::perlbrew::PERLBREW_ROOT = tempdir( CLEANUP => 1 ); +$App::perlbrew::PERLBREW_HOME = tempdir( CLEANUP => 1 ); +$ENV{PERLBREW_ROOT} = $App::perlbrew::PERLBREW_ROOT; + App::perlbrew::mkpath( dir($ENV{PERLBREW_ROOT})->subdir("perls") ); App::perlbrew::mkpath( dir($ENV{PERLBREW_ROOT})->subdir("build") ); +App::perlbrew::mkpath( dir($ENV{PERLBREW_ROOT})->subdir("dists") ); no warnings 'redefine'; -sub App::perlbrew::http_get { "" } +sub App::perlbrew::http_get { + my ($url, $header, $cb) = @_; + if (ref($header) eq 'CODE') { + $cb = $header; + $header = undef; + } + $cb->(undef); +} throws_ok( sub { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/t/08.error_install_blead.t new/App-perlbrew-0.41/t/08.error_install_blead.t --- old/App-perlbrew-0.39/t/08.error_install_blead.t 2011-08-08 17:02:58.000000000 +0200 +++ new/App-perlbrew-0.41/t/08.error_install_blead.t 2012-02-02 04:58:43.000000000 +0100 @@ -1,15 +1,16 @@ #!/usr/bin/env perl use strict; use warnings; -use lib qw(lib); + +use FindBin; +use lib $FindBin::Bin; +use App::perlbrew; +require 'test_helpers.pl'; + use Test::More; use Test::Exception; use Path::Class; -BEGIN { - $ENV{PERLBREW_ROOT} = file(__FILE__)->dir->subdir("mock_perlbrew_root"); -} - use App::perlbrew; { no warnings 'redefine'; @@ -19,10 +20,6 @@ } } -App::perlbrew::rmpath( $ENV{PERLBREW_ROOT} ); -App::perlbrew::mkpath( dir($ENV{PERLBREW_ROOT})->subdir("perls") ); -App::perlbrew::mkpath( dir($ENV{PERLBREW_ROOT})->subdir("build") ); - throws_ok( sub { my $app = App::perlbrew->new("install", "perl-blead"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/t/08.error_install_cpanm.t new/App-perlbrew-0.41/t/08.error_install_cpanm.t --- old/App-perlbrew-0.39/t/08.error_install_cpanm.t 2011-11-03 20:03:19.000000000 +0100 +++ new/App-perlbrew-0.41/t/08.error_install_cpanm.t 2012-02-02 04:58:43.000000000 +0100 @@ -1,13 +1,12 @@ #!/usr/bin/env perl use strict; use warnings; -use Path::Class; -BEGIN { - $ENV{PERLBREW_ROOT} = file(__FILE__)->dir->subdir("mock_perlbrew_root"); -} -App::perlbrew::rmpath( $ENV{PERLBREW_ROOT} ); +use FindBin; +use lib $FindBin::Bin; use App::perlbrew; +require 'test_helpers.pl'; + use Test::More; use Test::Exception; @@ -23,5 +22,3 @@ ); done_testing; - -App::perlbrew::rmpath( $ENV{PERLBREW_ROOT} ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/t/09.exit_status.t new/App-perlbrew-0.41/t/09.exit_status.t --- old/App-perlbrew-0.39/t/09.exit_status.t 2011-10-13 17:29:25.000000000 +0200 +++ new/App-perlbrew-0.41/t/09.exit_status.t 2012-02-02 04:58:43.000000000 +0100 @@ -1,19 +1,18 @@ #!/usr/bin/env perl use strict; use warnings; -use lib qw(lib); + +use FindBin; +use lib $FindBin::Bin; +use App::perlbrew; +require 'test_helpers.pl'; + use Test::More; use Test::Exception; use Path::Class; -BEGIN { - $ENV{PERLBREW_ROOT} = file(__FILE__)->dir->subdir("mock_perlbrew_root"); -} - my $bin_perlbrew = file(__FILE__)->dir->parent->subdir("bin")->file("perlbrew"); -use App::perlbrew; - throws_ok( sub { my $app = App::perlbrew->new("unknown-command"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/t/12.sitecustomize.t new/App-perlbrew-0.41/t/12.sitecustomize.t --- old/App-perlbrew-0.39/t/12.sitecustomize.t 2011-12-28 09:42:41.000000000 +0100 +++ new/App-perlbrew-0.41/t/12.sitecustomize.t 2012-02-02 04:58:43.000000000 +0100 @@ -3,13 +3,14 @@ use Path::Class; use Capture::Tiny qw/capture/; use IO::All; -BEGIN { - $ENV{PERLBREW_ROOT} = file(__FILE__)->dir->subdir("mock_perlbrew_root"); -} +use App::perlbrew; +use File::Temp qw( tempdir ); -use Test::More; +$App::perlbrew::PERLBREW_ROOT = tempdir( CLEANUP => 1 ); +$App::perlbrew::PERLBREW_HOME = tempdir( CLEANUP => 1 ); +$ENV{PERLBREW_ROOT} = $App::perlbrew::PERLBREW_ROOT; -use App::perlbrew; +use Test::More; ## setup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/t/13.perl_release.t new/App-perlbrew-0.41/t/13.perl_release.t --- old/App-perlbrew-0.39/t/13.perl_release.t 1970-01-01 01:00:00.000000000 +0100 +++ new/App-perlbrew-0.41/t/13.perl_release.t 2012-02-02 04:58:43.000000000 +0100 @@ -0,0 +1,46 @@ +#!/usr/bin/env perl +use strict; +use warnings; +use FindBin; +use lib $FindBin::Bin; +use App::perlbrew; +require "test_helpers.pl"; + +use File::Temp qw(tempdir); +use Test::Spec; +use Test::Exception; + +describe "App::perlbrew#perl_release method" => sub { + describe "given a valid perl version" => sub { + it "returns the perl dist tarball file name, and its download url" => sub { + my $app = App::perlbrew->new; + + for my $version (qw(5.14.2 5.10.1 5.10.0 5.003_07 5.004_05)) { + my ($ball, $url) = $app->perl_release($version); + like $ball, qr/perl-?${version}.tar.(bz2|gz)/; + like $url, qr/${ball}$/; + } + }; + }; + + describe "when the given versionis not found is CPAN::Perl::Releases" => sub { + no warnings 'redefine'; + + my $version = "5.14.2"; + + my $orig_sub = \&CPAN::Perl::Releases::perl_tarballs; + *App::perlbrew::http_get = sub { + return qq{<a href="/CPAN/authors/id/SOMEONE/perl-${version}.tar.gz">Download</a>}; + }; + *CPAN::Perl::Releases::perl_tarballs = sub {}; + + my $app = App::perlbrew->new; + my ($ball, $url) = $app->perl_release($version); + like $ball, qr/perl-?${version}.tar.(bz2|gz)/, $ball; + like $url, qr#authors/id/.+/${ball}$#, $url; + + *CPAN::Perl::Releases::perl_tarballs = $orig_sub; + }; +}; + +runtests unless caller; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/t/command-exec.t new/App-perlbrew-0.41/t/command-exec.t --- old/App-perlbrew-0.39/t/command-exec.t 2011-12-23 07:21:57.000000000 +0100 +++ new/App-perlbrew-0.41/t/command-exec.t 2012-02-02 04:58:43.000000000 +0100 @@ -6,70 +6,61 @@ use App::perlbrew; require 'test_helpers.pl'; -use Test::More; -use Path::Class; -use File::Temp qw( tempdir ); - -my $root = dir($App::perlbrew::PERLBREW_ROOT); - -my @perls = qw( yak needs shave ); -my %exe = ( - # this enables "perlbrew exec perl -e '...'" - perl => { - # interpolate $^X to specify current perl and avoid infinite recursion - content => qq[#!/bin/sh\nPERLBREW_TEST_PERL="\$0" exec $^X "\$@";\n], - # printing $^X is not helpful because these exe's are shell scripts that call the same perl - args => [ qw( exec perl -e ), 'open FH, ">>", shift and print FH "=$ENV{PERLBREW_TEST_PERL}\n" and close FH' ], - output => join('', sort map { "=$root/perls/$_/bin/perl\n" } @perls), - }, - # also test an exe that isn't "perl" (like a script installed by a module) - brewed_app => { - content => qq[#!/bin/sh\necho \$0 >> \$1\n], - args => [ qw( exec brewed_app ) ], - output => join('', sort map { "$root/perls/$_/bin/brewed_app\n" } @perls), - }, - # test something outside the $perl/bin/ to ensure that the environment is setup correctly - # NOTE: this script may need to change if the usage of these perlbrew vars changes - test_env => { - content => '', # don't create a file for this one - args => [ qw( exec sh -c ), 'echo "$PERLBREW_PERL--$PERLBREW_PATH" >> $0' ], - output => join('', sort map { "$_--$root/bin:$root/perls/$_/bin\n" } @perls), - }, -); - -close STDOUT; -close STDERR; - -# build a fake root with some fake perls (most of this was modified from stuff found in t/installation.t) -foreach my $name ( @perls ) { - my $bin = $root->subdir("perls", $name, "bin"); - App::perlbrew::mkpath($bin) for @perls; - - while ( my ($script, $data) = each %exe ) { - next unless $data->{content}; - my $path = $bin->file($script); - io($path)->print( $data->{content} ); - chmod 0755, $path; - } -} - -# exec each script -while ( my ($script, $data) = each %exe ) { - # we need a file to which the subprocesses can append - my $file = $root->file("test-exec-output.$script"); - - my $app = App::perlbrew->new(@{ $data->{args} }, $file->stringify); - $app->run; - - # $file should have output in it - if ( -e $file ) { - # get output from all execs (ensure same order as above) - my $output = do { open(my $fh, '<', $file); join '', sort <$fh>; }; - is $output, $data->{output}, 'correct exec output'; - } - else { - ok 0, 'output file does not exist'; - } -} +use Test::Spec; -done_testing; +mock_perlbrew_install("perl-5.12.3"); +mock_perlbrew_install("perl-5.12.4"); +mock_perlbrew_install("perl-5.14.1"); +mock_perlbrew_install("perl-5.14.2"); + +describe 'perlbrew exec perl -E "say 42"' => sub { + it "invokes all perls" => sub { + my $app = App::perlbrew->new(qw(exec perl -E), "say 42"); + + my @perls = $app->installed_perls; + + $app->expects("do_system")->exactly(4)->returns( + sub { + my ($self, @args) = @_; + + is_deeply \@args, ["perl", "-E", "say 42"]; + + my ($perlbrew_bin_path, $perlbrew_perl_bin_path, @paths) = split(":", $ENV{PATH}); + + my $perl_installation = shift @perls; + + is $perlbrew_bin_path, file($App::perlbrew::PERLBREW_ROOT, "bin"); + is $perlbrew_perl_bin_path, file($App::perlbrew::PERLBREW_ROOT, "perls", $perl_installation->{name}, "bin"), "perls/". $perl_installation->{name} . "/bin"; + + return 0; + } + ); + + $app->run; + }; +}; + +describe 'perlbrew exec --with perl-5.12.3 perl -E "say 42"' => sub { + it "invokes perl-5.12.3/bin/perl" => sub { + my $app = App::perlbrew->new(qw(exec --with perl-5.12.3 perl -E), "say 42"); + + $app->expects("do_system")->returns( + sub { + my ($self, @args) = @_; + + is_deeply \@args, ["perl", "-E", "say 42"]; + + my ($perlbrew_bin_path, $perlbrew_perl_bin_path, @paths) = split(":", $ENV{PATH}); + + is $perlbrew_bin_path, file($App::perlbrew::PERLBREW_ROOT, "bin"); + is $perlbrew_perl_bin_path, file($App::perlbrew::PERLBREW_ROOT, "perls", "perl-5.12.3", "bin"); + + return 0; + } + ); + + $app->run; + }; +}; + +runtests unless caller; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/t/current_perl.t new/App-perlbrew-0.41/t/current_perl.t --- old/App-perlbrew-0.39/t/current_perl.t 1970-01-01 01:00:00.000000000 +0100 +++ new/App-perlbrew-0.41/t/current_perl.t 2012-02-02 04:58:43.000000000 +0100 @@ -0,0 +1,49 @@ +#!/usr/bin/env perl +use strict; +use warnings; +use FindBin; +use lib $FindBin::Bin; +use App::perlbrew; +require 'test_helpers.pl'; + +use Test::Spec; + +mock_perlbrew_install("perl-5.12.3"); +mock_perlbrew_install("perl-5.12.4"); +mock_perlbrew_install("perl-5.14.1"); +mock_perlbrew_install("perl-5.14.2"); + +describe "current perl" => sub { + it "is decided from env var PERLBREW_PERL" => sub { + for my $v (qw(perl-5.12.3 perl-5.12.3 perl-5.14.1 perl-5.14.2)) { + local $ENV{PERLBREW_PERL} = $v; + my $app = App::perlbrew->new; + is $app->current_perl, $v; + } + }; + + it "can be decided from object attribute, which overrides env var." => sub { + local $ENV{PERLBREW_PERL} = "perl-5.12.3"; + + for my $v (qw(perl-5.12.3 perl-5.12.3 perl-5.14.1 perl-5.14.2)) { + my $app = App::perlbrew->new; + $app->{current_perl} = $v; + is $app->current_perl, $v; + } + }; + + it "can be set with current_perl method." => sub { + local $ENV{PERLBREW_PERL} = "perl-5.12.3"; + + for my $v (qw(perl-5.12.3 perl-5.12.3 perl-5.14.1 perl-5.14.2)) { + my $app = App::perlbrew->new; + is $app->current_perl, "perl-5.12.3"; + + $app->current_perl($v); + is $app->current_perl, $v; + } + }; +}; + +runtests unless caller; + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/t/installation-perlbrew.t new/App-perlbrew-0.41/t/installation-perlbrew.t --- old/App-perlbrew-0.39/t/installation-perlbrew.t 2011-12-23 07:21:57.000000000 +0100 +++ new/App-perlbrew-0.41/t/installation-perlbrew.t 2012-02-02 04:58:43.000000000 +0100 @@ -10,7 +10,7 @@ use Path::Class; use Test::More; -diag "PERLBREW_ROOT set to $ENV{PERLBREW_ROOT}"; +note "PERLBREW_ROOT set to $ENV{PERLBREW_ROOT}"; subtest "`perlbrew self-install` initialize the required dir structure under PERLBREW_ROOT", sub { my $app = App::perlbrew->new('--quiet', 'self-install'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/t/installation.t new/App-perlbrew-0.41/t/installation.t --- old/App-perlbrew-0.39/t/installation.t 2011-08-08 17:02:58.000000000 +0200 +++ new/App-perlbrew-0.41/t/installation.t 2012-02-02 04:58:43.000000000 +0100 @@ -1,40 +1,14 @@ #!/usr/bin/env perl use strict; use warnings; -use Path::Class; -use IO::All; -BEGIN { - $ENV{PERLBREW_ROOT} = file(__FILE__)->dir->subdir("mock_perlbrew_root"); -} -use Test::More; -use Test::Exception; +use FindBin; +use lib $FindBin::Bin; use App::perlbrew; +require 'test_helpers.pl'; -## setup - -App::perlbrew::rmpath( $ENV{PERLBREW_ROOT} ); - -## mock - -no warnings 'redefine'; - -sub App::perlbrew::do_install_release { - my ($self, $name) = @_; - - $name = $self->{as} if $self->{as}; - - my $root = dir($ENV{PERLBREW_ROOT}); - my $installation_dir = $root->subdir("perls", $name); - App::perlbrew::mkpath($installation_dir); - App::perlbrew::mkpath($root->subdir("perls", $name, "bin")); - - my $perl = $root->subdir("perls", $name, "bin")->file("perl"); - io($perl)->print("#!/bin/sh\nperl \"\$@\";\n"); - chmod 0755, $perl; -} - -use warnings; +use Test::More; +use Test::Exception; ## main @@ -65,8 +39,6 @@ ok $app->can("is_installed"); ok $app->is_installed("perl-5.14.0"); ok !$app->is_installed("perl-5.13.0"); - - done_testing; }; subtest "do not clobber exitsing user-specified name." => sub { @@ -82,8 +54,6 @@ my $app = App::perlbrew->new("install", "perl-5.14.0", "--as", "the-dude"); $app->run; } "should die when doing install with existing user-specified name."; - - done_testing; }; done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/t/installation2.t new/App-perlbrew-0.41/t/installation2.t --- old/App-perlbrew-0.39/t/installation2.t 2011-08-08 17:02:58.000000000 +0200 +++ new/App-perlbrew-0.41/t/installation2.t 2012-02-02 04:58:43.000000000 +0100 @@ -2,29 +2,20 @@ use strict; use warnings; -use Path::Class; -BEGIN { - $ENV{PERLBREW_ROOT} = file(__FILE__)->dir->subdir("mock_perlbrew_root"); -} +use FindBin; +use lib $FindBin::Bin; +use App::perlbrew; +require 'test_helpers.pl'; use Test::Spec; -use App::perlbrew; - ## setup - - ## note "PERLBREW_ROOT set to $ENV{PERLBREW_ROOT}"; describe "App::perlbrew" => sub { - before each => sub { - App::perlbrew::rmpath( $ENV{PERLBREW_ROOT} ); - App::perlbrew::mkpath( $ENV{PERLBREW_ROOT} ); - }; - describe "->do_install_url method" => sub { it "should accept an URL to perl tarball, and download the tarball." => sub { my $app = App::perlbrew->new; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/App-perlbrew-0.39/t/test_helpers.pl new/App-perlbrew-0.41/t/test_helpers.pl --- old/App-perlbrew-0.39/t/test_helpers.pl 2011-12-23 07:21:57.000000000 +0100 +++ new/App-perlbrew-0.41/t/test_helpers.pl 2012-02-02 04:58:43.000000000 +0100 @@ -23,6 +23,10 @@ $App::perlbrew::PERLBREW_HOME = tempdir( CLEANUP => 1 ); $ENV{PERLBREW_ROOT} = $App::perlbrew::PERLBREW_ROOT; +App::perlbrew::mkpath( dir($ENV{PERLBREW_ROOT})->subdir("perls") ); +App::perlbrew::mkpath( dir($ENV{PERLBREW_ROOT})->subdir("build") ); +App::perlbrew::mkpath( dir($ENV{PERLBREW_ROOT})->subdir("dists") ); + no warnings 'redefine'; sub App::perlbrew::do_install_release { @@ -47,7 +51,7 @@ chmod 0755, $perl; - diag "(mock) installed $name to $installation_dir"; + note "(mock) installed $name to $installation_dir"; } sub mock_perlbrew_install { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pam_passwdqc for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package pam_passwdqc for openSUSE:Factory checked in at 2012-03-07 13:43:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pam_passwdqc (Old) and /work/SRC/openSUSE:Factory/.pam_passwdqc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pam_passwdqc", Maintainer is "mc(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pam_passwdqc/pam_passwdqc.changes 2011-09-23 12:21:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pam_passwdqc.new/pam_passwdqc.changes 2012-03-07 13:43:54.000000000 +0100 @@ -1,0 +2,26 @@ +Tue Feb 21 13:54:49 CET 2012 - mc(a)suse.de + +- update to version 1.2.2 +- When matching against the reversed new password, always pass the + original non-reversed new password (possibly with a substring + removed) into is_simple(), but remove or check the correct + substring in is_based() considering that the matching is possibly + being done against the reversed password. +- New command-line options for pwqcheck: -1 and -2 for reading just + 1 and just 2 lines from stdin, respectively (instead of reading 3 + lines, which is the default), --multi for checking multiple + passphrases at once (until EOF). +- With randomly-generated passphrases, encode more entropy per + separator character (by increasing the number of different + separators from 8 to 16) and per word (by altering the case of + the first letter of each word), which increases the default + generated passphrase size from 42 to 47 bits. +- Substring matching has been enhanced to partially discount rather + than fully remove weak substrings, support leetspeak, and detect + some common sequences of characters (sequential digits, letters in + alphabetical order, adjacent keys on a QWERTY keyboard). +- Detect and allow passphrases with non-ASCII characters in the words. +- A number of optimizations have been made resulting in significant + speedup of passwdqc_check() on real-world passwords. + +------------------------------------------------------------------- Old: ---- passwdqc-1.1.4.tar.bz2 New: ---- passwdqc-1.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam_passwdqc.spec ++++++ --- /var/tmp/diff_new_pack.agB4IJ/_old 2012-03-07 13:43:55.000000000 +0100 +++ /var/tmp/diff_new_pack.agB4IJ/_new 2012-03-07 13:43:55.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package pam_passwdqc (Version 1.1.4) +# spec file for package pam_passwdqc # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,22 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: pam_passwdqc Url: http://www.openwall.com/passwdqc/ BuildRequires: pam-devel -License: BSD3c(or similar) ; Other uncritical OpenSource License ; Public Domain, Freeware -Group: System/Libraries Requires: pam Recommends: passwdqc Provides: pam-modules:/%_lib/security/pam_passwdqc.so -AutoReqProv: on -Version: 1.1.4 -Release: 2 +Version: 1.2.2 +Release: 0 Summary: Simple Password Strength Checking Module -Source0: passwdqc-1.1.4.tar.bz2 +License: BSD-3-Clause +Group: System/Libraries +Source0: passwdqc-%{version}.tar.gz Source1: baselibs.conf Source50: dlopen.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,7 +43,6 @@ ones. %package -n libpasswdqc0 -License: BSD3c(or similar) ; Other uncritical OpenSource License ; Public Domain, Freeware Summary: A Simple Password Strength Checking Library Group: System/Libraries @@ -56,7 +52,6 @@ and can provide randomly generated ones. %package -n passwdqc-devel -License: BSD3c(or similar) ; Other uncritical OpenSource License ; Public Domain, Freeware Summary: Useful collection of routines for C and C++ programming Group: Development/Libraries/C and C++ Requires: libpasswdqc0 = %{version} @@ -68,7 +63,6 @@ %package -n passwdqc -License: BSD3c(or similar) ; Other uncritical OpenSource License ; Public Domain, Freeware Summary: Tools for Password Checking and Generation Group: Productivity/Networking/Diagnostic @@ -78,7 +72,7 @@ %prep -%setup -n passwdqc-1.1.4 +%setup -n passwdqc-%{version} %build EXTRA_CFLAGS="-fno-strict-aliasing" @@ -86,7 +80,10 @@ %ifnarch ia64 EXTRA_CFLAGS="$EXTRA_CFLAGS -Wa,--noexecstack" %endif - make CFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS -fPIC -DHAVE_SHADOW -DLINUX_PAM" SHARED_LIBDIR="/%{_lib}" DEVEL_LIBDIR="/usr/%{_lib}" SECUREDIR="/%{_lib}/security" +make CFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS -fPIC -DHAVE_SHADOW -DLINUX_PAM" \ + SHARED_LIBDIR="/%{_lib}" \ + DEVEL_LIBDIR="/usr/%{_lib}" \ + SECUREDIR="/%{_lib}/security" %install make DESTDIR=$RPM_BUILD_ROOT SHARED_LIBDIR="/%{_lib}" DEVEL_LIBDIR="/%{_libdir}" SECUREDIR="/%{_lib}/security" install -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit opera for openSUSE:Factory:NonFree
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package opera for openSUSE:Factory:NonFree checked in at 2012-03-07 13:43:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/opera (Old) and /work/SRC/openSUSE:Factory:NonFree/.opera.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opera", Maintainer is "PRusnak(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/opera/opera.changes 2012-02-07 14:46:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory:NonFree/.opera.new/opera.changes 2012-03-07 13:43:47.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 5 14:24:04 UTC 2012 - vdziewiecki(a)suse.com + +- add Provides: browser(npapi) FATE#313084 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opera.spec ++++++ --- /var/tmp/diff_new_pack.9PXGpM/_old 2012-03-07 13:43:53.000000000 +0100 +++ /var/tmp/diff_new_pack.9PXGpM/_new 2012-03-07 13:43:53.000000000 +0100 @@ -23,10 +23,10 @@ Name: opera Version: 11.61 Release: 0 -License: SUSE-NonFree Summary: Opera Web Browser (%{version} build %{buildnum}) -Url: http://www.opera.com/ +License: SUSE-NonFree Group: Productivity/Networking/Web/Browsers +Url: http://www.opera.com/ Source0: %{name}-%{version}-%{buildnum}.%{tag32b}.tar.xz Source1: %{name}-%{version}-%{buildnum}.%{tag64b}.tar.xz NoSource: 0 @@ -38,6 +38,7 @@ Recommends: %{name}-kde4 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 +Provides: browser(npapi) %description Opera is user-friendly, secure, and exceptionally fast. The browser is @@ -46,7 +47,6 @@ according to the official recommendations. %package gtk -License: SUSE-NonFree Summary: Opera GTK engine Group: Productivity/Networking/Web/Browsers Requires: opera = %{version} @@ -55,7 +55,6 @@ Opera engine for GTK integration. %package kde4 -License: SUSE-NonFree Summary: Opera KDE4 engine Group: Productivity/Networking/Web/Browsers Requires: opera = %{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mysql-community-server for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package mysql-community-server for openSUSE:Factory checked in at 2012-03-07 13:43:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-community-server (Old) and /work/SRC/openSUSE:Factory/.mysql-community-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mysql-community-server", Maintainer is "" Changes: -------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-community-server.spec ++++++ --- /var/tmp/diff_new_pack.HPnMvn/_old 2012-03-07 13:43:30.000000000 +0100 +++ /var/tmp/diff_new_pack.HPnMvn/_new 2012-03-07 13:43:30.000000000 +0100 @@ -181,7 +181,7 @@ %package bench Requires: %{name}-client perl-DBD-mysql -License: LSUSE-GPL-2.0-with-FLOSS-exception +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: Benchmarks for MySQL Community Server Group: Productivity/Databases/Tools Provides: mysql-bench = %{srv_vers} ++++++ configuration-tweaks.tar.bz2 ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lxc for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package lxc for openSUSE:Factory checked in at 2012-03-07 13:43:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxc (Old) and /work/SRC/openSUSE:Factory/.lxc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lxc", Maintainer is "JSlaby(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/lxc/lxc.changes 2012-01-11 15:38:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lxc.new/lxc.changes 2012-03-07 13:43:21.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 6 21:11:54 CET 2012 - jslaby(a)suse.de + +- Accurately detect whether a system supports clone_children + (bnc#750470) + +------------------------------------------------------------------- New: ---- Accurately-detect-whether-a-system-supports-clone_children.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.6lWAo4/_old 2012-03-07 13:43:22.000000000 +0100 +++ /var/tmp/diff_new_pack.6lWAo4/_new 2012-03-07 13:43:22.000000000 +0100 @@ -15,24 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: lxc Version: 0.7.5 -Release: 2 +Release: 0 Url: http://lxc.sourceforge.net/ Summary: Linux containers implementation -Group: System/Management -AutoReqProv: on License: LGPL-2.1+ +Group: System/Management Source: http://lxc.sourceforge.net/download/lxc/%{name}-%{version}.tar.gz Source1: README.SUSE # PATCH-FIX-UPSTREAM update openSUSE template to use 12.1 Patch0: lxc-opensuse-12.1.patch # PATCH-FIX-UPSTREAM lxc-checkconfig-kernel-3.patch bnc#720845 fcrozat(a)suse.com -- correctly detect kernel 3.x Patch1: lxc-checkconfig-kernel-3.patch +Patch2: Accurately-detect-whether-a-system-supports-clone_children.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: docbook-utils libcap-devel pkg-config +BuildRequires: docbook-utils +BuildRequires: libcap-devel +BuildRequires: pkg-config %if 0%{?suse_version} >= 1130 BuildRequires: linux-glibc-devel %else @@ -53,10 +53,10 @@ applications like bash or sshd. %package devel -License: LGPL-2.1 Summary: Development library for lxc -Requires: %name = %version glibc-devel +License: LGPL-2.1 Group: Development/Libraries/C and C++ +Requires: %name = %version glibc-devel %description devel Lxc header files and library needed for development of containers. @@ -65,6 +65,7 @@ %setup %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure --disable-examples ++++++ Accurately-detect-whether-a-system-supports-clone_children.patch ++++++ >From 3e2981d4599962ec069c249460d86ce8ebec7644 Mon Sep 17 00:00:00 2001 From: Serge E. Hallyn <serge.hallyn(a)canonical.com> Date: Mon, 24 Oct 2011 14:38:30 +0200 Subject: Accurately detect whether a system supports clone_children Patch-upstream: yes If multiple cgroups are mounted under /sys/fs/cgroup, then the original check ends up looking for /sys/fs/cgroup/cgroup.clone_children, which does not exist because that is just a tmpfs. So make sure to check an actual cgroupfs. Signed-off-by: Serge Hallyn <serge.hallyn(a)canonical.com> Signed-off-by: Daniel Lezcano <dlezcano(a)fr.ibm.com> --- src/lxc/lxc-checkconfig.in | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc-checkconfig.in b/src/lxc/lxc-checkconfig.in index 5dcf3a4..30f6186 100755 --- a/src/lxc/lxc-checkconfig.in +++ b/src/lxc/lxc-checkconfig.in @@ -63,7 +63,12 @@ echo -n "Multiple /dev/pts instances: " && is_enabled DEVPTS_MULTIPLE_INSTANCES echo echo "--- Control groups ---" -CGROUP_MNT_PATH=$(grep -m1 "^cgroup" /proc/self/mounts | awk '{ print $2 }') +print_cgroups() { + # print all mountpoints for cgroup filesystems + awk '$1 !~ /#/ && $3 == mp { print $2; } ; END { exit(0); } ' "mp=$1" "$2" ; +} + +CGROUP_MNT_PATH=`print_cgroups cgroup /proc/self/mounts | head -1` echo -n "Cgroup: " && is_enabled CONFIG_CGROUPS yes -- 1.7.4.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libsamplerate for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package libsamplerate for openSUSE:Factory checked in at 2012-03-07 13:43:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsamplerate (Old) and /work/SRC/openSUSE:Factory/.libsamplerate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsamplerate", Maintainer is "tiwai(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libsamplerate/libsamplerate.changes 2011-11-23 19:36:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libsamplerate.new/libsamplerate.changes 2012-03-07 13:43:12.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Mar 6 11:17:23 UTC 2012 - saschpe(a)suse.de + +- Adhere to shared library packaging policy + +------------------------------------------------------------------- +Sun Mar 4 23:14:45 UTC 2012 - reddwarf(a)opensuse.org + +- update to version 0.1.8 + * Minor bug fixes and updates. +- drop all patches, not needed in new upstream version +- run spec-cleaner + +------------------------------------------------------------------- Old: ---- libsamplerate-0.1.7.tar.bz2 libsamplerate-ac.diff libsamplerate_0.1.7-3.diff.gz New: ---- libsamplerate-0.1.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsamplerate.spec ++++++ --- /var/tmp/diff_new_pack.8AKgvi/_old 2012-03-07 13:43:17.000000000 +0100 +++ /var/tmp/diff_new_pack.8AKgvi/_new 2012-03-07 13:43:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libsamplerate # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,21 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: libsamplerate -BuildRequires: fftw3-devel libsndfile-devel libtool pkgconfig +Version: 0.1.8 +Release: 0 Summary: A Sample Rate Converter Library -Version: 0.1.7 -Release: 11 License: GPL-2.0+ Group: System/Libraries -Source: %{name}-%{version}.tar.bz2 -Source2: baselibs.conf -Patch0: %{name}-ac.diff -Patch1: libsamplerate_0.1.7-3.diff.gz Url: http://www.mega-nerd.com/SRC/ +Source0: http://www.mega-nerd.com/SRC/libsamplerate-%{version}.tar.gz +Source1: baselibs.conf +BuildRequires: fftw3-devel +BuildRequires: libsndfile-devel +BuildRequires: libtool +BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,55 +42,44 @@ conversion ratio can also vary with time for speeding up and slowing down effects. +%package -n libsamplerate0 +Summary: A Sample Rate Converter Library +Group: System/Libraries +%description -n libsamplerate0 +Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for +audio. One example of where such a thing would be useful is in +converting audio from the CD sample rate of 44.1kHz to the 48kHz sample +rate used by DAT players. -Authors: --------- - Erik de Castro Lopo <erikd(a)mega-nerd.com> +SRC is capable of arbitrary and time varying conversions; from +downsampling by a factor of 12 to upsampling by the same factor. The +conversion ratio can also vary with time for speeding up and slowing +down effects. %package devel -License: GPL-2.0+ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ -Requires: libsamplerate = %{version} glibc-devel +Requires: glibc-devel +Requires: libsamplerate0 = %{version} %description devel This package contains all necessary include files and libraries needed to develop applications that require these. - - -Authors: --------- - Erik de Castro Lopo <erikd(a)mega-nerd.com> - %package progs -License: GPL-2.0+ Summary: Example Programs for libsamplerate Group: Productivity/Multimedia/Sound/Utilities %description progs This package includes the example programs for libsamplerate. - - -Authors: --------- - Erik de Castro Lopo <erikd(a)mega-nerd.com> - %prep %setup -q -%patch0 -%patch1 -p1 -for i in debian/patches/*diff ; do - patch -p1 <$i -done -find . -name "*.orig"|xargs rm %build -autoreconf --force --install -%configure --with-pic --disable-static -make %{?jobs:-j %jobs} +%configure --disable-silent-rules --disable-static +make %{?_smp_mflags} %check pushd tests @@ -99,32 +87,30 @@ popd %install -make DESTDIR="$RPM_BUILD_ROOT" install +# Since configure doesn't honor --docdir set htmldocdir here +make install DESTDIR=%{?buildroot} \ + htmldocdir=%{_defaultdocdir}/libsamplerate-devel # remove unneeded files -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -# remove document Makefiles -rm -f doc/Makefile* - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +rm -f %{buildroot}%{_libdir}/*.la -%clean -rm -rf $RPM_BUILD_ROOT +%post -n libsamplerate0 -p /sbin/ldconfig +%postun -n libsamplerate0 -p /sbin/ldconfig -%files +%files -n libsamplerate0 %defattr(-,root,root) -%{_libdir}/lib*.so.* +%doc AUTHORS COPYING +%{_libdir}/libsamplerate.so.0* %files devel %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog INSTALL doc -%{_libdir}/lib*.so -%{_includedir}/* -%{_libdir}/pkgconfig/*.pc +%doc ChangeLog +%{_defaultdocdir}/libsamplerate-devel +%{_libdir}/libsamplerate.so +%{_includedir}/samplerate.h +%{_libdir}/pkgconfig/samplerate.pc %files progs %defattr(-,root,root) -%{_bindir}/* +%{_bindir}/sndfile-resample %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.8AKgvi/_old 2012-03-07 13:43:17.000000000 +0100 +++ /var/tmp/diff_new_pack.8AKgvi/_new 2012-03-07 13:43:17.000000000 +0100 @@ -1 +1 @@ -libsamplerate +libsamplerate0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libktorrent for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package libktorrent for openSUSE:Factory checked in at 2012-03-07 13:43:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libktorrent (Old) and /work/SRC/openSUSE:Factory/.libktorrent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libktorrent", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libktorrent/libktorrent.changes 2011-11-25 23:04:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libktorrent.new/libktorrent.changes 2012-03-07 13:43:04.000000000 +0100 @@ -1,0 +2,32 @@ +Tue Mar 6 10:12:46 UTC 2012 - mlin(a)suse.com + +- Update to version 1.2.0, also lists changes what changed in rc1 + * Fix large file preallocation when not using quick preallocation in some cases + * Disable current open file checking, it causes performance issues in some situations + * Don't use the gcrypt version macro in it's version check + * Make it possible to check data on chunk ranges instead of the entire torrent + * Move data file jobs are now done one after the other + * Implement partial seeding extension + * Add support for IPv6 traffic class field + * Make sure a torrent is restarted when it was auto stopped and more files are selected for downloading + * Emit finished signal when torrent is found completely downloaded in data check + * Seeders and leechers shown in view is now the maximum of all trackers and not the sum + * Do not add trackers with unsupported protocols + * Improve SIGBUS handling, fixes a crash + * Remove usage of several deprecated KDE3 networking classes + * Remove obsolete functions of data check during upload + * Simplify blocklist interface + * Revamp networking code + * Remove thread from DHT code + * Prevent file descriptor exhaustion from happening + * Do not count non piece data in upload speed calculation + * Fix IPv6 address parsing bug + * Improve performance of µTP code + * Fix crash in DHT packet receive code + * Fill ip parameter of tracker announce with current IPv6 address if not filled in by user in settings + * Fix crash in PeerManager + * Fix crash at exit when datachecker job is running + * Fix crash due to bug in smaller then operator of net::Address + * Fix crash due to race condition in logging initialization + +------------------------------------------------------------------- Old: ---- libktorrent-1.1.3.tar.bz2 New: ---- libktorrent-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libktorrent.spec ++++++ --- /var/tmp/diff_new_pack.zcaoXB/_old 2012-03-07 13:43:05.000000000 +0100 +++ /var/tmp/diff_new_pack.zcaoXB/_new 2012-03-07 13:43:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libktorrent # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,15 +16,14 @@ # - Name: libktorrent -Version: 1.1.3 -Release: 1 -License: GPL-2.0+ +Version: 1.2.0 +Release: 0 Summary: Torrent Downloading Library -Url: http://ktorrent.org/ +License: GPL-2.0+ Group: Productivity/Networking/File-Sharing -Source0: http://ktorrent.org/downloads/4.1.3/%{name}-%{version}.tar.bz2 +Url: http://ktorrent.org/ +Source0: http://ktorrent.org/downloads/4.2.0/%{name}-%{version}.tar.bz2 BuildRequires: boost-devel BuildRequires: doxygen BuildRequires: gmp-devel @@ -37,24 +36,22 @@ libktorrent is a torrent downloading library. %package devel -License: GPL-2.0+ Summary: Development files for libktorrent Group: Development/Libraries/C and C++ -Requires: libktorrent3 = %{version} +Requires: libktorrent4 = %{version} %description devel This package includes the necessary files for development using libktorrent. -%package -n libktorrent3 -License: GPL-2.0+ +%package -n libktorrent4 Summary: Torrent Downloading Library Group: Productivity/Networking/File-Sharing -Recommends: libktorrent3-lang = %{version} +Recommends: libktorrent4-lang = %{version} -%description -n libktorrent3 +%description -n libktorrent4 libktorrent is a torrent downloading library. -%lang_package -n libktorrent3 +%lang_package -n libktorrent4 %prep %setup -q @@ -80,9 +77,9 @@ %clean rm -rf %{buildroot} -%post -n libktorrent3 -p /sbin/ldconfig +%post -n libktorrent4 -p /sbin/ldconfig -%postun -n libktorrent3 -p /sbin/ldconfig +%postun -n libktorrent4 -p /sbin/ldconfig %files devel %defattr(-,root,root,-) @@ -90,12 +87,12 @@ %{_kde4_libdir}/libktorrent.so %{_kde4_appsdir}/cmake/modules/FindKTorrent.cmake -%files -n libktorrent3 +%files -n libktorrent4 %defattr(-,root,root,-) %doc COPYING ChangeLog RoadMap -%{_kde4_libdir}/libktorrent.so.3* +%{_kde4_libdir}/libktorrent.so.4* -%files -n libktorrent3-lang -f %{name}.lang +%files -n libktorrent4-lang -f %{name}.lang %defattr(-,root,root,-) %changelog ++++++ libktorrent-1.1.3.tar.bz2 -> libktorrent-1.2.0.tar.bz2 ++++++ ++++ 85424 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-1_6_0-openjdk for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package java-1_6_0-openjdk for openSUSE:Factory checked in at 2012-03-07 13:42:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_6_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_6_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_6_0-openjdk", Maintainer is "bnc-team-java(a)forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2012-02-28 14:13:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.java-1_6_0-openjdk.new/java-1_6_0-openjdk.changes 2012-03-07 13:42:57.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 27 01:25:27 CET 2012 - dmueller(a)suse.de + +- fix build on ARM + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.uzc37t/_old 2012-03-07 13:43:00.000000000 +0100 +++ /var/tmp/diff_new_pack.uzc37t/_new 2012-03-07 13:43:00.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define gcjbootstrap 0 %define jit_arches %{ix86} x86_64 @@ -217,14 +218,12 @@ BuildRequires: automake BuildRequires: alsa-lib-devel -%ifnarch %{arm} BuildRequires: quilt BuildRequires: vim -%endif BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: giflib-devel -BuildRequires: xorg-x11 +BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-proto-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit icedtea-web for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package icedtea-web for openSUSE:Factory checked in at 2012-03-07 13:42:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icedtea-web (Old) and /work/SRC/openSUSE:Factory/.icedtea-web.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icedtea-web", Maintainer is "bnc-team-java(a)forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/icedtea-web/icedtea-web.changes 2012-03-06 13:38:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.icedtea-web.new/icedtea-web.changes 2012-03-07 13:42:49.000000000 +0100 @@ -1,0 +2,29 @@ +Tue Mar 6 12:55:36 UTC 2012 - mvyskocil(a)suse.cz + +- update to 1.2 +- New features: + * Signed JNLP support + * Support for client authentication certificates + * Cache size enforcement now supported via itweb-settings + * Applet parameter passing through JNLP files now supported + * Better icons for access warning dialog + * Security Dialog UI revamped to make it look less threatening when appropriate +- Fixes (plugin, webstart, common) + * PR618: Can't install OpenDJ, JavaWebStart fails with Input stream is null error + * PR765: JNLP file with all resource jars marked as 'lazy' fails to validate signature and stops the launch of application + * PR788: Elluminate Live! is not working + * PR804: javaws launcher incorrectly handles file names with spaces + * PR820, bnc#746895: IcedTea-Web 1.1.3 crashing Firefox when loading Citrix XenApp + * PR838: IcedTea plugin crashes with chrome browser when javascript is executed + * PR852: Classloader not being flushed after last applet from a site is closed + * RH586194: Unable to connect to connect with Juniper VPN client + * PR771: IcedTea-Web certificate verification code does not use the right API + * PR742: IcedTea-Web checks certs only upto 1 level deep before declaring them untrusted. + * PR789: typo in jrunscript.sh + * PR808: javaws is unable to start, when missing jars are enumerated before main jar + * RH738814: Access denied at ssl handshake + * Support for authenticating using client certificates +- fix bnc#737105/FATE#313084: add Supplements: packageand(broswer(npapi):java-openjdk) + ensures the web plugin is pulled in when openjdk and capable browser is installed + +------------------------------------------------------------------- Old: ---- icedtea-web-1.1.4.tar.gz icedtea-web-npapi-sdk-r5.patch New: ---- icedtea-web-1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icedtea-web.spec ++++++ --- /var/tmp/diff_new_pack.lNqvuG/_old 2012-03-07 13:42:57.000000000 +0100 +++ /var/tmp/diff_new_pack.lNqvuG/_new 2012-03-07 13:42:57.000000000 +0100 @@ -53,7 +53,7 @@ %define pluginname IcedTeaPlugin.so Name: icedtea-web -Version: 1.1.4 +Version: 1.2 Release: 0 Summary: Java Web Start and plugin implementation License: GPL-2.0-with-classpath-exception @@ -65,7 +65,6 @@ # https://bugzilla.mozilla.org/show_bug.cgi?id=582130 # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=622 Patch1: icedtea-web-1.1-moonlight-symbol-clash.patch -Patch2: icedtea-web-npapi-sdk-r5.patch Patch1000: icedtea-web-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: java-1_6_0-openjdk-devel @@ -104,6 +103,9 @@ Provides: java-1.6.0-openjdk-plugin = %{openjdk_ver} Provides: java-plugin = %{javaver} +# bnc#737105/FATE#313084 +Supplements: packageand(browser(npapi):java-openjdk) + %description The IcedTea-Web project provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java @@ -123,9 +125,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -%if %{with_npapisdk} -%patch2 -p1 -%endif %patch1000 -p1 ++++++ icedtea-web-1.1.4.tar.gz -> icedtea-web-1.2.tar.gz ++++++ ++++ 13746 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit icecast for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package icecast for openSUSE:Factory checked in at 2012-03-07 13:42:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icecast (Old) and /work/SRC/openSUSE:Factory/.icecast.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icecast", Maintainer is "tiwai(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/icecast/icecast.changes 2011-10-18 14:15:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.icecast.new/icecast.changes 2012-03-07 13:42:44.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 5 18:15:03 CET 2012 - tiwai(a)suse.de + +- Fix VUL-1: icecast log injection (CVE-2011-4612, bnc#737255) + +------------------------------------------------------------------- New: ---- icecast-2.3.2-CVE-2011-4612.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icecast.spec ++++++ --- /var/tmp/diff_new_pack.P2FCI6/_old 2012-03-07 13:42:45.000000000 +0100 +++ /var/tmp/diff_new_pack.P2FCI6/_new 2012-03-07 13:42:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package icecast # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,27 +16,27 @@ # - Name: icecast Version: 2.3.2 -Release: 62 -License: GPL-2.0+ +Release: 0 Summary: Audio Streaming Server -Url: http://www.icecast.org/ +License: GPL-2.0+ Group: Productivity/Networking/Web/Servers +Url: http://www.icecast.org/ Source: %{name}-%{version}.tar.bz2 Source1: icecast.init # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: icecast-2.3.1_runas_icecast_user.patch # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: icecast-fix-no-add-needed.patch +Patch2: icecast-2.3.2-CVE-2011-4612.diff BuildRequires: curl-devel BuildRequires: libtheora-devel +BuildRequires: libtool BuildRequires: libvorbis-devel BuildRequires: libxslt-devel -BuildRequires: libtool -BuildRequires: speex-devel BuildRequires: openssl-devel +BuildRequires: speex-devel PreReq: %fillup_prereq PreReq: %insserv_prereq PreReq: /usr/sbin/groupadd @@ -51,6 +51,7 @@ %setup -q %patch0 %patch1 +%patch2 -p1 %build autoreconf -fiv ++++++ icecast-2.3.2-CVE-2011-4612.diff ++++++ --- src/fserve.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) --- a/src/fserve.c +++ b/src/fserve.c @@ -395,6 +395,19 @@ int fserve_client_create (client_t *http int xspf_requested = 0, xspf_file_available = 1; ice_config_t *config; FILE *file; + char *filtered_path, *p; + + /* strip \r and \n from path string; it's duplicated, so it must be + * freed at return + */ + filtered_path = strdup(path); + if (!filtered_path) + return -1; + for (p = filtered_path; *p; p++) { + if (*p == '\r' || *p == '\n') + *p = '_'; + } + path = filtered_path; fullpath = util_get_path_from_normalised_uri (path); INFO2 ("checking for file %s (%s)", path, fullpath); @@ -414,6 +427,7 @@ int fserve_client_create (client_t *http WARN2 ("req for file \"%s\" %s", fullpath, strerror (errno)); client_send_404 (httpclient, "The file you requested could not be found"); free (fullpath); + free (filtered_path); return -1; } m3u_file_available = 0; @@ -462,6 +476,7 @@ int fserve_client_create (client_t *http fserve_add_client (httpclient, NULL); free (sourceuri); free (fullpath); + free (filtered_path); return 0; } if (xspf_requested && xspf_file_available == 0) @@ -475,6 +490,8 @@ int fserve_client_create (client_t *http free (reference); admin_send_response (doc, httpclient, TRANSFORMED, "xspf.xsl"); xmlFreeDoc(doc); + free (fullpath); + free (filtered_path); return 0; } @@ -486,6 +503,7 @@ int fserve_client_create (client_t *http client_send_404 (httpclient, "The file you requested could not be found"); config_release_config(); free (fullpath); + free (filtered_path); return -1; } config_release_config(); @@ -495,6 +513,7 @@ int fserve_client_create (client_t *http client_send_404 (httpclient, "The file you requested could not be found"); WARN1 ("found requested file but there is no handler for it: %s", fullpath); free (fullpath); + free (filtered_path); return -1; } @@ -504,6 +523,7 @@ int fserve_client_create (client_t *http WARN1 ("Problem accessing file \"%s\"", fullpath); client_send_404 (httpclient, "File not readable"); free (fullpath); + free (filtered_path); return -1; } free (fullpath); @@ -594,6 +614,7 @@ int fserve_client_create (client_t *http stats_event_inc (NULL, "file_connections"); fserve_add_client (httpclient, file); + free (filtered_path); return 0; @@ -603,6 +624,7 @@ fail: sock_write (httpclient->con->sock, "HTTP/1.0 416 Request Range Not Satisfiable\r\n\r\n"); client_destroy (httpclient); + free (filtered_path); return -1; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hdparm for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package hdparm for openSUSE:Factory checked in at 2012-03-07 13:42:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdparm (Old) and /work/SRC/openSUSE:Factory/.hdparm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hdparm", Maintainer is "VDziewiecki(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/hdparm/hdparm.changes 2012-02-07 14:45:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hdparm.new/hdparm.changes 2012-03-07 13:42:36.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Feb 18 11:35:40 UTC 2012 - rschweikert(a)suse.com + +- fix license warning, set to SUSE-Permissive + +------------------------------------------------------------------- +Wed Feb 15 18:22:03 UTC 2012 - rschweikert(a)suse.com + +- put binaries in /usr tree (UsrMerge) project + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdparm.spec ++++++ --- /var/tmp/diff_new_pack.GifCRD/_old 2012-03-07 13:42:38.000000000 +0100 +++ /var/tmp/diff_new_pack.GifCRD/_new 2012-03-07 13:42:38.000000000 +0100 @@ -16,14 +16,13 @@ # - Name: hdparm PreReq: %insserv_prereq %fillup_prereq coreutils Provides: base:/sbin/hdparm Version: 9.39 Release: 0 Summary: A Program to get and set hard disk parameters -License: PERMISSIVE-OSI-COMPLIANT +License: SUSE-Permissive Group: Hardware/Other Source: http://sourceforge.net/projects/hdparm/files/hdparm/%{name}-%{version}.tar.… Source1: 56-idedma.rules @@ -50,9 +49,9 @@ cp -p wiper/README.txt README.wiper %install -mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT/usr/share/man/man8 -make install DESTDIR=$RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/%{_sbindir} +%make_install binprefix=%{_prefix} mv contrib/README contrib/README.contrib install -d $RPM_BUILD_ROOT/lib/udev/rules.d install -m 644 %{S:1} $RPM_BUILD_ROOT/lib/udev/rules.d @@ -62,7 +61,12 @@ install -d $RPM_BUILD_ROOT/usr/lib/hdparm install -m 755 contrib/idectl $RPM_BUILD_ROOT/usr/lib/hdparm install -m 755 contrib/ultrabayd $RPM_BUILD_ROOT/usr/lib/hdparm -install -m 755 wiper/wiper.sh $RPM_BUILD_ROOT/sbin +install -m 755 wiper/wiper.sh $RPM_BUILD_ROOT/%{_sbindir} +#UsrMerge +mkdir -p $RPM_BUILD_ROOT/sbin +ln -sf %{_sbindir}/wiper.sh $RPM_BUILD_ROOT/sbin +ln -sf %{_sbindir}/hdparm $RPM_BUILD_ROOT/sbin +#EndUsrMerge %post if [ -f etc/sysconfig/hardware ] ; then @@ -97,8 +101,12 @@ %defattr(-,root,root) %doc Changelog README.acoustic contrib/README.contrib README.wiper %doc %{_mandir}/man8/hdparm.8.gz +#UsrMerge /sbin/hdparm /sbin/wiper.sh +#EndUserMerge +%{_sbindir}/hdparm +%{_sbindir}/wiper.sh %dir /lib/udev /lib/udev/idedma.sh %dir /lib/udev/rules.d -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnash for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package gnash for openSUSE:Factory checked in at 2012-03-07 13:41:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnash (Old) and /work/SRC/openSUSE:Factory/.gnash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnash", Maintainer is "tiwai(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/gnash/gnash.changes 2011-10-18 14:13:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnash.new/gnash.changes 2012-03-07 13:42:35.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 5 18:08:08 CET 2012 - tiwai(a)suse.de + +- VUL-1: CVE-2011-4328: gnash: Unsafe management of HTTP cookies + (bnc#732324) + +------------------------------------------------------------------- New: ---- gnash-CVE-2011-4328.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnash.spec ++++++ --- /var/tmp/diff_new_pack.JCfX0h/_old 2012-03-07 13:42:36.000000000 +0100 +++ /var/tmp/diff_new_pack.JCfX0h/_new 2012-03-07 13:42:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnash # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -38,9 +38,9 @@ BuildRequires: ffmpeg-devel %endif Version: 0.8.8 -Release: 2 -License: GPL-2.0+ +Release: 0 Summary: Free Flash movie player +License: GPL-2.0+ Group: Productivity/Networking/Web/Browsers %if %{cvs_date} %define package_version %{version}.cvs%{cvs_date} @@ -53,6 +53,7 @@ # PATCH-FIX-UPSTREAM gnash-0.8.5-build-fixes.diff Patch: gnash-0.8.5-build-fixes.diff Patch1: gnash-fix-insecure-temp-files.diff +Patch2: gnash-CVE-2011-4328.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -66,7 +67,6 @@ of the areas to work on to achieve full version 7 compliance. %package devel -License: GPL-2.0+ Summary: Gnash include files Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -87,6 +87,7 @@ %endif %patch -p1 %patch1 -p1 +%patch2 -p1 %build autoreconf -fi ++++++ gnash-CVE-2011-4328.diff ++++++ >From 8fc19a890ee787d26200dc1b8b5546e3bb15ac7b Mon Sep 17 00:00:00 2001 From: Gabriele Giacone <1o5g4r8o(a)gmail.com> Date: Thu, 01 Dec 2011 00:59:15 +0000 Subject: CVE-2011-4328 fix. mkstemps and boost::iostreams. See bug #34903 --- --- plugin/npapi/Makefile.am | 1 plugin/npapi/plugin.cpp | 48 +++++++++++++++++++++++++++++++++-------------- 2 files changed, 35 insertions(+), 14 deletions(-) --- a/plugin/npapi/Makefile.am +++ b/plugin/npapi/Makefile.am @@ -70,6 +70,7 @@ libgnashplugin_la_SOURCES = plugin.cpp libgnashplugin_la_LIBADD = \ $(GLIB_LIBS) \ + -lboost_iostreams \ $(NULL) # Scriptable plugin support --- a/plugin/npapi/plugin.cpp +++ b/plugin/npapi/plugin.cpp @@ -75,6 +75,8 @@ #include <boost/tokenizer.hpp> #include <boost/algorithm/string/join.hpp> +#include <boost/iostreams/device/file_descriptor.hpp> +#include <boost/iostreams/stream.hpp> #include <boost/format.hpp> #include <sys/param.h> #include <csignal> @@ -132,6 +134,17 @@ getPluginDescription() return desc; } +boost::iostreams::file_descriptor_sink getfdsink(char mkstemplate[]); + +boost::iostreams::file_descriptor_sink +getfdsink(char mksTemplate[]) +{ + int suffix = std::string(mksTemplate).size() - std::string(mksTemplate).find("XXXXXX") - 6; + int fd = mkstemps (mksTemplate, suffix); + boost::iostreams::file_descriptor_sink fdsink(fd, boost::iostreams::close_handle); + return fdsink; +} + // // general initialization and shutdown // @@ -919,16 +932,17 @@ create_standalone_launcher(const std::st return; } - std::ofstream saLauncher; - - std::stringstream ss; - static int debugno = 0; - debugno = (debugno + 1) % 10; - ss << "/tmp/gnash-debug-" << debugno << ".sh"; - saLauncher.open(ss.str().c_str(), std::ios::out | std::ios::trunc); + char debugname[] = "/tmp/gnash-debug-XXXXXX.sh"; + boost::iostreams::file_descriptor_sink fdsink = getfdsink(debugname); + if (fdsink.handle() == -1) { + gnash::log_error("Failed to create sink: %s", debugname); + return; + } + boost::iostreams::stream<boost::iostreams::file_descriptor_sink> + saLauncher (fdsink); if (!saLauncher) { - gnash::log_error("Failed to open new file for standalone launcher: " + ss.str()); + gnash::log_error("Failed to open new file for standalone launcher: %s", debugname); return; } @@ -951,6 +965,7 @@ create_standalone_launcher(const std::st << std::endl; saLauncher.close(); + fdsink.close(); #endif } @@ -996,15 +1011,20 @@ nsPluginInstance::getCmdLine(int hostfd, std::string ncookie (cookie, length); if (cookie) { gnash::log_debug("The Cookie for %s is %s", url, ncookie); - std::ofstream cookiefile; - std::stringstream ss; - ss << "/tmp/gnash-cookies." << getpid(); - - cookiefile.open(ss.str().c_str(), std::ios::out | std::ios::trunc); + char cookiename[] = "/tmp/gnash-cookies.XXXXXX"; + boost::iostreams::file_descriptor_sink fdsink = getfdsink(cookiename); + if (fdsink.handle() == -1) { + gnash::log_error("Failed to create sink: %s", cookiename); + return arg_vec; + } + boost::iostreams::stream<boost::iostreams::file_descriptor_sink> + cookiefile (fdsink); + cookiefile << "Set-Cookie: " << ncookie << std::endl; cookiefile.close(); + fdsink.close(); - if (setenv("GNASH_COOKIES_IN", ss.str().c_str(), 1) < 0) { + if (setenv("GNASH_COOKIES_IN", cookiename, 1) < 0) { gnash::log_error( "Couldn't set environment variable GNASH_COOKIES_IN to %s", ncookie); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit chromium for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2012-03-07 13:41:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chromium", Maintainer is "PRusnak(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2012-02-27 18:34:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2012-03-07 13:41:59.000000000 +0100 @@ -1,0 +2,50 @@ +Mon Mar 5 20:53:06 UTC 2012 - vdziewiecki(a)suse.com + +- add Provides: browser(npapi) FATE#313084 + +------------------------------------------------------------------- +Sat Mar 3 16:55:15 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 19.0.1060 + * Fixed NTP signed in state is missing (Issue: 112676) + * Fixed gmail seems to redraw itself (all white) occasionally + (Issue: 111263) + * Focus "OK" button on Javascript dialogs (Issue: 111015) + * Fixed Back button frequently hangs (Issue: 93427) + * Increase the buffer size to fix muted playback rate + (Issue: 108239) + * Fixed Empty span with line-height renders with non-zero height + (Issue: 109811) + * Marked the Certum Trusted Network CA as an issuer of + extended-validation (EV) certificates. + * Fixed importing of bookmarks, history, etc. from Firefox 10+. + * Fixed issues - 114001, 110785, 114168, 114598, 111663, 113636, + 112676 + * Fixed several crashes (Issues: 111376, 108688, 114391) + * Fixed Firefox browser in Import Bookmarks and Settings + drop-down (Issue: 114476) + * Sync: Sessions aren't associating pre-existing tabs + (Issue: 113319) + * Fixed All "Extensions" make an entry under the "NTP Apps" + page (Issue: 113672) ++ Security Fixes (bnc#750407): + * High CVE-2011-3031: Use-after-free in v8 element wrapper. + * High CVE-2011-3032: Use-after-free in SVG value handling. + * High CVE-2011-3033: Buffer overflow in the Skia drawing library. + * High CVE-2011-3034: Use-after-free in SVG document handling. + * High CVE-2011-3035: Use-after-free in SVG use handling. + * High CVE-2011-3036: Bad cast in line box handling. + * High CVE-2011-3037: Bad casts in anonymous block splitting. + * High CVE-2011-3038: Use-after-free in multi-column handling. + * High CVE-2011-3039: Use-after-free in quote handling. + * High CVE-2011-3040: Out-of-bounds read in text handling. + * High CVE-2011-3041: Use-after-free in class attribute handling. + * High CVE-2011-3042: Use-after-free in table section handling. + * High CVE-2011-3043: Use-after-free in flexbox with floats. + * High CVE-2011-3044: Use-after-free with SVG animation elements. +- Remove the external ffmepg headers and start using the ones + delivered with Chromium. Changes to Chromium are no longer in line + with any ffmpeg version :-(. So we can only use the Chromium + ffmpeg headers. + +------------------------------------------------------------------- Old: ---- chromium.19.0.1046.0.svn122684.tar.bz2 ffmpeg-0.6-headers.tar.bz2 New: ---- chromium.19.0.1060.0.svn124863.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.fipVJJ/_old 2012-03-07 13:42:34.000000000 +0100 +++ /var/tmp/diff_new_pack.fipVJJ/_new 2012-03-07 13:42:34.000000000 +0100 @@ -16,11 +16,11 @@ # -%define v8_ver 3.9.7.0 -%define svn_revision 122684 +%define v8_ver 3.9.13.0 +%define svn_revision 124863 Name: chromium -Version: 19.0.1046.0 +Version: 19.0.1060.0 Release: 0 Summary: Google's opens source browser project License: BSD-3-Clause and LGPL-2.1+ @@ -31,7 +31,6 @@ Source1: %{name}.easy Source2: %{name}-rpmlintrc %endif -Source8: ffmpeg-0.6-headers.tar.bz2 Source20: chromium-vendor.patch.in Source30: master_preferences Source31: default_bookmarks.html @@ -42,6 +41,7 @@ Source104: chromium-icons.tar.bz2 Provides: chromium-based-browser = %{version} Provides: chromium-browser = %{version} +Provides: browser(npapi) Obsoletes: chromium-browser < %{version} ## Start Patches @@ -92,6 +92,7 @@ BuildRequires: gcc-c++ BuildRequires: gperf BuildRequires: hunspell-devel +BuildRequires: krb5-devel BuildRequires: libbz2-devel BuildRequires: libevent BuildRequires: libexpat-devel @@ -104,7 +105,6 @@ BuildRequires: lzma BuildRequires: mozilla-nspr-devel BuildRequires: mozilla-nss-devel -BuildRequires: krb5-devel BuildRequires: openssl-devel BuildRequires: pam-devel BuildRequires: pkg-config @@ -113,44 +113,44 @@ %else BuildRequires: perl(Switch) %endif -BuildRequires: pkgconfig(cairo) >= 1.6 -BuildRequires: pkgconfig(dbus-1) BuildRequires: dbus-1-glib-devel -BuildRequires: pkgconfig(gconf-2.0) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(xi) -BuildRequires: pkgconfig(xcomposite) -BuildRequires: pkgconfig(xt) -BuildRequires: pkgconfig(xfixes) -BuildRequires: pkgconfig(xscrnsaver) -BuildRequires: pkgconfig(xrender) -BuildRequires: pkgconfig(xext) -BuildRequires: pkgconfig(x11) BuildRequires: dbus-1-glib-devel +BuildRequires: hicolor-icon-theme +BuildRequires: libelf-devel +BuildRequires: libevent-devel +BuildRequires: libgnome-keyring-devel +BuildRequires: libicu-devel >= 4.0 +BuildRequires: libpulse-devel BuildRequires: python +BuildRequires: python-devel BuildRequires: python-xml +BuildRequires: speex-devel BuildRequires: sqlite3-devel BuildRequires: update-desktop-files BuildRequires: v8-devel = %{v8_ver} BuildRequires: wdiff BuildRequires: zlib-devel -BuildRequires: libpulse-devel -BuildRequires: libelf-devel -BuildRequires: libgnome-keyring-devel -BuildRequires: python-devel -BuildRequires: libevent-devel -BuildRequires: libicu-devel >= 4.0 -BuildRequires: speex-devel -BuildRequires: hicolor-icon-theme +BuildRequires: pkgconfig(cairo) >= 1.6 +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcomposite) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(xscrnsaver) +BuildRequires: pkgconfig(xt) %if 0%{?suse_version} < 1210 BuildRequires: libudev-devel %endif # For NaCl %ifarch x86_64 -BuildRequires: glibc-32bit BuildRequires: gcc-c++-32bit +BuildRequires: glibc-32bit BuildRequires: zlib-32bit %endif @@ -237,11 +237,7 @@ %patch32 -p1 %patch66 -p1 -echo "%{svn_revision}" > src/build/LASTCHANGE.in - -pushd src/third_party/ffmpeg/ -tar xf %{SOURCE8} -popd +echo "svn%{svn_revision}" > src/build/LASTCHANGE.in # apply vendor patch after substitution sed "s:RPM_VERSION:%{version}:" %{SOURCE20} | patch -p0 @@ -275,6 +271,7 @@ -Dlinux_sandbox_chrome_path=%{_libdir}/chromium/chromium \ -Duse_openssl=0 \ -Duse_system_ffmpeg=1 \ +-Dbuild_ffmpegsumo=1 \ -Duse_system_zlib=1 \ -Duse_system_libpng=1 \ -Duse_system_bzip2=1 \ @@ -297,8 +294,9 @@ %endif %ifarch x86_64 -Dtarget_arch=x64 \ --Dlinux_use_gold_flags=0 \ %endif +-Dlinux_use_gold_flags=0 \ +-Dlinux_use_gold_binary=0 \ -Djavascript_engine=v8 #make -r %{?_smp_mflags} chrome V=1 BUILDTYPE=Release ++++++ chromium-6.0.406.0-system-gyp-v8.patch ++++++ --- /var/tmp/diff_new_pack.fipVJJ/_old 2012-03-07 13:42:34.000000000 +0100 +++ /var/tmp/diff_new_pack.fipVJJ/_new 2012-03-07 13:42:34.000000000 +0100 @@ -52,7 +52,7 @@ =================================================================== --- chromium.orig/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp +++ chromium/src/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp -@@ -1070,7 +1070,7 @@ +@@ -1054,7 +1054,7 @@ '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp', '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite', @@ -61,25 +61,25 @@ '<(libjpeg_gyp_path):libjpeg', ], 'include_dirs': [ -@@ -1189,7 +1189,7 @@ - '<(chromium_src_dir)/third_party/ots/ots.gyp:ots', +@@ -1177,7 +1177,7 @@ '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite', '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl', + '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib', - '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', + '<(chromium_src_dir)/build/linux/system.gyp:v8', '<(libjpeg_gyp_path):libjpeg', ], 'export_dependent_settings': [ -@@ -1207,7 +1207,7 @@ - '<(chromium_src_dir)/third_party/ots/ots.gyp:ots', +@@ -1196,7 +1196,7 @@ '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite', '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_glsl', + '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib', - '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', + '<(chromium_src_dir)/build/linux/system.gyp:v8', '<(libjpeg_gyp_path):libjpeg', ], # This is needed for mac because of webkit_system_interface. It'd be nice -@@ -1967,7 +1967,7 @@ +@@ -1959,7 +1959,7 @@ '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', '<(chromium_src_dir)/skia/skia.gyp:skia', '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', @@ -88,7 +88,7 @@ ], 'export_dependent_settings': [ 'webcore_bindings', -@@ -1976,7 +1976,7 @@ +@@ -1968,7 +1968,7 @@ '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', '<(chromium_src_dir)/skia/skia.gyp:skia', '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', ++++++ chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.fipVJJ/_old 2012-03-07 13:42:34.000000000 +0100 +++ /var/tmp/diff_new_pack.fipVJJ/_new 2012-03-07 13:42:34.000000000 +0100 @@ -8,15 +8,15 @@ - 'cflags': [ - '<!@(pkg-config --cflags libavcodec libavformat libavutil)', + 'include_dirs': [ -+ 'config', -+ 'ffmpeg-0.6-headers', ++ 'chromium/config', ++ '.', ], 'direct_dependent_settings': { - 'cflags': [ - '<!@(pkg-config --cflags libavcodec libavformat libavutil)', + 'include_dirs': [ -+ 'config', -+ 'ffmpeg-0.6-headers', ++ 'chromium/config', ++ '.', ], }, }, { # else use_system_ffmpeg == 0, add local copy to include path ++++++ chromium.19.0.1046.0.svn122684.tar.bz2 -> chromium.19.0.1060.0.svn124863.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/chromium/chromium.19.0.1046.0.svn122684.tar.bz2 /work/SRC/openSUSE:Factory/.chromium.new/chromium.19.0.1060.0.svn124863.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit choqok for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package choqok for openSUSE:Factory checked in at 2012-03-07 13:41:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/choqok (Old) and /work/SRC/openSUSE:Factory/.choqok.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "choqok", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/choqok/choqok.changes 2011-10-11 16:51:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.choqok.new/choqok.changes 2012-03-07 13:41:39.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Mar 6 07:38:00 UTC 2012 - mlin(a)suse.com + +- Update to version 1.3 + * Support for Twitter photo upload API method + * Translator plugin shuts off due Google terminated its free API + * Toolbar for Choqok + * Filter plugin new feature: Add a filter to Highlight a post containing some text + * Improvements in new tab bar UI + * Show first 4 characters of search timeline name over the timeline icon + +------------------------------------------------------------------- Old: ---- choqok-1.1.tar.bz2 userfriends.diff New: ---- choqok-1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ choqok.spec ++++++ --- /var/tmp/diff_new_pack.6GPTjr/_old 2012-03-07 13:41:43.000000000 +0100 +++ /var/tmp/diff_new_pack.6GPTjr/_new 2012-03-07 13:41:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package choqok # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,15 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: choqok -Version: 1.1 -Release: 8 -License: GPL-3.0 +Version: 1.3 +Release: 0 Summary: Micro-Blogging Client for KDE -Url: http://choqok.gnufolks.org +License: GPL-3.0 Group: Productivity/Networking/Other +Url: http://choqok.gnufolks.org Source: %{name}-%{version}.tar.bz2 -Patch0: userfriends.diff BuildRequires: fdupes BuildRequires: libkde4-devel BuildRequires: libqca2-devel @@ -38,7 +38,6 @@ It currently supports twitter.com and identi.ca services. %package devel -License: GPL-3.0 Summary: Micro-Blogging Client for KDE Group: Development/Libraries/KDE Requires: choqok = %{version} @@ -50,7 +49,6 @@ %prep %setup -q -%patch0 -p1 %build %cmake_kde4 -d build @@ -88,11 +86,11 @@ %config %{_kde4_configkcfgdir}/choqokbehaviorsettings.kcfg %config %{_kde4_configkcfgdir}/flickrsettings.kcfg %config %{_kde4_configkcfgdir}/imstatussettings.kcfg +%config %{_kde4_configkcfgdir}/is_gd_settings.kcfg %config %{_kde4_configkcfgdir}/mobypicturesettings.kcfg %config %{_kde4_configkcfgdir}/nowlisteningsettings.kcfg %config %{_kde4_configkcfgdir}/posteroussettings.kcfg %config %{_kde4_configkcfgdir}/tinyarro_ws_settings.kcfg -%config %{_kde4_configkcfgdir}/translatorsettings.kcfg %config %{_kde4_configkcfgdir}/twitgoosettings.kcfg %config %{_kde4_configkcfgdir}/twitpicsettings.kcfg %config %{_kde4_configkcfgdir}/untinysettings.kcfg ++++++ choqok-1.1.tar.bz2 -> choqok-1.3.tar.bz2 ++++++ ++++ 131804 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit brp-extract-appdata for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package brp-extract-appdata for openSUSE:Factory checked in at 2012-03-07 13:41:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/brp-extract-appdata (Old) and /work/SRC/openSUSE:Factory/.brp-extract-appdata.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "brp-extract-appdata", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/brp-extract-appdata/brp-extract-appdata.changes 2012-03-02 13:47:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.brp-extract-appdata.new/brp-extract-appdata.changes 2012-03-07 13:41:34.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 7 09:25:17 UTC 2012 - coolo(a)suse.com + +- adding extract-icons.pl script to be called for kiwi products + +------------------------------------------------------------------- New: ---- extract-icons.pl ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ brp-extract-appdata.spec ++++++ --- /var/tmp/diff_new_pack.AYyetE/_old 2012-03-07 13:41:39.000000000 +0100 +++ /var/tmp/diff_new_pack.AYyetE/_new 2012-03-07 13:41:39.000000000 +0100 @@ -25,11 +25,20 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}.pl Source1: create-appdata-xml.pl +Source2: extract-icons.pl BuildArch: noarch %description Extract appdata.xml from all .deskop files found in build root +%package -n extract-appdata-icons +Summary: A little perl script to split appdata.xml +Group: Development/Tools/Building + +%description -n extract-appdata-icons +OBS generated appdata.xml contains all icons and this little tool splits +the XML into the format expected from software center + %prep %build @@ -37,10 +46,15 @@ %install install -m0755 -D %SOURCE0 $RPM_BUILD_ROOT%_rpmconfigdir/brp-suse.d/brp-72-extract-appdata install -m0755 -D %SOURCE1 $RPM_BUILD_ROOT/usr/lib/build/checks/72-translate-appdata +install -m0755 -D %SOURCE2 $RPM_BUILD_ROOT/usr/bin/extract-appdata-icons %files %defattr(-,root,root) %_rpmconfigdir/brp-suse.d /usr/lib/build +%files -n extract-appdata-icons +%defattr(-,root,root) +/usr/bin/extract-appdata-icons + %changelog ++++++ extract-icons.pl ++++++ #! /usr/bin/perl # Copyright (c) 2012 Stephan Kulow, SUSE Linux Products GmbH # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the # "Software"), to deal in the Software without restriction, including # without limitation the rights to use, copy, modify, merge, publish, # distribute, sublicense, and/or sell copies of the Software, and to # permit persons to whom the Software is furnished to do so, subject to # the following conditions: # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. use strict; use XML::Simple; use Data::Dumper; use File::Temp; use MIME::Base64; use Cwd; use File::Path; my %ids; sub find_perfect_match($) { my ($ref) = @_; my @candidates = sort @$ref; if (@candidates == 1) { return $candidates[0]; } foreach my $size (qw(32 48 64 24 )) { my @sized_icons; my $pattern = "/$size" . "x$size/"; for my $can (@candidates) { push(@sized_icons,$can) if ($can =~ m/($pattern)/); } return $sized_icons[0] if (@sized_icons == 1); if (@sized_icons) { for my $can (@sized_icons) { return $can if ($can =~ m,/hicolor/,); } print "UNKNOWN $size " . join(' , ', @sized_icons) . "\n"; return $sized_icons[0]; } } print "UNKNOWN " . join(' , ', @candidates) . "\n"; return $candidates[0]; } sub extract_icon($$) { my ($ref, $tmpdir) = @_; my $name = 'fancy'; my $name = shift @{$ref->{name}}; return $name unless ($ref->{filecontent}); my %files; my @fcontent = @{$ref->{filecontent}}; foreach my $icon (@fcontent) { $files{$icon->{file}} = $icon->{content}; } my @candidates = keys %files; my $best = find_perfect_match(\@candidates); my $suffix = $best; $suffix =~ s,^.*\.([^.]*)$,$1,; open(ICON, ">", "$tmpdir/$name.$suffix"); print ICON decode_base64($files{$best}); close(ICON); #print "$name $best\n"; return $name; } if (@ARGV != 2 || $ARGV[0] eq "--help" || $ARGV[0] eq "-h") { print "Usage: $0 <appdata.xml> <outdir>\n"; print " It will output appdata.xml and appdata-icon.tar.gz in outdir\n"; exit(1); } my $inputfile = $ARGV[0]; my $outdir = $ARGV[1]; if (! -d $outdir) { print "Output directory must exist.\n"; exit(1); } my $xml = XMLin($inputfile, ForceArray => 1) || die "can't parse $inputfile"; my $apps = $xml->{application}; my $tmpdir = mkdtemp("/tmp/icons.XXXXXX"); my @napps; for my $app ( @$apps) { my $id = shift @{$app->{id}}; next if defined $ids{$id->{content}}; $ids{$id->{content}} = 1; my $icon = extract_icon(@{$app->{icon}}[0], $tmpdir); $app->{icon} = [ { "type" => "local", "content" => $icon } ]; push(@napps, $app); } $xml->{application} = \@napps; $xml = XMLout($xml, RootName => "applications"); chdir($outdir) || die "can't change into $outdir"; my $cpwd = getcwd; chdir($tmpdir); system("tar", "czf", "$cpwd/app-icons.tar.gz", "."); chdir($cpwd); rmtree($tmpdir); open(XML, ">", "$cpwd/appdata.xml"); print XML "$xml"; close(XML); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bibview for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package bibview for openSUSE:Factory checked in at 2012-03-07 13:41:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bibview (Old) and /work/SRC/openSUSE:Factory/.bibview.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bibview", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/bibview/bibview.changes 2011-09-23 01:52:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bibview.new/bibview.changes 2012-03-07 13:41:31.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 20 16:33:15 UTC 2012 - coolo(a)suse.com + +- buildrequire xorg-x11 for directory ownership + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bibview.spec ++++++ --- /var/tmp/diff_new_pack.zkwU0Y/_old 2012-03-07 13:41:34.000000000 +0100 +++ /var/tmp/diff_new_pack.zkwU0Y/_new 2012-03-07 13:41:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bibview # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,27 +16,21 @@ # - Name: bibview -BuildRequires: xaw3d-devel xorg-x11-devel -License: Any permissive -Group: Productivity/Publishing/TeX/Utilities +BuildRequires: xaw3d-devel +BuildRequires: xorg-x11 +BuildRequires: xorg-x11-devel Provides: bibvw15 Version: 2.2 -Release: 984 +Release: 0 Summary: X11 Front-End for BibTeX Databases +License: SUSE-Permissive +Group: Productivity/Publishing/TeX/Utilities Source: bibview-2.2.tar.gz Patch: bibview-2.2.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} -%if "%_exec_prefix" == "/usr/X11R6" -%global _mandir %{_exec_prefix}/man -%define _x11data %{_exec_prefix}/lib/X11 -%define _appdefdir %{_x11data}/app-defaults -%else %define _x11data %{_datadir}/X11 %define _appdefdir %{_x11data}/app-defaults -%endif %description Using bibview, entries in several BiB databases can be moved, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit arpwatch-ethercodes for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package arpwatch-ethercodes for openSUSE:Factory checked in at 2012-03-07 13:41:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arpwatch-ethercodes (Old) and /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "arpwatch-ethercodes", Maintainer is "draht(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/arpwatch-ethercodes/arpwatch-ethercodes.changes 2012-03-06 13:37:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new/arpwatch-ethercodes.changes 2012-03-07 13:41:27.000000000 +0100 @@ -2 +2 @@ -Tue Mar 6 08:40:12 CET 2012 - autobuild(a)suse.de +Wed Mar 7 07:40:06 CET 2012 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2012-03-06 +- automated update on 2012-03-07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch-ethercodes.spec ++++++ --- /var/tmp/diff_new_pack.lJ8pGr/_old 2012-03-07 13:41:30.000000000 +0100 +++ /var/tmp/diff_new_pack.lJ8pGr/_new 2012-03-07 13:41:30.000000000 +0100 @@ -23,7 +23,7 @@ License: BSD-3-Clause Group: Productivity/Networking/Diagnostic Summary: Ethercodes Data for arpwatch -Version: 2012.3.6 +Version: 2012.3.7 Release: 1 Source0: http://standards.ieee.org/regauth/oui/oui.txt BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ oui.txt ++++++ --- /var/tmp/diff_new_pack.lJ8pGr/_old 2012-03-07 13:41:30.000000000 +0100 +++ /var/tmp/diff_new_pack.lJ8pGr/_new 2012-03-07 13:41:30.000000000 +0100 @@ -82278,8 +82278,8 @@ Hangzhou ZheJiang 310012 CHINA -0C-AF-5A (hex) GENUS POWER INFRASTRUCTURE LIMITED -0CAF5A (base 16) GENUS POWER INFRASTRUCTURE LIMITED +0C-AF-5A (hex) GENUS POWER INFRASTRUCTURES LIMITED +0CAF5A (base 16) GENUS POWER INFRASTRUCTURES LIMITED SPL-3 RIICO INDUSTRIAL AREA SITAPURA JAIPUR RAJASTHAN 302022 @@ -91843,6 +91843,12 @@ New York NY 10001 UNITED STATES +84-74-2A (hex) zte corporation +84742A (base 16) zte corporation + 12/F.,R&D building,kejinan Road + shenzhen guangdong 518057 + UNITED STATES + 84-8D-84 (hex) Rajant Corporation 848D84 (base 16) Rajant Corporation 400 East King Street @@ -95568,6 +95574,12 @@ Santa Clara CA 95054 UNITED STATES +B4-0E-96 (hex) HERAN +B40E96 (base 16) HERAN + No.88, Keji 3rd Rd., Guishan Township + Taoyuan R.O.C 333 + TAIWAN, REPUBLIC OF CHINA + B4-0E-DC (hex) LG-Ericsson Co.,Ltd. B40EDC (base 16) LG-Ericsson Co.,Ltd. 533,Hogye-1dong,Dongan-gu -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apper for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package apper for openSUSE:Factory checked in at 2012-03-07 13:41:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apper (Old) and /work/SRC/openSUSE:Factory/.apper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apper", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/apper/apper.changes 2012-01-09 16:22:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apper.new/apper.changes 2012-03-07 13:41:23.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Mar 6 12:11:42 UTC 2012 - idonmez(a)suse.com + +- Update to version 0.7.1 + * Added a origin column + * Added a "Installed Version" column to updater UI + * Fix bug on exiting when the origns model had changes to do + * Fix bug that prevented EULA/GPG key from being accepted + * Fix tray icon to properly show a restart action + * Fix Session Interface not to crash, and respond to button clicks + when no package was to be installed + * Fix bug when clicking on a file to install +- Drop apper-c33ab740-file-install-crash.diff and + apper-accept-eula.diff: applied upstream. + +------------------------------------------------------------------- Old: ---- apper-0.7.0.tar.bz2 apper-accept-eula.diff apper-c33ab740-file-install-crash.diff New: ---- apper-0.7.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apper.spec ++++++ --- /var/tmp/diff_new_pack.0GeMd9/_old 2012-03-07 13:41:25.000000000 +0100 +++ /var/tmp/diff_new_pack.0GeMd9/_new 2012-03-07 13:41:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package apper # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -17,22 +17,21 @@ Summary: KDE interface for PackageKit - -Name: apper -Version: 0.7.0 -Release: 1 License: GPL-2.0+ Group: System/Packages -Source0: %{name}-%{version}.tar.bz2 + +Name: apper +Version: 0.7.1 +Release: 0 +%define _base_version 0.7 +Source0: https://launchpad.net/apper/%{_base_version}/%{version}/+download/%{name}-%… Patch0: revert-upstream.diff -Patch1: apper-accept-eula.diff Patch2: apper-ui-fixes.diff -Patch3: apper-c33ab740-file-install-crash.diff Patch4: apper-no-dbus-service.diff Patch5: apper-no-user-proxy.diff Url: http://kde-apps.org/content/show.php/Apper?content=84745 BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libkde4-devel +BuildRequires: kdebase4-workspace-devel BuildRequires: libpackagekit-qt2-devel Requires: PackageKit Recommends: %{name}-lang = %{version} @@ -53,9 +52,7 @@ %setup -q -n %{name}-%{version} # For now revert this specific commit to make libapper.so in a private library. INSTALL_RPATH seems not to function %patch0 -p1 -%patch1 -p1 #%patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 @@ -78,13 +75,16 @@ %_kde4_appsdir/apper/ %_kde4_appsdir/ApperSentinel/ %_kde4_bindir/apper -#_kde4_libdir/apper/libapper.so %_kde4_libdir/libapper.so %_kde4_applicationsdir/apper.desktop %_kde4_servicesdir/kcm_apper.desktop %_kde4_servicesdir/kded/apperd.desktop -/usr/share/dbus-1/services/org.freedesktop.PackageKit.service -/usr/share/dbus-1/services/org.kde.ApperSentinel.service +%_kde4_applicationsdir/apper_installer.desktop +%_kde4_applicationsdir/apper_settings.desktop +%_kde4_applicationsdir/apper_updates.desktop +%{_datadir}/man/man1/apper.1.gz +%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service +%{_datadir}/dbus-1/services/org.kde.ApperSentinel.service %files lang -f %{name}.lang ++++++ apper-0.7.0.tar.bz2 -> apper-0.7.1.tar.bz2 ++++++ ++++ 44669 lines of diff (skipped) ++++++ apper-no-dbus-service.diff ++++++ --- /var/tmp/diff_new_pack.0GeMd9/_old 2012-03-07 13:41:26.000000000 +0100 +++ /var/tmp/diff_new_pack.0GeMd9/_new 2012-03-07 13:41:26.000000000 +0100 @@ -1,11 +1,11 @@ -Index: apper-0.7.0/Desktop/apper.desktop +Index: apper-0.7.1/Desktop/apper.desktop =================================================================== ---- apper-0.7.0.orig/Desktop/apper.desktop -+++ apper-0.7.0/Desktop/apper.desktop +--- apper-0.7.1.orig/Desktop/apper.desktop ++++ apper-0.7.1/Desktop/apper.desktop @@ -2,8 +2,6 @@ Type=Application Icon=applications-other - Exec=apper %U + Exec=apper -X-DBUS-StartupType=Unique -X-DBUS-ServiceName=org.kde.apper ++++++ revert-upstream.diff ++++++ --- /var/tmp/diff_new_pack.0GeMd9/_old 2012-03-07 13:41:26.000000000 +0100 +++ /var/tmp/diff_new_pack.0GeMd9/_new 2012-03-07 13:41:26.000000000 +0100 @@ -1,7 +1,8 @@ -diff -urB apper-0.7.0/Apper/CMakeLists.txt new/Apper/CMakeLists.txt ---- apper-0.7.0/Apper/CMakeLists.txt 2011-10-10 17:34:18.000000000 +0200 -+++ new/Apper/CMakeLists.txt 2011-10-11 12:16:28.797583638 +0200 -@@ -22,8 +22,6 @@ +Index: apper-0.7.1/Apper/CMakeLists.txt +=================================================================== +--- apper-0.7.1.orig/Apper/CMakeLists.txt ++++ apper-0.7.1/Apper/CMakeLists.txt +@@ -22,8 +22,6 @@ target_link_libraries(apper_executable apper ) @@ -9,30 +10,23 @@ - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/apper_executable DESTINATION ${BIN_INSTALL_DIR} RENAME apper) - add_subdirectory(Icons) -diff -urB apper-0.7.0/ApperKCM/CMakeLists.txt new/ApperKCM/CMakeLists.txt ---- apper-0.7.0/ApperKCM/CMakeLists.txt 2011-10-10 17:34:18.000000000 +0200 -+++ new/ApperKCM/CMakeLists.txt 2011-10-11 12:15:39.218581236 +0200 -@@ -38,6 +38,4 @@ + kde4_create_manpage(man-apper.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) +Index: apper-0.7.1/ApperKCM/CMakeLists.txt +=================================================================== +--- apper-0.7.1.orig/ApperKCM/CMakeLists.txt ++++ apper-0.7.1/ApperKCM/CMakeLists.txt +@@ -38,6 +38,4 @@ target_link_libraries(kcm_apper apper ) -set_target_properties(kcm_apper PROPERTIES INSTALL_RPATH ${LIB_INSTALL_DIR}/apper) - install(TARGETS kcm_apper DESTINATION ${PLUGIN_INSTALL_DIR} ) -diff -urB apper-0.7.0/libapper/CMakeLists.txt new/libapper/CMakeLists.txt ---- apper-0.7.0/libapper/CMakeLists.txt 2011-10-10 17:34:18.000000000 +0200 -+++ new/libapper/CMakeLists.txt 2011-10-11 12:13:46.969575805 +0200 -@@ -46,4 +46,4 @@ - ${QPACKAGEKIT2_LIBRARIES} - ) - --install(TARGETS apper DESTINATION ${LIB_INSTALL_DIR}/apper) -+install(TARGETS apper DESTINATION ${LIB_INSTALL_DIR}) -diff -urB apper-0.7.0/Sentinel/CMakeLists.txt new/Sentinel/CMakeLists.txt ---- apper-0.7.0/Sentinel/CMakeLists.txt 2011-10-10 17:34:18.000000000 +0200 -+++ new/Sentinel/CMakeLists.txt 2011-10-11 12:16:00.783582290 +0200 -@@ -65,8 +65,6 @@ +Index: apper-0.7.1/Sentinel/CMakeLists.txt +=================================================================== +--- apper-0.7.1.orig/Sentinel/CMakeLists.txt ++++ apper-0.7.1/Sentinel/CMakeLists.txt +@@ -67,8 +67,6 @@ target_link_libraries(apper-sentinel apper ) @@ -41,3 +35,13 @@ install(TARGETS apper-sentinel DESTINATION ${LIBEXEC_INSTALL_DIR}) install(FILES ApperSentinel.notifyrc DESTINATION ${DATA_INSTALL_DIR}/ApperSentinel) +Index: apper-0.7.1/libapper/CMakeLists.txt +=================================================================== +--- apper-0.7.1.orig/libapper/CMakeLists.txt ++++ apper-0.7.1/libapper/CMakeLists.txt +@@ -46,4 +46,4 @@ target_link_libraries(apper + ${QPACKAGEKIT2_LIBRARIES} + ) + +-install(TARGETS apper DESTINATION ${LIB_INSTALL_DIR}/apper) ++install(TARGETS apper DESTINATION ${LIB_INSTALL_DIR}) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apparmor-admin_en for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package apparmor-admin_en for openSUSE:Factory checked in at 2012-03-07 13:41:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor-admin_en (Old) and /work/SRC/openSUSE:Factory/.apparmor-admin_en.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apparmor-admin_en", Maintainer is "ke(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor-admin_en/apparmor-admin_en.changes 2011-09-23 01:51:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apparmor-admin_en.new/apparmor-admin_en.changes 2012-03-07 13:41:21.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Feb 13 10:44:17 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Sat Sep 17 11:28:02 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor-admin_en.spec ++++++ --- /var/tmp/diff_new_pack.OChXzl/_old 2012-03-07 13:41:22.000000000 +0100 +++ /var/tmp/diff_new_pack.OChXzl/_new 2012-03-07 13:41:22.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package apparmor-admin_en (Version 10.3) +# spec file for package apparmor-admin_en # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,14 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: apparmor-admin_en %define my_lang en %define my_book APPARMOR-admin Version: 10.3 -Release: 82 +Release: 0 #Provides: locale(apparmor-docs:en) #OBS Source0: APPARMOR-admin_en-html.tar.bz2 @@ -35,9 +33,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: update-desktop-files -Group: Documentation/SUSE -License: GNU Free Documentation License, Version 1.2 (GFDL 1.2) Summary: AppArmor Admin Guide (English) +License: GFDL-1.2 +Group: Documentation/SUSE %define _defaultdocdir %{_datadir}/doc/manual %define _docdir %{_datadir}/doc/manual %define PDFDOC %{_defaultdocdir}/%{name}-pdf @@ -48,9 +46,8 @@ %package pdf -Group: Documentation/SUSE -License: GNU Free Documentation License, Version 1.2 (GFDL 1.2) Summary: AppArmor Admin Guide (English) as PDF +Group: Documentation/SUSE #Provides: locale(desktop-data-SuSE:en) #PDFOBS @@ -78,7 +75,6 @@ done %install -[ -d $RPM_BUILD_ROOT ] && rm -fvr $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir} # is set for sles or sled as /sles or /sled %define my_desktopdir /usr/share/susehelp/meta -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apache-commons-logging for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package apache-commons-logging for openSUSE:Factory checked in at 2012-03-07 13:40:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-commons-logging (Old) and /work/SRC/openSUSE:Factory/.apache-commons-logging.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache-commons-logging", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/apache-commons-logging/apache-commons-logging.changes 2012-02-24 06:52:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apache-commons-logging.new/apache-commons-logging.changes 2012-03-07 13:40:54.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 28 13:50:53 UTC 2012 - mvyskocil(a)suse.cz + +- fix build cycle, do not require avalon-* for build and use servletapi5 + instead of tomcat6 package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-commons-logging.spec ++++++ --- /var/tmp/diff_new_pack.B1PxyY/_old 2012-03-07 13:40:55.000000000 +0100 +++ /var/tmp/diff_new_pack.B1PxyY/_new 2012-03-07 13:40:55.000000000 +0100 @@ -39,8 +39,6 @@ BuildRequires: ant BuildRequires: ant-junit BuildRequires: apache-commons-parent -BuildRequires: avalon-framework -BuildRequires: avalon-logkit BuildRequires: java-devel >= 1.6.0 BuildRequires: jpackage-utils >= 1.6 BuildRequires: junit @@ -48,7 +46,7 @@ BuildRequires: maven-plugin-build-helper BuildRequires: maven-site-plugin %endif -BuildRequires: servlet25 +BuildRequires: servletapi5 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit amtu for openSUSE:Factory
by root＠hilbert.suse.de 07 Mar '12

07 Mar '12

Hello community, here is the log from the commit of package amtu for openSUSE:Factory checked in at 2012-03-07 13:40:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amtu (Old) and /work/SRC/openSUSE:Factory/.amtu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "amtu", Maintainer is "thomas(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/amtu/amtu.changes 2011-12-05 12:41:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.amtu.new/amtu.changes 2012-03-07 13:40:44.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 6 12:18:16 UTC 2012 - aj(a)suse.de + +- Remove obsolete suse_update_config call +- No need to run bootstrap, the automake etc files are good enough +- Cleanup spec file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amtu.spec ++++++ --- /var/tmp/diff_new_pack.HLGDtR/_old 2012-03-07 13:40:49.000000000 +0100 +++ /var/tmp/diff_new_pack.HLGDtR/_new 2012-03-07 13:40:49.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package amtu # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,6 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: amtu Url: http://sourceforge.net/projects/amtueal/ License: CPL-1.0 @@ -24,14 +26,11 @@ Release: 0 Summary: Abstract Machine Test Utility Source: %{name}-%{version}.tar.gz -#Patch0: %{name}-%{version}-ia64.patch -#Patch1: %{name}-%{version}-memsep.patch Patch0: amtu-1.0.8_memsep_fclose_bnc523353.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audit BuildRequires: audit-devel BuildRequires: audit-libs -BuildRequires: automake ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 s390 s390x %description @@ -43,24 +42,18 @@ . %prep -%setup amtu +%setup -q amtu %patch0 -p1 -#%patch1 -p1 %build -%{?suse_update_config:%{suse_update_config -f support}} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -pipe" CC=gcc export CC CFLAGS - #autoheader || true - #autoreconf --install - bash ./bootstrap ./configure \ --prefix=/usr \ --bindir=/usr/sbin \ --mandir=%{_mandir} make %{?_smp_mflags} -%{?suse_update_config:%{suse_update_config -f support}} %install # rm -rf %{_defaultdocdir}/amtu -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

drop jakarta-commons-codec from openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, FYI: Package jakarta-commons-codec was dropped from openSUSE:Factory at Tue Mar 6 22:56:52 CET 2012. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=ja… 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

drop krecord from openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, FYI: Package krecord was dropped from openSUSE:Factory at Tue Mar 6 22:55:54 CET 2012. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=kr… 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 lightdm for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package lightdm for openSUSE:12.1:Update:Test checked in at 2012-03-06 16:02:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/lightdm (Old) and /work/SRC/openSUSE:12.1:Update:Test/.lightdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lightdm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/lightdm/lightdm.changes 2011-11-24 20:15:19.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.lightdm.new/lightdm.changes 2012-03-06 16:02:17.000000000 +0100 @@ -1,0 +2,16 @@ +Fri Mar 2 11:10:07 UTC 2012 - gber(a)opensuse.org + +- update to version 1.0.9 + - stop file descriptors leaking into the session processes + (bnc#745339, lp#927060, CVE-2012-1111) + - fix compilation against gthread + - change session directory once user permissions are set so it + works on NFS filesystems that don't allow root to access files + - fix object cleanup on exit + - fix lightdm --debug not working on newer GLib + - drop privileges when reading ~/.dmrc (CVE-2011-3153) + - fix crash calling lightdm_get_layout +- drop lightdm-CVE-2011-3153.patch which has been included upstream +- no need to own %{_libexecdir}/X11/ + +------------------------------------------------------------------- Old: ---- lightdm-1.0.6.tar.gz lightdm-CVE-2011-3153.patch New: ---- lightdm-1.0.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm.spec ++++++ --- /var/tmp/diff_new_pack.BAOE9Q/_old 2012-03-06 16:02:17.000000000 +0100 +++ /var/tmp/diff_new_pack.BAOE9Q/_new 2012-03-06 16:02:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package lightdm # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Guido Berhoerster. # # All modifications and additions to the file contributed by third parties @@ -23,11 +23,11 @@ %define qt_lib lib%{qt_libname}-0 Name: lightdm -Version: 1.0.6 -Release: 1 +Version: 1.0.9 +Release: 0 Summary: Lightweight, Cross-desktop Display Manager +License: GPL-3.0+ Group: System/X11/Displaymanagers -License: GPLv3+ Url: http://www.freedesktop.org/wiki/Software/LightDM Source0: %{name}-%{version}.tar.gz Source1: %{name}.pamd @@ -50,29 +50,27 @@ Patch7: lightdm-lock-screen-before-switch.patch # PATCH-FIX-UPSTREAM lightdm-remove-xauthority-ownership-fix.patch gber(a)opensuse.org -- Remove the code correcting the ownership of .Xauthority files, it is still not secure and the buggy LightDM version writing .Xauthority as root never was in a released openSUSE version anyway Patch8: lightdm-remove-xauthority-ownership-fix.patch -# PATCH-FIX-UPSTREAM lightdm-CVE-2011-3153.patch prusnak(a)opensuse.org -- fix vulnerability when reading .dmrc file -Patch9: lightdm-CVE-2011-3153.patch +BuildRequires: gcc-c++ +BuildRequires: gnome-common +BuildRequires: gtk-doc +BuildRequires: intltool +BuildRequires: pam-devel +BuildRequires: vala +BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(xcb) -BuildRequires: pkgconfig(xdmcp) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libxklavier) BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(QtGui) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: gcc-c++ -BuildRequires: vala -BuildRequires: pam-devel -BuildRequires: intltool -BuildRequires: gtk-doc -BuildRequires: gnome-common +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xdmcp) Requires(pre): pwdutils # 3rd party greeters don't have to follow # the same versioning of lightdm -Requires: lightdm-greeter Requires: ConsoleKit-x11 Requires: gdmflexiserver +Requires: lightdm-greeter Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -130,8 +128,8 @@ Requires(post): update-alternatives Requires(postun):update-alternatives Recommends: gnome-themes-accessibility -Requires: %{name} = %{version} Requires: %{gobject_lib} = %{version} +Requires: %{name} = %{version} Requires: %{name}-gtk-greeter-branding = %{version} Provides: lightdm-greeter = %{version} @@ -178,7 +176,6 @@ %patch5 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 %build ./autogen.sh @@ -267,7 +264,6 @@ %config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf %dir %{_sysconfdir}/apparmor.d/ %{_sysconfdir}/apparmor.d/lightdm-guest-session -%dir %{_libexecdir}/X11/ %dir %{_libexecdir}/X11/displaymanagers/ %{_libexecdir}/X11/displaymanagers/lightdm %dir %{_datadir}/xgreeters/ ++++++ lightdm-1.0.6.tar.gz -> lightdm-1.0.9.tar.gz ++++++ ++++ 8713 lines of diff (skipped) ++++++ lightdm-set-gdmflexiserver-envvar.patch ++++++ --- /var/tmp/diff_new_pack.BAOE9Q/_old 2012-03-06 16:02:18.000000000 +0100 +++ /var/tmp/diff_new_pack.BAOE9Q/_new 2012-03-06 16:02:18.000000000 +0100 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent ba843deea04ac9f614338045d71e362fd92127bc +# Parent aea22cc6a9e4a9e6becbefa3ae7945b5a74d7802 set the GDMFLEXISERVER environment variable for the gdmflexiserver wrapper diff --git a/src/session.c b/src/session.c @@ -13,7 +13,7 @@ session_set_env (session, "USERNAME", user_get_name (user)); // FIXME: Is this required? -@@ -455,7 +456,7 @@ session_run (Process *process) +@@ -458,7 +459,7 @@ session_run (Process *process) pam_session_setup (session->priv->authentication); set_env_from_authentication (session, session->priv->authentication); set_locale (session); ++++++ lightdm-sysconfig-support.patch ++++++ --- /var/tmp/diff_new_pack.BAOE9Q/_old 2012-03-06 16:02:18.000000000 +0100 +++ /var/tmp/diff_new_pack.BAOE9Q/_new 2012-03-06 16:02:18.000000000 +0100 @@ -51,7 +51,7 @@ diff --git a/src/display.c b/src/display.c --- a/src/display.c +++ b/src/display.c -@@ -887,7 +887,10 @@ static void +@@ -881,7 +881,10 @@ static void display_init (Display *display) { display->priv = G_TYPE_INSTANCE_GET_PRIVATE (display, DISPLAY_TYPE, DisplayPrivate); @@ -74,7 +74,7 @@ #include "display-manager.h" #include "xdmcp-server.h" #include "vnc-server.h" -@@ -61,6 +62,117 @@ typedef struct +@@ -60,6 +61,117 @@ typedef struct #define LIGHTDM_BUS_NAME "org.freedesktop.DisplayManager" @@ -190,9 +190,9 @@ +} + static void - log_cb (const gchar *log_domain, GLogLevelFlags log_level, - const gchar *message, gpointer data) -@@ -1139,6 +1251,9 @@ main (int argc, char **argv) + log_cb (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer data) + { +@@ -1134,6 +1246,9 @@ main (int argc, char **argv) g_mkdir_with_parents (dir, S_IRWXU | S_IXGRP | S_IXOTH); g_free (dir); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit icecast for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package icecast for openSUSE:12.1:Update:Test checked in at 2012-03-06 16:00:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/icecast (Old) and /work/SRC/openSUSE:12.1:Update:Test/.icecast.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icecast", Maintainer is "tiwai(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/icecast/icecast.changes 2012-03-06 16:00:38.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.icecast.new/icecast.changes 2012-03-06 16:00:39.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 5 18:13:43 CET 2012 - tiwai(a)suse.de + +- Fix VUL-1: icecast log injection (CVE-2011-4612, bnc#737255) + +------------------------------------------------------------------- New: ---- icecast-2.3.2-CVE-2011-4612.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icecast.spec ++++++ --- /var/tmp/diff_new_pack.iDfB7p/_old 2012-03-06 16:00:39.000000000 +0100 +++ /var/tmp/diff_new_pack.iDfB7p/_new 2012-03-06 16:00:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package icecast # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,27 +16,27 @@ # - Name: icecast Version: 2.3.2 -Release: 62 -License: GPLv2+ +Release: 0 Summary: Audio Streaming Server -Url: http://www.icecast.org/ +License: GPL-2.0+ Group: Productivity/Networking/Web/Servers +Url: http://www.icecast.org/ Source: %{name}-%{version}.tar.bz2 Source1: icecast.init # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: icecast-2.3.1_runas_icecast_user.patch # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: icecast-fix-no-add-needed.patch +Patch2: icecast-2.3.2-CVE-2011-4612.diff BuildRequires: curl-devel BuildRequires: libtheora-devel +BuildRequires: libtool BuildRequires: libvorbis-devel BuildRequires: libxslt-devel -BuildRequires: libtool -BuildRequires: speex-devel BuildRequires: openssl-devel +BuildRequires: speex-devel PreReq: %fillup_prereq PreReq: %insserv_prereq PreReq: /usr/sbin/groupadd @@ -51,6 +51,7 @@ %setup -q %patch0 %patch1 +%patch2 -p1 %build autoreconf -fiv ++++++ icecast-2.3.2-CVE-2011-4612.diff ++++++ --- src/fserve.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) --- a/src/fserve.c +++ b/src/fserve.c @@ -395,6 +395,19 @@ int fserve_client_create (client_t *http int xspf_requested = 0, xspf_file_available = 1; ice_config_t *config; FILE *file; + char *filtered_path, *p; + + /* strip \r and \n from path string; it's duplicated, so it must be + * freed at return + */ + filtered_path = strdup(path); + if (!filtered_path) + return -1; + for (p = filtered_path; *p; p++) { + if (*p == '\r' || *p == '\n') + *p = '_'; + } + path = filtered_path; fullpath = util_get_path_from_normalised_uri (path); INFO2 ("checking for file %s (%s)", path, fullpath); @@ -414,6 +427,7 @@ int fserve_client_create (client_t *http WARN2 ("req for file \"%s\" %s", fullpath, strerror (errno)); client_send_404 (httpclient, "The file you requested could not be found"); free (fullpath); + free (filtered_path); return -1; } m3u_file_available = 0; @@ -462,6 +476,7 @@ int fserve_client_create (client_t *http fserve_add_client (httpclient, NULL); free (sourceuri); free (fullpath); + free (filtered_path); return 0; } if (xspf_requested && xspf_file_available == 0) @@ -475,6 +490,8 @@ int fserve_client_create (client_t *http free (reference); admin_send_response (doc, httpclient, TRANSFORMED, "xspf.xsl"); xmlFreeDoc(doc); + free (fullpath); + free (filtered_path); return 0; } @@ -486,6 +503,7 @@ int fserve_client_create (client_t *http client_send_404 (httpclient, "The file you requested could not be found"); config_release_config(); free (fullpath); + free (filtered_path); return -1; } config_release_config(); @@ -495,6 +513,7 @@ int fserve_client_create (client_t *http client_send_404 (httpclient, "The file you requested could not be found"); WARN1 ("found requested file but there is no handler for it: %s", fullpath); free (fullpath); + free (filtered_path); return -1; } @@ -504,6 +523,7 @@ int fserve_client_create (client_t *http WARN1 ("Problem accessing file \"%s\"", fullpath); client_send_404 (httpclient, "File not readable"); free (fullpath); + free (filtered_path); return -1; } free (fullpath); @@ -594,6 +614,7 @@ int fserve_client_create (client_t *http stats_event_inc (NULL, "file_connections"); fserve_add_client (httpclient, file); + free (filtered_path); return 0; @@ -603,6 +624,7 @@ fail: sock_write (httpclient->con->sock, "HTTP/1.0 416 Request Range Not Satisfiable\r\n\r\n"); client_destroy (httpclient); + free (filtered_path); return -1; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit icecast for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package icecast for openSUSE:12.1:Update:Test checked in at 2012-03-06 16:00:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/icecast (Old) and /work/SRC/openSUSE:12.1:Update:Test/.icecast.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icecast", Maintainer is "tiwai(a)suse.com" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.icecast.new/icecast.changes 2012-03-06 16:00:38.000000000 +0100 @@ -0,0 +1,93 @@ +------------------------------------------------------------------- +Sat Oct 15 04:47:10 UTC 2011 - coolo(a)suse.com + +- add libtool as buildrequire to make the spec file more reliable + +------------------------------------------------------------------- +Mon Aug 29 16:19:14 UTC 2011 - crrodriguez(a)opensuse.org + +- Fix build with --no-add-needed +- Enable SSL support. + +------------------------------------------------------------------- +Wed Jun 18 17:16:29 CEST 2008 - tiwai(a)suse.de + +- updated to version 2.3.2: + * Character set support + * Authentication improvements + * Listening socket update + * XSL update + * Updates for stream directory handling. + * Updates for Win32. + * Accept/Ban IP support. + * A Mountpoint is exported to the slaves even if no mount + section is defined for it. + * Relays handle redirection (HTTP 302) if one is received at + startup. + * Automatically generate XSPF playlist like we do with M3U, the + mountpoint extension is .xspf + * Header updates for proxy handling and certain clients like + some shoutcast source clients and flash players. + * Added Kate/Skeleton codecs to Ogg handler. + * Various stats cleanups. + * The streamlist passed from master to slave had a limited + length + * Documentation updates. + * Relay startup/shutdown is cleaner. + * several build cleanups. + * several resource leaks and race conditions fixed + +------------------------------------------------------------------- +Fri Feb 2 12:49:43 CET 2007 - mmarek(a)suse.cz + +- fix build with curl-7.16 +- fixed more comparison with string literals by using static char* + variables instead of #defines to string constans to detect + whether a default or malloced value is used + +------------------------------------------------------------------- +Tue Dec 19 15:35:28 CET 2006 - tiwai(a)suse.de + +- fix comparison of string literal in cfgfile.c (#226380). + +------------------------------------------------------------------- +Wed Oct 11 03:22:10 CEST 2006 - tiwai(a)suse.de + +- added icecast-2.3.1_runas_icecast_user.patch: + run icecast as "icecast" user and group by default +- added init script +- added log/home dir to the fileist +- dont run suse_update_config/autoreconf seems unneeded. + (tested with the buildservice on 10.0->Factory) +- replaced manual configure call with %configure + +------------------------------------------------------------------- +Wed Jan 25 21:36:33 CET 2006 - mls(a)suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Mon Dec 12 18:41:56 CET 2005 - tiwai(a)suse.de + +- fix the log directory of the sample xml file (#137965). + +------------------------------------------------------------------- +Fri Dec 2 16:10:16 CET 2005 - tiwai(a)suse.de + +- updated to version 2.3.1. + +------------------------------------------------------------------- +Sat Oct 15 15:22:41 CEST 2005 - max(a)suse.de + +- Enabled support for ogg/speex and ogg/theora streams. + +------------------------------------------------------------------- +Fri Oct 7 17:28:19 CEST 2005 - stark(a)suse.de + +- update to version 2.3.0 + +------------------------------------------------------------------- +Tue Jun 14 12:52:08 CEST 2005 - tiwai(a)suse.de + +- repackaged - initial version: 2.2.0. + New: ---- _link icecast-2.3.1_runas_icecast_user.patch icecast-2.3.2.tar.bz2 icecast-fix-no-add-needed.patch icecast.changes icecast.init icecast.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icecast.spec ++++++ # # spec file for package icecast # # Copyright (c) 2011 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/ # Name: icecast Version: 2.3.2 Release: 62 License: GPLv2+ Summary: Audio Streaming Server Url: http://www.icecast.org/ Group: Productivity/Networking/Web/Servers Source: %{name}-%{version}.tar.bz2 Source1: icecast.init # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: icecast-2.3.1_runas_icecast_user.patch # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: icecast-fix-no-add-needed.patch BuildRequires: curl-devel BuildRequires: libtheora-devel BuildRequires: libvorbis-devel BuildRequires: libxslt-devel BuildRequires: libtool BuildRequires: speex-devel BuildRequires: openssl-devel PreReq: %fillup_prereq PreReq: %insserv_prereq PreReq: /usr/sbin/groupadd PreReq: /usr/sbin/useradd BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Icecast is a MP3 and OGG streaming server able to serve many clients with MP3 and OGG audio. %prep %setup -q %patch0 %patch1 %build autoreconf -fiv %configure make %install %make_install rm -rf %{buildroot}%{_datadir}/doc/%{name} # init script install -d -m 0755 %{buildroot}%{_sbindir} install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{name} ln -s -f %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} # create missing dirs install -d -m 0755 %{buildroot}%{_localstatedir}/{lib,log}/%{name} %clean [ %{buildroot} != "/" -a -d %{buildroot} ] && rm -rf %{buildroot} %pre /usr/sbin/groupadd -r %{name} &>/dev/null || : /usr/sbin/useradd -o -g %{name} -s /bin/false -r -c "Icecast streaming server" -d %{_localstatedir}/lib/%{name} %{name} &>/dev/null || : %post %fillup_and_insserv %{name} %preun %stop_on_removal %{name} %postun %restart_on_update %{name} %insserv_cleanup %files %defattr(-,root,root) %doc README AUTHORS COPYING NEWS TODO ChangeLog %doc doc/*.html %doc doc/*.jpg %doc doc/*.css %doc conf/*.dist %config(noreplace) %attr(640,root,%{name}) %{_sysconfdir}/%{name}.xml %{_bindir}/icecast %{_datadir}/icecast %{_sbindir}/rc%{name} %{_sysconfdir}/init.d/%{name} # TODO: enable chroot support in this dir %{_localstatedir}/lib/%{name} %attr(755,%{name},%{name}) %{_localstatedir}/log/%{name} %changelog ++++++ _link ++++++ <link project="openSUSE:12.1" baserev="18ea128e191b0e81d37092d5acc80bc5"> <patches> <branch/> </patches> </link> ++++++ icecast-2.3.1_runas_icecast_user.patch ++++++ --- conf/icecast_minimal.xml.in.orig +++ conf/icecast_minimal.xml.in @@ -32,4 +32,19 @@ <errorlog>error.log</errorlog> <loglevel>3</loglevel>  </logging> + <security> + <chroot>0</chroot> +  + <changeowner> + <user>icecast</user> + <group>icecast</group> + </changeowner> + </security> </icecast> --- conf/icecast_shoutcast_compat.xml.in.orig +++ conf/icecast_shoutcast_compat.xml.in @@ -44,5 +44,17 @@ </logging> <security> <chroot>0</chroot> +  + <changeowner> + <user>icecast</user> + <group>icecast</group> + </changeowner> </security> </icecast> --- conf/icecast_urlauth.xml.in.orig +++ conf/icecast_urlauth.xml.in @@ -43,5 +43,17 @@ </logging> <security> <chroot>0</chroot> +  + <changeowner> + <user>icecast</user> + <group>icecast</group> + </changeowner> </security> </icecast> --- conf/icecast.xml.in.orig +++ conf/icecast.xml.in @@ -165,10 +165,16 @@ <security> <chroot>0</chroot>  <changeowner> - <user>nobody</user> - <group>nogroup</group> + <user>icecast</user> + <group>icecast</group> </changeowner> - --> </security> </icecast> ++++++ icecast-fix-no-add-needed.patch ++++++ --- configure.in.orig +++ configure.in @@ -1,6 +1,7 @@ AC_INIT([Icecast], [2.3.2], [icecast(a)xiph.org]) AC_PREREQ(2.54) +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR(src/main.c) dnl Process this file with autoconf to produce a configure script. @@ -8,7 +9,8 @@ AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE -AC_PROG_CC +AC_PROG_CC_STDC +AC_USE_SYSTEM_EXTENSIONS AC_CANONICAL_HOST AC_PROG_LIBTOOL AC_SYS_LARGEFILE @@ -22,7 +24,6 @@ if test -z "$GCC"; then else XIPH_CPPFLAGS="-Wall -ffast-math -fsigned-char" PROFILE="-pg -g" - AC_DEFINE([_GNU_SOURCE], 1, [Define to include GNU extensions to POSIX]) fi dnl Checks for programs. @@ -49,10 +50,12 @@ AC_SEARCH_LIBS(nanosleep, rt posix4, AC_ XIPH_NET dnl -- configure options -- - +XIPH_PATH_XML XIPH_PATH_XSLT XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$XSLT_CFLAGS]) XIPH_VAR_PREPEND([XIPH_LIBS],[$XSLT_LIBS]) +XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$XML_CFLAGS]) +XIPH_VAR_PREPEND([XIPH_LIBS],[$XML_LIBS]) XIPH_PATH_VORBIS([ XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$VORBIS_CFLAGS]) ++++++ icecast.init ++++++ #!/bin/sh # # Copyright (C) 1995--2005 Kurt Garloff, SUSE / Novell Inc. # # This library is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published by # the Free Software Foundation; either version 2.1 of the License, or (at # your option) any later version. # # This library is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, # USA. # # /etc/init.d/icecast # and its symbolic link # /(usr/)sbin/rcicecast # ### BEGIN INIT INFO # Provides: icecast # Required-Start: $syslog $remote_fs # Should-Start: $time ypbind sendmail # Required-Stop: $syslog $remote_fs # Should-Stop: $time ypbind sendmail # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: icecast2 streaming server # Description: Start icecast2 to stream ogg/mp3 # (The Short-Description should already be a good hint.) ### END INIT INFO # # Any extensions to the keywords given above should be preceeded by # X-VendorTag- (X-UnitedLinux- X-SuSE- for us) according to LSB. # # Notes on Required-Start/Should-Start: # * There are two different issues that are solved by Required-Start # and Should-Start # (a) Hard dependencies: This is used by the runlevel editor to determine # which services absolutely need to be started to make the start of # this service make sense. Example: nfsserver should have # Required-Start: $portmap # Also, required services are started before the dependent ones. # The runlevel editor will warn about such missing hard dependencies # and suggest enabling. During system startup, you may expect an error, # if the dependency is not fulfilled. # (b) Specifying the init script ordering, not real (hard) dependencies. # This is needed by insserv to determine which service should be # started first (and at a later stage what services can be started # in parallel). The tag Should-Start: is used for this. # It tells, that if a service is available, it should be started # before. If not, never mind. # * When specifying hard dependencies or ordering requirements, you can # use names of services (contents of their Provides: section) # or pseudo names starting with a $. The following ones are available # according to LSB (1.1): # $local_fs all local file systems are mounted # (most services should need this!) # $remote_fs all remote file systems are mounted # (note that /usr may be remote, so # many services should Require this!) # $syslog system logging facility up # $network low level networking (eth card, ...) # $named hostname resolution available # $netdaemons all network daemons are running # The $netdaemons pseudo service has been removed in LSB 1.2. # For now, we still offer it for backward compatibility. # These are new (LSB 1.2): # $time the system time has been set correctly # $portmap SunRPC portmapping service available # UnitedLinux extensions: # $ALL indicates that a script should be inserted # at the end # * The services specified in the stop tags # (Required-Stop/Should-Stop) # specify which services need to be still running when this service # is shut down. Often the entries there are just copies or a subset # from the respective start tag. # * Should-Start/Stop are now part of LSB as of 2.0, # formerly SUSE/Unitedlinux used X-UnitedLinux-Should-Start/-Stop. # insserv does support both variants. # * X-UnitedLinux-Default-Enabled: yes/no is used at installation time # (%fillup_and_insserv macro in %post of many RPMs) to specify whether # a startup script should default to be enabled after installation. # It's not used by insserv. # # Note on runlevels: # 0 - halt/poweroff 6 - reboot # 1 - single user 2 - multiuser without network exported # 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) # # Note on script names: # http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html # A registry has been set up to manage the init script namespace. # http://www.lanana.org/ # Please use the names already registered or register one or use a # vendor prefix. # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance ICECAST2_BIN=/usr/bin/icecast test -x $ICECAST2_BIN || { echo "$ICECAST2_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } # Check for existence of needed config file and read it #ICECAST2_CONFIG=/etc/sysconfig/icecast2 #test -r $ICECAST2_CONFIG || { echo "$ICECAST2_CONFIG not existing"; # if [ "$1" = "stop" ]; then exit 0; # else exit 6; fi; } # # Read config #. $ICECAST2_CONFIG # Source LSB init functions # providing start_daemon, killproc, pidofproc, # log_success_msg, log_failure_msg and log_warning_msg. # This is currently not used by UnitedLinux based distributions and # not needed for init scripts for UnitedLinux only. If it is used, # the functions from rc.status should not be sourced or used. #. /lib/lsb/init-functions # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v be verbose in local rc status and clear it afterwards # rc_status -v -r ditto and clear both the local and overall rc status # rc_status -s display "skipped" and exit with status 3 # rc_status -u display "unused" and exit with status 3 # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num> # rc_reset clear both the local and overall rc status # rc_exit exit appropriate to overall rc status # rc_active checks whether a service is activated by symlinks . /etc/rc.status # Reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - user had insufficient privileges # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signaling is not supported) are # considered a success. case "$1" in start) echo -n "Starting icecast2 " ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. /sbin/startproc $ICECAST2_BIN -c /etc/icecast.xml -b # Remember status and be verbose rc_status -v ;; stop) echo -n "Shutting down icecast2 " ## Stop daemon with killproc(8) and if this fails ## killproc sets the return value according to LSB. /sbin/killproc -TERM $ICECAST2_BIN # Remember status and be verbose rc_status -v ;; try-restart|condrestart) ## Do a restart only if the service was active before. ## Note: try-restart is now part of LSB (as of 1.9). ## RH has a similar command named condrestart. if test "$1" = "condrestart"; then echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" fi $0 status if test $? = 0; then $0 restart else rc_reset # Not running is not a failure. fi # Remember status and be quiet rc_status ;; restart) ## Stop the service and regardless of whether it was ## running or not, start it again. $0 stop $0 start # Remember status and be quiet rc_status ;; force-reload) ## Signal the daemon to reload its config. Most daemons ## do this on signal 1 (SIGHUP). ## If it does not support it, restart the service if it ## is running. echo -n "Reload service icecast2 " ## if it supports it: /sbin/killproc -HUP $ICECAST2_BIN #touch /var/run/icecast2.pid rc_status -v ## Otherwise: #$0 try-restart #rc_status ;; reload) ## Like force-reload, but if daemon does not support ## signaling, do nothing (!) # If it supports signaling: echo -n "Reload service icecast2 " /sbin/killproc -HUP $ICECAST2_BIN #touch /var/run/icecast2.pid rc_status -v ## Otherwise if it does not support reload: #rc_failed 3 #rc_status -v ;; status) echo -n "Checking for service icecast2 " ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. # Return value is slightly different for the status command: # 0 - service up and running # 1 - service dead, but /var/run/ pid file exists # 2 - service dead, but /var/lock/ lock file exists # 3 - service not running (unused) # 4 - service status unknown :-( # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # NOTE: checkproc returns LSB compliant status values. /sbin/checkproc $ICECAST2_BIN # NOTE: rc_status knows that we called this init script with # "status" option and adapts its messages accordingly. rc_status -v ;; probe) ## Optional: Probe for the necessity of a reload, print out the ## argument to this init script which is required for a reload. ## Note: probe is not (yet) part of LSB (as of 1.9) test /etc/icecast.xml -nt /var/run/icecast2.pid && echo reload ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" exit 1 ;; esac rc_exit -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnash for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package gnash for openSUSE:12.1:Update:Test checked in at 2012-03-06 16:00:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/gnash (Old) and /work/SRC/openSUSE:12.1:Update:Test/.gnash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnash", Maintainer is "tiwai(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/gnash/gnash.changes 2012-03-06 16:00:11.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.gnash.new/gnash.changes 2012-03-06 16:00:11.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 5 18:08:08 CET 2012 - tiwai(a)suse.de + +- VUL-1: CVE-2011-4328: gnash: Unsafe management of HTTP cookies + (bnc#732324) + +------------------------------------------------------------------- New: ---- gnash-CVE-2011-4328.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnash.spec ++++++ --- /var/tmp/diff_new_pack.H2jd0i/_old 2012-03-06 16:00:11.000000000 +0100 +++ /var/tmp/diff_new_pack.H2jd0i/_new 2012-03-06 16:00:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnash # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -38,9 +38,9 @@ BuildRequires: ffmpeg-devel %endif Version: 0.8.8 -Release: 2 -License: GPLv2+ +Release: 0 Summary: Free Flash movie player +License: GPL-2.0+ Group: Productivity/Networking/Web/Browsers %if %{cvs_date} %define package_version %{version}.cvs%{cvs_date} @@ -53,6 +53,7 @@ # PATCH-FIX-UPSTREAM gnash-0.8.5-build-fixes.diff Patch: gnash-0.8.5-build-fixes.diff Patch1: gnash-fix-insecure-temp-files.diff +Patch2: gnash-CVE-2011-4328.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -66,7 +67,6 @@ of the areas to work on to achieve full version 7 compliance. %package devel -License: GPLv2+ Summary: Gnash include files Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -87,6 +87,7 @@ %endif %patch -p1 %patch1 -p1 +%patch2 -p1 %build autoreconf -fi ++++++ gnash-CVE-2011-4328.diff ++++++ >From 8fc19a890ee787d26200dc1b8b5546e3bb15ac7b Mon Sep 17 00:00:00 2001 From: Gabriele Giacone <1o5g4r8o(a)gmail.com> Date: Thu, 01 Dec 2011 00:59:15 +0000 Subject: CVE-2011-4328 fix. mkstemps and boost::iostreams. See bug #34903 --- --- plugin/npapi/Makefile.am | 1 plugin/npapi/plugin.cpp | 48 +++++++++++++++++++++++++++++++++-------------- 2 files changed, 35 insertions(+), 14 deletions(-) --- a/plugin/npapi/Makefile.am +++ b/plugin/npapi/Makefile.am @@ -70,6 +70,7 @@ libgnashplugin_la_SOURCES = plugin.cpp libgnashplugin_la_LIBADD = \ $(GLIB_LIBS) \ + -lboost_iostreams \ $(NULL) # Scriptable plugin support --- a/plugin/npapi/plugin.cpp +++ b/plugin/npapi/plugin.cpp @@ -75,6 +75,8 @@ #include <boost/tokenizer.hpp> #include <boost/algorithm/string/join.hpp> +#include <boost/iostreams/device/file_descriptor.hpp> +#include <boost/iostreams/stream.hpp> #include <boost/format.hpp> #include <sys/param.h> #include <csignal> @@ -132,6 +134,17 @@ getPluginDescription() return desc; } +boost::iostreams::file_descriptor_sink getfdsink(char mkstemplate[]); + +boost::iostreams::file_descriptor_sink +getfdsink(char mksTemplate[]) +{ + int suffix = std::string(mksTemplate).size() - std::string(mksTemplate).find("XXXXXX") - 6; + int fd = mkstemps (mksTemplate, suffix); + boost::iostreams::file_descriptor_sink fdsink(fd, boost::iostreams::close_handle); + return fdsink; +} + // // general initialization and shutdown // @@ -919,16 +932,17 @@ create_standalone_launcher(const std::st return; } - std::ofstream saLauncher; - - std::stringstream ss; - static int debugno = 0; - debugno = (debugno + 1) % 10; - ss << "/tmp/gnash-debug-" << debugno << ".sh"; - saLauncher.open(ss.str().c_str(), std::ios::out | std::ios::trunc); + char debugname[] = "/tmp/gnash-debug-XXXXXX.sh"; + boost::iostreams::file_descriptor_sink fdsink = getfdsink(debugname); + if (fdsink.handle() == -1) { + gnash::log_error("Failed to create sink: %s", debugname); + return; + } + boost::iostreams::stream<boost::iostreams::file_descriptor_sink> + saLauncher (fdsink); if (!saLauncher) { - gnash::log_error("Failed to open new file for standalone launcher: " + ss.str()); + gnash::log_error("Failed to open new file for standalone launcher: %s", debugname); return; } @@ -951,6 +965,7 @@ create_standalone_launcher(const std::st << std::endl; saLauncher.close(); + fdsink.close(); #endif } @@ -996,15 +1011,20 @@ nsPluginInstance::getCmdLine(int hostfd, std::string ncookie (cookie, length); if (cookie) { gnash::log_debug("The Cookie for %s is %s", url, ncookie); - std::ofstream cookiefile; - std::stringstream ss; - ss << "/tmp/gnash-cookies." << getpid(); - - cookiefile.open(ss.str().c_str(), std::ios::out | std::ios::trunc); + char cookiename[] = "/tmp/gnash-cookies.XXXXXX"; + boost::iostreams::file_descriptor_sink fdsink = getfdsink(cookiename); + if (fdsink.handle() == -1) { + gnash::log_error("Failed to create sink: %s", cookiename); + return arg_vec; + } + boost::iostreams::stream<boost::iostreams::file_descriptor_sink> + cookiefile (fdsink); + cookiefile << "Set-Cookie: " << ncookie << std::endl; cookiefile.close(); + fdsink.close(); - if (setenv("GNASH_COOKIES_IN", ss.str().c_str(), 1) < 0) { + if (setenv("GNASH_COOKIES_IN", cookiename, 1) < 0) { gnash::log_error( "Couldn't set environment variable GNASH_COOKIES_IN to %s", ncookie); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit flash-player for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package flash-player for openSUSE:12.1:Update:Test checked in at 2012-03-06 15:59:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/flash-player (Old) and /work/SRC/openSUSE:12.1:Update:Test/.flash-player.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flash-player", Maintainer is "DMueller(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/flash-player/flash-player.changes 2012-02-16 11:04:14.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.flash-player.new/flash-player.changes 2012-03-06 15:59:57.000000000 +0100 @@ -2 +2,9 @@ -Thu Feb 16 08:53:26 UTC 2012 - meissner(a)suse.com +Tue Mar 6 08:21:31 UTC 2012 - dmueller(a)suse.com + +- Update to 11.1.102.63: (bnc#750614) + http://www.adobe.com/support/security/bulletins/apsb12-05.html + + * CVE-2012-0768, CVE-2012-0769 + +------------------------------------------------------------------- +Thu Feb 16 08:48:11 UTC 2012 - meissner(a)suse.com @@ -8,0 +17,25 @@ + +------------------------------------------------------------------- +Fri Jan 27 22:16:20 CET 2012 - dmueller(a)suse.de + +- fix provides/obsoletes causing arch-conflict + +------------------------------------------------------------------- +Tue Jan 24 18:03:19 CET 2012 - ro(a)suse.de + +- fix macros in specfile + +------------------------------------------------------------------- +Mon Jan 16 13:29:25 CET 2012 - dmueller(a)suse.de + +- provide/obsolete also libflashsupport for sled11-sp1 +- add compat macros that are necessary after the "spec-cleaner run" + +------------------------------------------------------------------- +Wed Dec 28 20:25:09 UTC 2011 - asterios.dramis(a)gmail.com + +- Added a patch (kcm_adobe_flash_player.desktop.patch) to make the KCM module + X-KDE-System-Settings-Parent-Category entry compatible with newer KDE + versions in order to not showup in the "Lost and Found" section. +- Spec-file updates: + * Spec file cleanup based also on spec-cleaner run. Old: ---- flashplayer_11.1.102.62_sa.i386.tar.bz2 install_flash_player_11.1.102.62_linux.i386.tar.bz2 install_flash_player_11.1.102.62_linux.x86_64.tar.bz2 New: ---- flashplayer_11.1.102.63_sa.i386.tar.bz2 install_flash_player_11.1.102.63_linux.i386.tar.bz2 install_flash_player_11.1.102.63_linux.x86_64.tar.bz2 kcm_adobe_flash_player.desktop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flash-player.spec ++++++ --- /var/tmp/diff_new_pack.Sgmz9l/_old 2012-03-06 15:59:58.000000000 +0100 +++ /var/tmp/diff_new_pack.Sgmz9l/_new 2012-03-06 15:59:58.000000000 +0100 @@ -16,148 +16,178 @@ # +%define build_standalone 1 + Name: flash-player -Summary: Adobe Flash PlugIn and standalone Player +Version: 11.1.102.63 +Release: 0 +Summary: Adobe Flash Plugin and Standalone Player License: NON-OSI-COMPLIANT(royalties) Group: Productivity/Networking/Web/Browsers -Url: http://get.adobe.com/de/flashplayer/ -Provides: netscape-plugins -Obsoletes: netscape-plugins -%if %suse_version > 1110 -#flash 10 does not need libflashsupport and using it can cause device conflicts -#just let flash talk with the default alsa plugin - bnc#539656 -Provides: libflashsupport = 1.2 -Obsoletes: libflashsupport <= 1.2 -Provides: libflashsupport-32bit = 1.2 -Obsoletes: libflashsupport-32bit <= 1.2 -%endif -%if %suse_version > 1030 -BuildRequires: update-desktop-files -%endif -%if %suse_version > 1100 -BuildRequires: kde4-filesystem -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%ifarch %ix86 -# flash player dynamically opens that one and segfaults if not available (2008-11-12) -Requires: libcurl.so.4 libasound.so.2 -%endif -%ifarch x86_64 -Requires: libcurl.so.4()(64bit) libasound.so.2()(64bit) -%endif -Version: 11.1.102.62 -Release: 0 +Url: http://get.adobe.com/flashplayer/ %ifarch %ix86 Source0: install_flash_player_%{version}_linux.i386.tar.bz2 -# http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11… Source1: flashplayer_%{version}_sa.i386.tar.bz2 %endif %ifarch x86_64 Source0: install_flash_player_%{version}_linux.x86_64.tar.bz2 Source1: flashplayer_11.1.102.55_sa.x86_64.tar.bz2 %endif -Source2: README -Source3: flashplayer.desktop -Source4: flashplayer.png +Source2: LICENSE +Source3: README +Source4: flashplayer.desktop +Source5: flashplayer.png Source99: update.sh NoSource: 99 -Source5: LICENSE -Patch1: desktop.diff -Provides: flash-plugin = %version -%define build_standalone 1 +# PATCH-FIX-OPENSUSE desktop.diff -- Fix desktop file to be GNOME compatible +Patch0: desktop.diff +# PATCH-FIX-OPENSUSE kcm_adobe_flash_player.desktop.patch asterios.dramis(a)gmail.com -- Make the KCM module X-KDE-System-Settings-Parent-Category entry compatible with newer KDE versions +Patch1: kcm_adobe_flash_player.desktop.patch +%if 0%{?suse_version} > 1100 +BuildRequires: kde4-filesystem +%endif +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif +# flash player dynamically opens that one and segfaults if not available (2008-11-12) +%ifarch %ix86 +Requires: libasound.so.2 +Requires: libcurl.so.4 +%endif +%ifarch x86_64 +Requires: libasound.so.2()(64bit) +Requires: libcurl.so.4()(64bit) +%endif +Provides: flash-plugin = %{version} +%if 0%{?suse_version} >= 1110 +# flash 10 does not need libflashsupport and using it can cause device conflicts +# just let flash talk with the default alsa plugin - bnc#539656 +Provides: libflashsupport = 1.2 +Obsoletes: libflashsupport <= 1.2 +%ifarch x86_64 +Provides: libflashsupport-32bit = 1.2 +Obsoletes: libflashsupport-32bit <= 1.2 +%endif +%endif +Provides: netscape-plugins +Obsoletes: netscape-plugins +BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 -# find all the information about flash player / test page here: -# http://www.adobe.com/software/flash/about/ +%if 0%{!?_kde4_libdir:1} +%define _kde4_libdir %{_libdir} +%endif +%if 0%{!?_kde4_datadir:1} +%define _kde4_datadir %{_datadir} +%endif +%if 0%{!?_kde4_sharedir:1} +%define _kde4_sharedir %{_kde4_datadir}/kde4 +%endif +%if 0%{!?_kde4_modulesdir:1} +%define _kde4_modulesdir %{_kde4_libdir}/kde4 +%endif +%if 0%{!?_kde4_servicesdir:1} +%define _kde4_servicesdir %{_kde4_sharedir}/services +%endif %description This package contains Adobe's Flash Plugin for the supported Web browsers in addition to a standalone flash player application. +%if 0%{?suse_version} > 1100 + +%package gnome +Summary: Adobe Flash Plugin and Standalone Player Settings +Group: Productivity/Networking/Web/Browsers +Requires: %{name} = %{version} +Supplements: packageand(gnome-session:flash-player) + +%description gnome +This package contains Adobe's Flash Plugin Settings for the GNOME desktop. + +%package kde4 +Summary: Adobe Flash Plugin and Standalone Player Settings +Group: Productivity/Networking/Web/Browsers +Requires: %{name} = %{version} +Supplements: packageand(kdebase4-session:flash-player) +%kde4_runtime_requires + +%description kde4 +This package contains Adobe's Flash Plugin Settings for the KDE 4 desktop. + +%endif %prep -%setup -c install_flash_player_10_linux -a 0 -b 1 +%setup -q -c %{name}-%{version} -a 0 -b 1 +%patch0 %patch1 cp %{SOURCE2} . -cp %{SOURCE5} . +cp %{SOURCE3} . %build %install -mkdir -p $RPM_BUILD_ROOT/usr/share/icons +install -Dpm 0755 libflashplayer.so %{buildroot}%{_libdir}/browser-plugins/libflashplayer.so + +mkdir -p %{buildroot}%{_datadir}/icons rm -rf usr/share/icons/hicolor/24x24 -%if %suse_version <= 1100 +%if 0%{?suse_version} <= 1100 rm -rf usr/share/icons/hicolor/*/apps/flash-player-properties.png %endif -cp -a usr/share/icons/* $RPM_BUILD_ROOT/usr/share/icons -%if %suse_version > 1100 +cp -a usr/share/icons/* %{buildroot}%{_datadir}/icons + +%if 0%{?suse_version} > 1100 # KDE frontend -install -D -m 755 usr/%_lib/kde4/kcm_adobe_flash_player.so $RPM_BUILD_ROOT/usr/%_lib/kde4/kcm_adobe_flash_player.so -install -D -m 644 usr/share/kde4/services/kcm_adobe_flash_player.desktop $RPM_BUILD_ROOT/usr/share/kde4/services/kcm_adobe_flash_player.desktop +install -Dpm 0755 usr/%{_lib}/kde4/kcm_adobe_flash_player.so %{buildroot}%{_kde4_modulesdir}/kcm_adobe_flash_player.so +install -Dpm 0644 usr/share/kde4/services/kcm_adobe_flash_player.desktop %{buildroot}%{_kde4_servicesdir}/kcm_adobe_flash_player.desktop # GNOME frontend -install -D -m 755 usr/bin/flash-player-properties $RPM_BUILD_ROOT/usr/bin/flash-player-properties -install -D -m 644 usr/share/applications/flash-player-properties.desktop $RPM_BUILD_ROOT/usr/share/applications/flash-player-properties.desktop +install -Dpm 0755 usr/bin/flash-player-properties %{buildroot}%{_bindir}/flash-player-properties +install -Dpm 0644 usr/share/applications/flash-player-properties.desktop %{buildroot}%{_datadir}/applications/flash-player-properties.desktop %endif + %if %build_standalone -%if %suse_version > 1030 +%if 0%{?suse_version} > 1030 %ifarch %ix86 -install -D -m 755 flashplayer $RPM_BUILD_ROOT/usr/bin/flashplayer -install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/usr/share/applications/flashplayer.desktop -install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/usr/share/pixmaps/flashplayer.png +install -Dpm 0755 flashplayer %{buildroot}%{_bindir}/flashplayer +install -Dpm 0644 %{SOURCE4} %{buildroot}%{_datadir}/applications/flashplayer.desktop +install -Dpm 0644 %{SOURCE5} %{buildroot}%{_datadir}/pixmaps/flashplayer.png %suse_update_desktop_file flashplayer -%suse_update_desktop_file flash-player-properties %endif %endif %endif -install -D -m 755 libflashplayer.so $RPM_BUILD_ROOT/usr/%_lib/browser-plugins/libflashplayer.so - -%if %suse_version > 1100 - -%package kde4 -Summary: Adobe Flash PlugIn and standalone Player -Group: Productivity/Networking/Web/Browsers -Supplements: packageand(kdebase4-session:flash-player) -Requires: flash-player = %version - -%description kde4 -This package contains Adobe's Flash Plugin Settings for the -KDE 4 desktop. - -%files kde4 -%defattr(-,root,root) -/usr/%_lib/kde4/kcm_adobe_flash_player.so -/usr/share/kde4/services/kcm_adobe_flash_player.desktop - -%package gnome -Summary: Adobe Flash PlugIn and standalone Player -Group: Productivity/Networking/Web/Browsers -Supplements: packageand(gnome-session:flash-player) -Requires: flash-player = %version -%description gnome -This package contains Adobe's Flash Plugin Settings for the -GNOME desktop. - -%files gnome -%defattr(-,root,root) -/usr/share/applications/flash-player-properties.desktop -/usr/bin/flash-player-properties +%if 0%{?suse_version} > 1100 +%suse_update_desktop_file flash-player-properties %endif %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc [Rr][eE][aA][dD][Mm][eE]* LICENSE -/usr/%_lib/browser-plugins/* -%if %suse_version > 1020 -/usr/share/icons/hicolor/*x*/apps/flash-player-properties.png +%{_libdir}/browser-plugins/libflashplayer.so +%if 0%{?suse_version} > 1020 +%{_datadir}/icons/hicolor/*x*/apps/flash-player-properties.png %endif %if %build_standalone -%if %suse_version > 1030 +%if 0%{?suse_version} > 1030 %ifarch %ix86 -/usr/bin/flashplayer -/usr/share/applications/flashplayer.desktop -/usr/share/pixmaps/flashplayer.png +%{_bindir}/flashplayer +%{_datadir}/applications/flashplayer.desktop +%{_datadir}/pixmaps/flashplayer.png +%endif %endif %endif + +%if 0%{?suse_version} > 1100 + +%files gnome +%defattr(-,root,root,-) +%{_bindir}/flash-player-properties +%{_datadir}/applications/flash-player-properties.desktop + +%files kde4 +%defattr(-,root,root,-) +%{_kde4_modulesdir}/kcm_adobe_flash_player.so +%{_kde4_servicesdir}/kcm_adobe_flash_player.desktop + %endif %changelog ++++++ _link ++++++ --- /var/tmp/diff_new_pack.Sgmz9l/_old 2012-03-06 15:59:58.000000000 +0100 +++ /var/tmp/diff_new_pack.Sgmz9l/_new 2012-03-06 15:59:58.000000000 +0100 @@ -1,4 +1,4 @@ -<link project="openSUSE:12.1:Update" package="flash-player" baserev="e71df31fac30c6f517f755ade36a828a"> +<link project="openSUSE:12.1:Update" package="flash-player" baserev="6a82160ee1d525143653f10e145bc2d0"> <patches> <branch/> </patches> ++++++ flashplayer_11.1.102.62_sa.i386.tar.bz2 -> flashplayer_11.1.102.63_sa.i386.tar.bz2 ++++++ Files old/flashplayer and new/flashplayer differ ++++++ install_flash_player_11.1.102.62_linux.i386.tar.bz2 -> install_flash_player_11.1.102.63_linux.i386.tar.bz2 ++++++ /work/SRC/openSUSE:12.1:Update:Test/flash-player/install_flash_player_11.1.102.62_linux.i386.tar.bz2 /work/SRC/openSUSE:12.1:Update:Test/.flash-player.new/install_flash_player_11.1.102.63_linux.i386.tar.bz2 differ: char 11, line 1 ++++++ install_flash_player_11.1.102.62_linux.x86_64.tar.bz2 -> install_flash_player_11.1.102.63_linux.x86_64.tar.bz2 ++++++ /work/SRC/openSUSE:12.1:Update:Test/flash-player/install_flash_player_11.1.102.62_linux.x86_64.tar.bz2 /work/SRC/openSUSE:12.1:Update:Test/.flash-player.new/install_flash_player_11.1.102.63_linux.x86_64.tar.bz2 differ: char 11, line 1 ++++++ kcm_adobe_flash_player.desktop.patch ++++++ --- usr/share/kde4/services/kcm_adobe_flash_player.desktop.orig 2011-08-03 09:35:44.000000000 +0300 +++ usr/share/kde4/services/kcm_adobe_flash_player.desktop 2011-08-27 22:00:25.800000030 +0300 @@ -8,7 +8,7 @@ X-KDE-Library=kcm_adobe_flash_player X-KDE-ParentApp=kcontrol -X-KDE-System-Settings-Parent-Category=personal +X-KDE-System-Settings-Parent-Category=personal-information X-KDE-Weight=10 Name=Adobe Flash Player -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit icecast for openSUSE:11.4
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package icecast for openSUSE:11.4 checked in at Tue Mar 6 15:57:45 CET 2012. -------- --- old-versions/11.4/all/icecast/icecast.changes 2008-06-18 17:18:15.000000000 +0200 +++ 11.4/icecast/icecast.changes 2012-03-05 18:07:36.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 5 18:06:58 CET 2012 - tiwai(a)suse.de + +- Fix VUL-1: icecast log injection (CVE-2011-4612, bnc#737255) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/icecast Destination is old-versions/11.4/UPDATES/all/icecast calling whatdependson for 11.4-i586 New: ---- icecast-2.3.2-CVE-2011-4612.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icecast.spec ++++++ --- /var/tmp/diff_new_pack.E2l4Lr/_old 2012-03-06 15:54:05.000000000 +0100 +++ /var/tmp/diff_new_pack.E2l4Lr/_new 2012-03-06 15:54:05.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package icecast (Version 2.3.2) +# spec file for package icecast # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,22 +15,25 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: icecast -BuildRequires: curl-devel libtheora-devel libvorbis-devel libxslt-devel speex-devel +BuildRequires: curl-devel +BuildRequires: libtheora-devel +BuildRequires: libvorbis-devel +BuildRequires: libxslt-devel +BuildRequires: speex-devel PreReq: /usr/sbin/useradd /usr/sbin/groupadd %insserv_prereq %fillup_prereq Summary: Audio Streaming Server -Version: 2.3.2 -Release: 52 +License: GPL-2.0+ Group: Productivity/Networking/Web/Servers -AutoReqProv: on -License: GPL v2 or later +Version: 2.3.2 +Release: 60.<RELEASE61> Url: http://www.icecast.org/ Source: %{name}-%{version}.tar.bz2 Source1: icecast.init Patch: icecast-2.3.1_runas_icecast_user.patch +Patch1: icecast-2.3.2-CVE-2011-4612.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,6 +51,7 @@ %prep %setup %patch +%patch1 -p1 %build %configure ++++++ icecast-2.3.2-CVE-2011-4612.diff ++++++ --- src/fserve.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) --- a/src/fserve.c +++ b/src/fserve.c @@ -395,6 +395,19 @@ int fserve_client_create (client_t *http int xspf_requested = 0, xspf_file_available = 1; ice_config_t *config; FILE *file; + char *filtered_path, *p; + + /* strip \r and \n from path string; it's duplicated, so it must be + * freed at return + */ + filtered_path = strdup(path); + if (!filtered_path) + return -1; + for (p = filtered_path; *p; p++) { + if (*p == '\r' || *p == '\n') + *p = '_'; + } + path = filtered_path; fullpath = util_get_path_from_normalised_uri (path); INFO2 ("checking for file %s (%s)", path, fullpath); @@ -414,6 +427,7 @@ int fserve_client_create (client_t *http WARN2 ("req for file \"%s\" %s", fullpath, strerror (errno)); client_send_404 (httpclient, "The file you requested could not be found"); free (fullpath); + free (filtered_path); return -1; } m3u_file_available = 0; @@ -462,6 +476,7 @@ int fserve_client_create (client_t *http fserve_add_client (httpclient, NULL); free (sourceuri); free (fullpath); + free (filtered_path); return 0; } if (xspf_requested && xspf_file_available == 0) @@ -475,6 +490,8 @@ int fserve_client_create (client_t *http free (reference); admin_send_response (doc, httpclient, TRANSFORMED, "xspf.xsl"); xmlFreeDoc(doc); + free (fullpath); + free (filtered_path); return 0; } @@ -486,6 +503,7 @@ int fserve_client_create (client_t *http client_send_404 (httpclient, "The file you requested could not be found"); config_release_config(); free (fullpath); + free (filtered_path); return -1; } config_release_config(); @@ -495,6 +513,7 @@ int fserve_client_create (client_t *http client_send_404 (httpclient, "The file you requested could not be found"); WARN1 ("found requested file but there is no handler for it: %s", fullpath); free (fullpath); + free (filtered_path); return -1; } @@ -504,6 +523,7 @@ int fserve_client_create (client_t *http WARN1 ("Problem accessing file \"%s\"", fullpath); client_send_404 (httpclient, "File not readable"); free (fullpath); + free (filtered_path); return -1; } free (fullpath); @@ -594,6 +614,7 @@ int fserve_client_create (client_t *http stats_event_inc (NULL, "file_connections"); fserve_add_client (httpclient, file); + free (filtered_path); return 0; @@ -603,6 +624,7 @@ fail: sock_write (httpclient->con->sock, "HTTP/1.0 416 Request Range Not Satisfiable\r\n\r\n"); client_destroy (httpclient); + free (filtered_path); return -1; } continue with "q"... 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 gnash for openSUSE:11.4
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package gnash for openSUSE:11.4 checked in at Tue Mar 6 15:53:56 CET 2012. -------- --- old-versions/11.4/all/gnash/gnash.changes 2011-01-24 12:50:54.000000000 +0100 +++ 11.4/gnash/gnash.changes 2012-03-05 17:40:50.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 5 17:40:18 CET 2012 - tiwai(a)suse.de + +- VUL-1: CVE-2011-4328: gnash: Unsafe management of HTTP cookies + (bnc#732324) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/gnash Destination is old-versions/11.4/UPDATES/all/gnash calling whatdependson for 11.4-i586 New: ---- gnash-CVE-2011-4328.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnash.spec ++++++ --- /var/tmp/diff_new_pack.PPBy11/_old 2012-03-06 15:53:18.000000000 +0100 +++ /var/tmp/diff_new_pack.PPBy11/_new 2012-03-06 15:53:18.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnash # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -37,9 +37,9 @@ BuildRequires: ffmpeg-devel %endif Version: 0.8.8 -Release: 2 -License: GPLv2+ +Release: 6.<RELEASE7> Summary: Free Flash movie player +License: GPL-2.0+ Group: Productivity/Networking/Web/Browsers %if %{cvs_date} %define package_version %{version}.cvs%{cvs_date} @@ -52,6 +52,7 @@ # PATCH-FIX-UPSTREAM gnash-0.8.5-build-fixes.diff Patch: gnash-0.8.5-build-fixes.diff Patch1: gnash-fix-insecure-temp-files.diff +Patch2: gnash-CVE-2011-4328.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -65,7 +66,7 @@ of the areas to work on to achieve full version 7 compliance. %package devel -License: GPLv2+ + Summary: Gnash include files Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -86,6 +87,7 @@ %endif %patch -p1 %patch1 -p1 +%patch2 -p1 %build autoreconf -fi ++++++ gnash-CVE-2011-4328.diff ++++++ >From 8fc19a890ee787d26200dc1b8b5546e3bb15ac7b Mon Sep 17 00:00:00 2001 From: Gabriele Giacone <1o5g4r8o(a)gmail.com> Date: Thu, 01 Dec 2011 00:59:15 +0000 Subject: CVE-2011-4328 fix. mkstemps and boost::iostreams. See bug #34903 --- --- plugin/npapi/Makefile.am | 1 plugin/npapi/plugin.cpp | 48 +++++++++++++++++++++++++++++++++-------------- 2 files changed, 35 insertions(+), 14 deletions(-) --- a/plugin/npapi/Makefile.am +++ b/plugin/npapi/Makefile.am @@ -70,6 +70,7 @@ libgnashplugin_la_SOURCES = plugin.cpp libgnashplugin_la_LIBADD = \ $(GLIB_LIBS) \ + -lboost_iostreams \ $(NULL) # Scriptable plugin support --- a/plugin/npapi/plugin.cpp +++ b/plugin/npapi/plugin.cpp @@ -75,6 +75,8 @@ #include <boost/tokenizer.hpp> #include <boost/algorithm/string/join.hpp> +#include <boost/iostreams/device/file_descriptor.hpp> +#include <boost/iostreams/stream.hpp> #include <boost/format.hpp> #include <sys/param.h> #include <csignal> @@ -132,6 +134,17 @@ getPluginDescription() return desc; } +boost::iostreams::file_descriptor_sink getfdsink(char mkstemplate[]); + +boost::iostreams::file_descriptor_sink +getfdsink(char mksTemplate[]) +{ + int suffix = std::string(mksTemplate).size() - std::string(mksTemplate).find("XXXXXX") - 6; + int fd = mkstemps (mksTemplate, suffix); + boost::iostreams::file_descriptor_sink fdsink(fd, boost::iostreams::close_handle); + return fdsink; +} + // // general initialization and shutdown // @@ -919,16 +932,17 @@ create_standalone_launcher(const std::st return; } - std::ofstream saLauncher; - - std::stringstream ss; - static int debugno = 0; - debugno = (debugno + 1) % 10; - ss << "/tmp/gnash-debug-" << debugno << ".sh"; - saLauncher.open(ss.str().c_str(), std::ios::out | std::ios::trunc); + char debugname[] = "/tmp/gnash-debug-XXXXXX.sh"; + boost::iostreams::file_descriptor_sink fdsink = getfdsink(debugname); + if (fdsink.handle() == -1) { + gnash::log_error("Failed to create sink: %s", debugname); + return; + } + boost::iostreams::stream<boost::iostreams::file_descriptor_sink> + saLauncher (fdsink); if (!saLauncher) { - gnash::log_error("Failed to open new file for standalone launcher: " + ss.str()); + gnash::log_error("Failed to open new file for standalone launcher: %s", debugname); return; } @@ -951,6 +965,7 @@ create_standalone_launcher(const std::st << std::endl; saLauncher.close(); + fdsink.close(); #endif } @@ -996,15 +1011,20 @@ nsPluginInstance::getCmdLine(int hostfd, std::string ncookie (cookie, length); if (cookie) { gnash::log_debug("The Cookie for %s is %s", url, ncookie); - std::ofstream cookiefile; - std::stringstream ss; - ss << "/tmp/gnash-cookies." << getpid(); - - cookiefile.open(ss.str().c_str(), std::ios::out | std::ios::trunc); + char cookiename[] = "/tmp/gnash-cookies.XXXXXX"; + boost::iostreams::file_descriptor_sink fdsink = getfdsink(cookiename); + if (fdsink.handle() == -1) { + gnash::log_error("Failed to create sink: %s", cookiename); + return arg_vec; + } + boost::iostreams::stream<boost::iostreams::file_descriptor_sink> + cookiefile (fdsink); + cookiefile << "Set-Cookie: " << ncookie << std::endl; cookiefile.close(); + fdsink.close(); - if (setenv("GNASH_COOKIES_IN", ss.str().c_str(), 1) < 0) { + if (setenv("GNASH_COOKIES_IN", cookiename, 1) < 0) { gnash::log_error( "Couldn't set environment variable GNASH_COOKIES_IN to %s", ncookie); continue with "q"... 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 xorg-x11-server for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2012-03-06 14:07:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-server", Maintainer is "sndirsch(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2012-02-17 12:11:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2012-03-06 14:07:22.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 28 21:39:17 UTC 2012 - sndirsch(a)suse.com + +- fixed buildreqs due to reorganization of libvnc/vncproto + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.Ok8TXd/_old 2012-03-06 14:07:27.000000000 +0100 +++ /var/tmp/diff_new_pack.Ok8TXd/_new 2012-03-06 14:07:27.000000000 +0100 @@ -36,6 +36,7 @@ %endif %if %vnc BuildRequires: libjpeg-devel +BuildRequires: pkgconfig(vncproto) %endif Url: http://xorg.freedesktop.org/ Version: 7.6_%{dirsuffix} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit swig for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package swig for openSUSE:Factory checked in at 2012-03-06 14:07:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swig (Old) and /work/SRC/openSUSE:Factory/.swig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "swig", Maintainer is "MMarek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/swig/swig.changes 2011-12-15 16:08:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.swig.new/swig.changes 2012-03-06 14:07:13.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Mar 6 09:15:47 UTC 2012 - kkaempf(a)suse.com + +- fix SLES 10 build, disable failing test (bnc#750618) + +------------------------------------------------------------------- +Mon Mar 5 13:19:56 UTC 2012 - kkaempf(a)suse.com + +- fix build, add Group field to subpackages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swig.spec ++++++ --- /var/tmp/diff_new_pack.N8wsb3/_old 2012-03-06 14:07:19.000000000 +0100 +++ /var/tmp/diff_new_pack.N8wsb3/_new 2012-03-06 14:07:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package swig # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,6 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: swig BuildRequires: boost-devel BuildRequires: gcc-c++ @@ -80,6 +82,7 @@ %package doc Summary: SWIG Manual License: BSD-3-Clause +Group: Documentation/Man Requires: swig %if 0%{?suse_version} >= 1120 BuildArch: noarch @@ -100,6 +103,7 @@ %package examples Summary: SWIG example files License: BSD-3-Clause +Group: Documentation/Howto Requires: swig %description examples @@ -137,6 +141,12 @@ %if 0%{?sles_version} != 9 # This test is buggy on x86-64 rm -f Examples/test-suite/python/li_boost_shared_ptr_runme.py +%if 0%{?suse_version} == 1010 +%ifarch x86_64 +# This test fails on SLES 10 SP3+SP4 on 64bit (bnc#750618) +rm -f Examples/test-suite/ruby/newobject1_runme.rb +%endif +%endif make check %endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ruby for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package ruby for openSUSE:Factory checked in at 2012-03-06 14:07:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby (Old) and /work/SRC/openSUSE:Factory/.ruby.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ruby", Maintainer is "MRueckert(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/ruby/ruby.changes 2011-12-06 18:02:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ruby.new/ruby.changes 2012-03-06 14:07:07.000000000 +0100 @@ -1,0 +2,23 @@ +Mon Feb 13 10:54:34 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Thu Dec 29 01:40:14 UTC 2011 - mrueckert(a)suse.de + +- update to 1.8.7.p357 + - randomize hash to avoid algorithmic complexity attacks. + CVE-2011-4815 + - initialization of hash_seed to be at the beginning of the + process. + - initialize random seed at first. + - call OpenSSL::Random.seed at the SecureRandom.random_bytes + call. insert separators for array join. patch by Masahiro + Tomita. [ruby-dev:44270] + - mkconfig.rb: fix for continued lines. based on a patch from + Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420]. + - Infinity is greater than any bignum number. [ruby-dev:38672] + - initialize store->ex_data.sk. [ruby-core:28907] + [ruby-core:23971] [ruby-core:18121] + +------------------------------------------------------------------- @@ -7 +30 @@ -Thu Jul 7 13:02:17 UTC 2011 - mrueckert(a)suse.com +Thu Jul 7 13:02:17 UTC 2011 - mrueckert(a)suse.de Old: ---- ruby-1.8.7-p352.tar.bz2 New: ---- ruby-1.8.7-p357.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby.spec ++++++ --- /var/tmp/diff_new_pack.10HTRA/_old 2012-03-06 14:07:10.000000000 +0100 +++ /var/tmp/diff_new_pack.10HTRA/_new 2012-03-06 14:07:10.000000000 +0100 @@ -18,15 +18,15 @@ # norootforbuild Name: ruby -Version: 1.8.7.p352 +Version: 1.8.7.p357 Release: 0 # %define pkg_version 1.8.7 -%define patch_level p352 +%define patch_level p357 %define rb_arch %(echo %{_target_cpu}-linux | sed -e "s/i686/i586/" -e "s/hppa2.0/hppa/" -e "s/ppc/powerpc/") %define rb_ver %(echo %{pkg_version} | sed -e 's/\\\.[0-9]\\\+$//') # -License: GPLv2+ +License: GPL-2.0+ Group: Development/Languages/Ruby # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -116,7 +116,7 @@ Yukihiro Matsumoto <matz(a)netlab.co.jp> %package devel -License: GPLv2+ +License: GPL-2.0+ Group: Development/Languages/Ruby Summary: Development files to link against Ruby Requires: %{name} = %{version} @@ -134,7 +134,7 @@ Yukihiro Matsumoto <matz(a)netlab.co.jp> %package tk -License: GPLv2+ +License: GPL-2.0+ Group: Development/Languages/Ruby Summary: TCL/TK bindings for Ruby Requires: %{name} = %{version} @@ -148,7 +148,7 @@ Yukihiro Matsumoto <matz(a)netlab.co.jp> %package doc-ri -License: GPLv2+ +License: GPL-2.0+ Group: Development/Languages/Ruby Summary: Ruby Interactive Documentation Requires: %{name} = %{version} @@ -165,7 +165,7 @@ Yukihiro Matsumoto <matz(a)netlab.co.jp> %package doc-html -License: GPLv2+ +License: GPL-2.0+ Group: Development/Languages/Ruby Summary: This package contains the HTML docs for ruby Requires: %{name} = %{version} @@ -182,7 +182,7 @@ Yukihiro Matsumoto <matz(a)netlab.co.jp> %package examples -License: GPLv2+ +License: GPL-2.0+ Group: Development/Languages/Ruby Requires: %{name} = %{version} Summary: Example scripts for ruby @@ -196,7 +196,7 @@ Yukihiro Matsumoto <matz(a)netlab.co.jp> %package test-suite -License: GPLv2+ +License: GPL-2.0+ Group: Development/Languages/Ruby Requires: %{name} = %{version} Summary: An Interpreted Object-Oriented Scripting Language ++++++ ruby-1.8.7-p352.tar.bz2 -> ruby-1.8.7-p357.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-1.8.7-p352/ChangeLog new/ruby-1.8.7-p357/ChangeLog --- old/ruby-1.8.7-p352/ChangeLog 2011-06-30 05:53:30.000000000 +0200 +++ new/ruby-1.8.7-p357/ChangeLog 2011-12-28 13:47:15.000000000 +0100 @@ -1,3 +1,54 @@ +Wed Dec 28 21:34:23 2011 URABE Shyouhei <shyouhei(a)ruby-lang.org> + + * string.c (rb_str_hash): randomize hash to avoid algorithmic + complexity attacks. CVE-2011-4815 + + * st.c (strhash): ditto. + + * string.c (Init_String): initialization of hash_seed to be at the + beginning of the process. + + * st.c (Init_st): ditto. + +Thu Dec 8 11:57:04 2011 Tanaka Akira <akr(a)fsij.org> + + * inits.c (rb_call_inits): call Init_RandomSeed at first. + + * random.c (seed_initialized): defined. + (fill_random_seed): extracted from random_seed. + (make_seed_value): extracted from random_seed. + (rb_f_rand): initialize random seed at first. + (initial_seed): defined. + (Init_RandomSeed): defined. + (Init_RandomSeed2): defined. + (rb_reset_random_seed): defined. + (Init_Random): call Init_RandomSeed2. + +Sat Dec 10 20:44:23 2011 Tanaka Akira <akr(a)fsij.org> + + * lib/securerandom.rb: call OpenSSL::Random.seed at the + SecureRandom.random_bytes call. + insert separators for array join. + patch by Masahiro Tomita. [ruby-dev:44270] + +Mon Oct 17 04:20:22 2011 Nobuyoshi Nakada <nobu(a)ruby-lang.org> + + * mkconfig.rb: fix for continued lines. based on a patch from + Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420]. + +Mon Oct 17 04:19:39 2011 Yukihiro Matsumoto <matz(a)ruby-lang.org> + + * numeric.c (flo_cmp): Infinity is greater than any bignum + number. [ruby-dev:38672] + + * bignum.c (rb_big_cmp): ditto. + +Mon Oct 17 03:56:12 2011 Yusuke Endoh <mame(a)tsg.ne.jp> + + * ext/openssl/ossl_x509store.c (ossl_x509store_initialize): initialize + store->ex_data.sk. [ruby-core:28907] [ruby-core:23971] + [ruby-core:18121] + Thu Jun 30 12:52:56 2011 WATANABE Hirofumi <eban(a)ruby-lang.org> * ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw. @@ -80,7 +131,7 @@ Mon May 30 10:58:17 2011 Hiroshi Nakamura <nahi(a)ruby-lang.org> * lib/logger.rb (Logger::ProgName): do not depend on subversion - keyword ($Id: ChangeLog 32320 2011-06-30 03:53:30Z shyouhei $). ProgName with revision number was written in the + keyword ($Id: ChangeLog 34151 2011-12-28 12:47:15Z shyouhei $). ProgName with revision number was written in the header line of each logfile for ease of tracking what version user is using in troubleshooting. Logger is already stable enough. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-1.8.7-p352/bignum.c new/ruby-1.8.7-p357/bignum.c --- old/ruby-1.8.7-p352/bignum.c 2010-06-08 10:42:55.000000000 +0200 +++ new/ruby-1.8.7-p357/bignum.c 2011-12-10 13:17:27.000000000 +0100 @@ -3,7 +3,7 @@ bignum.c - $Author: shyouhei $ - $Date: 2010-06-08 17:42:55 +0900 (Tue, 08 Jun 2010) $ + $Date: 2011-12-10 21:17:27 +0900 (Sat, 10 Dec 2011) $ created at: Fri Jun 10 00:48:55 JST 1994 Copyright (C) 1993-2003 Yukihiro Matsumoto @@ -1114,7 +1114,15 @@ break; case T_FLOAT: - return rb_dbl_cmp(rb_big2dbl(x), RFLOAT(y)->value); + { + double a = RFLOAT_VALUE(y); + + if (isinf(a)) { + if (a > 0.0) return INT2FIX(-1); + else return INT2FIX(1); + } + return rb_dbl_cmp(rb_big2dbl(x), a); + } default: return rb_num_coerce_cmp(x, y); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-1.8.7-p352/ext/openssl/ossl_x509store.c new/ruby-1.8.7-p357/ext/openssl/ossl_x509store.c --- old/ruby-1.8.7-p352/ext/openssl/ossl_x509store.c 2008-05-29 19:45:47.000000000 +0200 +++ new/ruby-1.8.7-p357/ext/openssl/ossl_x509store.c 2011-12-10 13:17:23.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: ossl_x509store.c 16691 2008-05-29 17:45:47Z knu $ + * $Id: ossl_x509store.c 33999 2011-12-10 12:17:23Z shyouhei $ * 'OpenSSL for Ruby' project * Copyright (C) 2001-2002 Michal Rokos <m.rokos(a)sh.cvut.cz> * All rights reserved. @@ -131,6 +131,7 @@ /* BUG: This method takes any number of arguments but appears to ignore them. */ GetX509Store(self, store); + store->ex_data.sk = NULL; X509_STORE_set_verify_cb_func(store, ossl_verify_cb); ossl_x509store_set_vfy_cb(self, Qnil); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-1.8.7-p352/inits.c new/ruby-1.8.7-p357/inits.c --- old/ruby-1.8.7-p352/inits.c 2008-04-09 13:13:04.000000000 +0200 +++ new/ruby-1.8.7-p357/inits.c 2011-12-28 13:47:15.000000000 +0100 @@ -2,8 +2,8 @@ inits.c - - $Author: knu $ - $Date: 2008-04-09 20:13:04 +0900 (Wed, 09 Apr 2008) $ + $Author: shyouhei $ + $Date: 2011-12-28 21:47:15 +0900 (Wed, 28 Dec 2011) $ created at: Tue Dec 28 16:01:58 JST 1993 Copyright (C) 1993-2003 Yukihiro Matsumoto @@ -38,6 +38,7 @@ void Init_sym _((void)); void Init_process _((void)); void Init_Random _((void)); +void Init_RandomSeed _((void)); void Init_Range _((void)); void Init_Regexp _((void)); void Init_signal _((void)); @@ -46,10 +47,13 @@ void Init_Time _((void)); void Init_var_tables _((void)); void Init_version _((void)); +void Init_st _((void)); void rb_call_inits() { + Init_RandomSeed(); + Init_st(); Init_sym(); Init_var_tables(); Init_Object(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-1.8.7-p352/lib/securerandom.rb new/ruby-1.8.7-p357/lib/securerandom.rb --- old/ruby-1.8.7-p352/lib/securerandom.rb 2011-06-16 16:22:36.000000000 +0200 +++ new/ruby-1.8.7-p357/lib/securerandom.rb 2011-12-10 13:17:33.000000000 +0100 @@ -50,12 +50,12 @@ def self.random_bytes(n=nil) n ||= 16 if defined? OpenSSL::Random - @pid = $$ if !defined?(@pid) + @pid = 0 if !defined?(@pid) pid = $$ if @pid != pid now = Time.now ary = [now.to_i, now.usec, @pid, pid] - OpenSSL::Random.seed(ary.to_s) + OpenSSL::Random.seed(ary.join('.')) @pid = pid end return OpenSSL::Random.random_bytes(n) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-1.8.7-p352/mkconfig.rb new/ruby-1.8.7-p357/mkconfig.rb --- old/ruby-1.8.7-p352/mkconfig.rb 2010-11-24 08:38:41.000000000 +0100 +++ new/ruby-1.8.7-p357/mkconfig.rb 2011-12-10 13:17:30.000000000 +0100 @@ -56,14 +56,13 @@ continued_name = name next end - when /^"(.+)"\s*(\\)?$/ + when /^"(.*)"\s*(\\)?$/ if continued_line continued_line << $1 - unless $2 - val = continued_line.join("") - name = continued_name - continued_line = nil - end + next if $2 + val = continued_line.join("") + name = continued_name + continued_line = nil end when /^(?:ac_given_)?INSTALL=(.*)/ v_fast << " CONFIG[\"INSTALL\"] = " + $1 + "\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-1.8.7-p352/numeric.c new/ruby-1.8.7-p357/numeric.c --- old/ruby-1.8.7-p352/numeric.c 2011-05-21 00:29:05.000000000 +0200 +++ new/ruby-1.8.7-p357/numeric.c 2011-12-10 13:17:27.000000000 +0100 @@ -3,7 +3,7 @@ numeric.c - $Author: shyouhei $ - $Date: 2011-05-21 07:29:05 +0900 (Sat, 21 May 2011) $ + $Date: 2011-12-10 21:17:27 +0900 (Sat, 10 Dec 2011) $ created at: Fri Aug 13 18:33:09 JST 1993 Copyright (C) 1993-2003 Yukihiro Matsumoto @@ -936,6 +936,10 @@ break; case T_BIGNUM: + if (isinf(a)) { + if (a > 0.0) return INT2FIX(1); + else return INT2FIX(-1); + } b = rb_big2dbl(y); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-1.8.7-p352/random.c new/ruby-1.8.7-p357/random.c --- old/ruby-1.8.7-p352/random.c 2011-05-23 06:49:40.000000000 +0200 +++ new/ruby-1.8.7-p357/random.c 2011-12-28 13:47:15.000000000 +0100 @@ -3,7 +3,7 @@ random.c - $Author: shyouhei $ - $Date: 2011-05-23 13:49:40 +0900 (Mon, 23 May 2011) $ + $Date: 2011-12-28 21:47:15 +0900 (Wed, 28 Dec 2011) $ created at: Fri Dec 24 16:39:21 JST 1993 Copyright (C) 1993-2003 Yukihiro Matsumoto @@ -189,6 +189,7 @@ #include <fcntl.h> #endif +static int seed_initialized = 0; static VALUE saved_seed = INT2FIX(0); static VALUE @@ -250,27 +251,22 @@ return old; } -static VALUE -random_seed() +#define DEFAULT_SEED_LEN (4 * sizeof(long)) + +static void +fill_random_seed(ptr) + char *ptr; { static int n = 0; + unsigned long *seed; struct timeval tv; int fd; struct stat statbuf; + char *buf = (char*)ptr; - int seed_len; - BDIGIT *digits; - unsigned long *seed; - NEWOBJ(big, struct RBignum); - OBJSETUP(big, rb_cBignum, T_BIGNUM); - - seed_len = 4 * sizeof(long); - big->sign = 1; - big->len = seed_len / SIZEOF_BDIGITS + 1; - digits = big->digits = ALLOC_N(BDIGIT, big->len); - seed = (unsigned long *)big->digits; + seed = (unsigned long *)buf; - memset(digits, 0, big->len * SIZEOF_BDIGITS); + memset(buf, 0, DEFAULT_SEED_LEN); #ifdef S_ISCHR if ((fd = open("/dev/urandom", O_RDONLY @@ -285,7 +281,7 @@ #endif )) >= 0) { if (fstat(fd, &statbuf) == 0 && S_ISCHR(statbuf.st_mode)) { - read(fd, seed, seed_len); + read(fd, seed, DEFAULT_SEED_LEN); } close(fd); } @@ -296,13 +292,37 @@ seed[1] ^= tv.tv_sec; seed[2] ^= getpid() ^ (n++ << 16); seed[3] ^= (unsigned long)&seed; +} + +static VALUE +make_seed_value(char *ptr) +{ + BDIGIT *digits; + NEWOBJ(big, struct RBignum); + OBJSETUP(big, rb_cBignum, T_BIGNUM); + + RBIGNUM_SET_SIGN(big, 1); + + digits = ALLOC_N(char, DEFAULT_SEED_LEN); + RBIGNUM(big)->digits = digits; + RBIGNUM(big)->len = DEFAULT_SEED_LEN / SIZEOF_BDIGITS; + + MEMCPY(digits, ptr, char, DEFAULT_SEED_LEN); /* set leading-zero-guard if need. */ - digits[big->len-1] = digits[big->len-2] <= 1 ? 1 : 0; + digits[RBIGNUM_LEN(big)-1] = digits[RBIGNUM_LEN(big)-2] <= 1 ? 1 : 0; return rb_big_norm((VALUE)big); } +static VALUE +random_seed(void) +{ + char buf[DEFAULT_SEED_LEN]; + fill_random_seed(buf); + return make_seed_value(buf); +} + /* * call-seq: * srand(number=0) => old_seed @@ -443,6 +463,9 @@ long val, max; rb_scan_args(argc, argv, "01", &vmax); + if (!seed_initialized) { + rand_init(random_seed()); + } switch (TYPE(vmax)) { case T_FLOAT: if (RFLOAT(vmax)->value <= LONG_MAX && RFLOAT(vmax)->value >= LONG_MIN) { @@ -490,6 +513,8 @@ return LONG2NUM(val); } +static char initial_seed[DEFAULT_SEED_LEN]; + void rb_reset_random_seed() { @@ -497,9 +522,24 @@ } void +Init_RandomSeed(void) +{ + fill_random_seed(initial_seed); + init_by_array((unsigned long*)initial_seed, DEFAULT_SEED_LEN/sizeof(unsigned long)); + seed_initialized = 1; +} + +static void +Init_RandomSeed2(void) +{ + saved_seed = make_seed_value(initial_seed); + memset(initial_seed, 0, DEFAULT_SEED_LEN); +} + +void Init_Random() { - rb_reset_random_seed(); + Init_RandomSeed2(); rb_define_global_function("srand", rb_f_srand, -1); rb_define_global_function("rand", rb_f_rand, -1); rb_global_variable(&saved_seed); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-1.8.7-p352/st.c new/ruby-1.8.7-p357/st.c --- old/ruby-1.8.7-p352/st.c 2007-02-13 00:01:19.000000000 +0100 +++ new/ruby-1.8.7-p357/st.c 2011-12-28 13:47:15.000000000 +0100 @@ -9,6 +9,7 @@ #include <stdlib.h> #endif #include <string.h> +#include <limits.h> #include "st.h" typedef struct st_table_entry st_table_entry; @@ -521,6 +522,8 @@ return 0; } +static unsigned long hash_seed = 0; + static int strhash(string) register const char *string; @@ -550,10 +553,11 @@ return val + (val << 15); #else - register int val = 0; + register unsigned long val = hash_seed; while ((c = *string++) != '\0') { val = val*997 + c; + val = (val << 13) | (val >> (sizeof(st_data_t) * CHAR_BIT - 13)); } return val + (val>>5); @@ -573,3 +577,11 @@ { return n; } + +extern unsigned long rb_genrand_int32(void); + +void +Init_st(void) +{ + hash_seed = rb_genrand_int32(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-1.8.7-p352/string.c new/ruby-1.8.7-p357/string.c --- old/ruby-1.8.7-p352/string.c 2010-04-01 09:11:40.000000000 +0200 +++ new/ruby-1.8.7-p357/string.c 2011-12-28 13:47:15.000000000 +0100 @@ -3,7 +3,7 @@ string.c - $Author: shyouhei $ - $Date: 2010-04-01 16:11:40 +0900 (Thu, 01 Apr 2010) $ + $Date: 2011-12-28 21:47:15 +0900 (Wed, 28 Dec 2011) $ created at: Mon Aug 9 17:12:58 JST 1993 Copyright (C) 1993-2003 Yukihiro Matsumoto @@ -875,13 +875,15 @@ return str1; } +static unsigned long hash_seed; + int rb_str_hash(str) VALUE str; { register long len = RSTRING(str)->len; register char *p = RSTRING(str)->ptr; - register int key = 0; + register unsigned long key = hash_seed; #if defined(HASH_ELFHASH) register unsigned int g; @@ -905,6 +907,7 @@ while (len--) { key = key*65599 + *p; p++; + key = (key << 13) | (key >> ((sizeof(unsigned long) * CHAR_BIT) - 13)); } key = key + (key>>5); #endif @@ -5062,4 +5065,6 @@ rb_fs = Qnil; rb_define_variable("$;", &rb_fs); rb_define_variable("$-F", &rb_fs); + + hash_seed = rb_genrand_int32(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-1.8.7-p352/test/ruby/test_float.rb new/ruby-1.8.7-p357/test/ruby/test_float.rb --- old/ruby-1.8.7-p352/test/ruby/test_float.rb 2008-07-10 06:54:53.000000000 +0200 +++ new/ruby-1.8.7-p357/test/ruby/test_float.rb 2011-12-10 13:17:27.000000000 +0100 @@ -144,4 +144,31 @@ assert_operator((-4611686018427387905.0).to_i, :<, 0) assert_operator((-4611686018427387906.0).to_i, :<, 0) end + + def test_cmp + inf = 1.0 / 0.0 + nan = inf / inf + assert_equal(0, 1.0 <=> 1.0) + assert_equal(1, 1.0 <=> 0.0) + assert_equal(-1, 1.0 <=> 2.0) + assert_nil(1.0 <=> nil) + assert_nil(1.0 <=> nan) + assert_nil(nan <=> 1.0) + + assert_equal(0, 1.0 <=> 1) + assert_equal(1, 1.0 <=> 0) + assert_equal(-1, 1.0 <=> 2) + + assert_equal(-1, 1.0 <=> 2**32) + + assert_equal(1, inf <=> (Float::MAX.to_i*2)) + assert_equal(-1, -inf <=> (-Float::MAX.to_i*2)) + assert_equal(-1, (Float::MAX.to_i*2) <=> inf) + assert_equal(1, (-Float::MAX.to_i*2) <=> -inf) + + assert_raise(ArgumentError) { 1.0 > nil } + assert_raise(ArgumentError) { 1.0 >= nil } + assert_raise(ArgumentError) { 1.0 < nil } + assert_raise(ArgumentError) { 1.0 <= nil } + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-1.8.7-p352/test/ruby/test_string.rb new/ruby-1.8.7-p357/test/ruby/test_string.rb --- old/ruby-1.8.7-p352/test/ruby/test_string.rb 2010-04-01 09:11:40.000000000 +0200 +++ new/ruby-1.8.7-p357/test/ruby/test_string.rb 2011-12-28 13:47:15.000000000 +0100 @@ -1,4 +1,5 @@ require 'test/unit' +require File.expand_path('envutil', File.dirname(__FILE__)) class TestString < Test::Unit::TestCase def check_sum(str, bits=16) @@ -29,4 +30,16 @@ ensure $KCODE = original_kcode end + + def test_hash_random + str = 'abc' + a = [str.hash.to_s] + cmd = sprintf("%s -e 'print %s.hash'", EnvUtil.rubybin, str.dump) + 3.times { + IO.popen(cmd, "rb") {|o| + a << o.read + } + } + assert_not_equal([str.hash.to_s], a.uniq) + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ruby-1.8.7-p352/version.h new/ruby-1.8.7-p357/version.h --- old/ruby-1.8.7-p352/version.h 2011-06-30 05:53:30.000000000 +0200 +++ new/ruby-1.8.7-p357/version.h 2011-12-28 13:47:15.000000000 +0100 @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2011-06-30" +#define RUBY_RELEASE_DATE "2011-12-28" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20110630 -#define RUBY_PATCHLEVEL 352 +#define RUBY_RELEASE_CODE 20111228 +#define RUBY_PATCHLEVEL 357 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2011 -#define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 30 +#define RUBY_RELEASE_MONTH 12 +#define RUBY_RELEASE_DAY 28 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-XML-LibXML for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package perl-XML-LibXML for openSUSE:Factory checked in at 2012-03-06 14:06:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-XML-LibXML (Old) and /work/SRC/openSUSE:Factory/.perl-XML-LibXML.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-XML-LibXML", Maintainer is "DLovasko(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-XML-LibXML/perl-XML-LibXML.changes 2012-02-28 14:14:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-XML-LibXML.new/perl-XML-LibXML.changes 2012-03-06 14:06:20.000000000 +0100 @@ -1,0 +2,23 @@ +Wed Feb 29 02:34:50 UTC 2012 - vcizek(a)suse.com + +- update to 1.95 + - Got rid of a broken test (at least with recent libxml2s) in + t/03doc.t : + - https://rt.cpan.org/Ticket/Display.html?id=75403 + - The problem was that the test tested for an undefined XML + namespace, a behaviour which was changed in a recent libxml2 + release. + 1.94 + - Fix XML::LibXML::Element tests for ineqaulity with == and eq. + - Fixes https://rt.cpan.org/Ticket/Display.html?id=75505 . + - Thanks to Mark Overmeer for the report and for a preliminary patch + to t/71overload.t . + 1.93 Mon Feb 27 11:15:50 IST 2012 + - Fix XML::LibXML::Element comparision with == and eq. + - Fixes https://rt.cpan.org/Ticket/Display.html?id=75257 , + https://rt.cpan.org/Ticket/Display.html?id=75293 , + https://rt.cpan.org/Ticket/Display.html?id=75259 . + - Thanks to Toby Inkster for a preliminary patch (that was modified by + me) and to the various people who reported the problem. + +------------------------------------------------------------------- Old: ---- XML-LibXML-1.92.tar.gz New: ---- XML-LibXML-1.95.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-XML-LibXML.spec ++++++ --- /var/tmp/diff_new_pack.EyayZ0/_old 2012-03-06 14:06:22.000000000 +0100 +++ /var/tmp/diff_new_pack.EyayZ0/_new 2012-03-06 14:06:22.000000000 +0100 @@ -18,7 +18,7 @@ Name: perl-XML-LibXML -Version: 1.92 +Version: 1.95 Release: 0 License: GPL-1.0+ or Artistic-1.0 %define cpan_name XML-LibXML ++++++ XML-LibXML-1.92.tar.gz -> XML-LibXML-1.95.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/Changes new/XML-LibXML-1.95/Changes --- old/XML-LibXML-1.92/Changes 2012-02-21 18:00:54.000000000 +0100 +++ new/XML-LibXML-1.95/Changes 2012-03-06 09:35:33.000000000 +0100 @@ -1,5 +1,28 @@ Revision history for Perl extension XML::LibXML +1.95 Tue Mar 6 10:35:26 IST 2012 + - Got rid of a broken test (at least with recent libxml2s) in + t/03doc.t : + - https://rt.cpan.org/Ticket/Display.html?id=75403 + - The problem was that the test tested for an undefined XML + namespace, a behaviour which was changed in a recent libxml2 + release. + - Thanks to vcizek for the report. + +1.94 Sat Mar 3 22:05:18 IST 2012 + - Fix XML::LibXML::Element tests for ineqaulity with == and eq. + - Fixes https://rt.cpan.org/Ticket/Display.html?id=75505 . + - Thanks to Mark Overmeer for the report and for a preliminary patch + to t/71overload.t . + +1.93 Mon Feb 27 11:15:50 IST 2012 + - Fix XML::LibXML::Element comparision with == and eq. + - Fixes https://rt.cpan.org/Ticket/Display.html?id=75257 , + https://rt.cpan.org/Ticket/Display.html?id=75293 , + https://rt.cpan.org/Ticket/Display.html?id=75259 . + - Thanks to Toby Inkster for a preliminary patch (that was modified by + me) and to the various people who reported the problem. + 1.92 Tue Feb 21 19:00:48 IST 2012 - Fix for test failure on perls < 5.10. - Fixes https://rt.cpan.org/Public/Bug/Display.html?id=75195 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/LibXML.pm new/XML-LibXML-1.95/LibXML.pm --- old/XML-LibXML-1.92/LibXML.pm 2012-02-21 18:01:18.000000000 +0100 +++ new/XML-LibXML-1.95/LibXML.pm 2012-03-06 09:38:50.000000000 +0100 @@ -27,7 +27,7 @@ use IO::Handle; # for FH reads called as methods BEGIN { -$VERSION = "1.92"; # VERSION TEMPLATE: DO NOT CHANGE +$VERSION = "1.95"; # VERSION TEMPLATE: DO NOT CHANGE $ABI_VERSION = 2; require Exporter; require DynaLoader; @@ -1488,11 +1488,34 @@ use XML::LibXML::AttributeHash; use Carp; +use Scalar::Util qw(blessed); + use overload '%{}' => 'getAttributeHash', 'bool' => sub { 1 }, + 'eq' => '_isSameNodeLax', '==' => '_isSameNodeLax', + 'ne' => '_isNotSameNodeLax', '!=' => '_isNotSameNodeLax', ; +sub _isNotSameNodeLax { + my ($self, $other) = @_; + + return ((not $self->_isSameNodeLax($other)) ? 1 : ''); +} + +sub _isSameNodeLax { + my ($self, $other) = @_; + + if (blessed($other) and $other->isa('XML::LibXML::Element')) + { + return ($self->isSameNode($other) ? 1 : ''); + } + else + { + return ''; + } +} + { # Note that we could generate a new hashref each time this # is called. However, that breaks "each %$element" and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/LibXML.pod new/XML-LibXML-1.95/LibXML.pod --- old/XML-LibXML-1.92/LibXML.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/LibXML.pod 2012-03-06 09:39:06.000000000 +0100 @@ -505,7 +505,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/META.json new/XML-LibXML-1.95/META.json --- old/XML-LibXML-1.92/META.json 2012-02-21 18:02:53.000000000 +0100 +++ new/XML-LibXML-1.95/META.json 2012-03-06 09:42:11.000000000 +0100 @@ -4,7 +4,7 @@ "Petr Pajas" ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.113640", + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.120351", "keywords" : [ "dom", "html", @@ -39,24 +39,24 @@ "prereqs" : { "build" : { "requires" : { - "ExtUtils::MakeMaker" : 0 + "ExtUtils::MakeMaker" : "0" } }, "configure" : { "requires" : { - "ExtUtils::MakeMaker" : 0 + "ExtUtils::MakeMaker" : "0" } }, "runtime" : { "requires" : { "ExtUtils::MakeMaker" : "6.56", - "Test::More" : 0, + "Test::More" : "0", "XML::NamespaceSupport" : "1.07", "XML::SAX" : "0.11", - "base" : 0, - "strict" : 0, - "vars" : 0, - "warnings" : 0 + "base" : "0", + "strict" : "0", + "vars" : "0", + "warnings" : "0" } } }, @@ -67,5 +67,5 @@ "url" : "https://bitbucket.org/shlomif/perl-xml-libxml" } }, - "version" : "1.92" + "version" : "1.95" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/META.yml new/XML-LibXML-1.95/META.yml --- old/XML-LibXML-1.92/META.yml 2012-02-21 18:02:53.000000000 +0100 +++ new/XML-LibXML-1.95/META.yml 2012-03-06 09:42:11.000000000 +0100 @@ -7,7 +7,7 @@ configure_requires: ExtUtils::MakeMaker: 0 dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.113640' +generated_by: 'ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.120351' keywords: - dom - html @@ -45,4 +45,4 @@ resources: homepage: https://bitbucket.org/shlomif/perl-xml-libxml repository: https://bitbucket.org/shlomif/perl-xml-libxml -version: 1.92 +version: 1.95 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/docs/libxml.dbk new/XML-LibXML-1.95/docs/libxml.dbk --- old/XML-LibXML-1.92/docs/libxml.dbk 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/docs/libxml.dbk 2012-03-06 09:39:06.000000000 +0100 @@ -22,7 +22,7 @@ </authorgroup> - <edition>1.92</edition> + <edition>1.95</edition> <copyright> <year>2001-2007</year> <holder>AxKit.com Ltd</holder> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Attr.pod new/XML-LibXML-1.95/lib/XML/LibXML/Attr.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/Attr.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Attr.pod 2012-03-06 09:39:06.000000000 +0100 @@ -121,7 +121,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/AttributeHash.pm new/XML-LibXML-1.95/lib/XML/LibXML/AttributeHash.pm --- old/XML-LibXML-1.92/lib/XML/LibXML/AttributeHash.pm 2012-02-21 18:01:18.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/AttributeHash.pm 2012-03-06 09:38:50.000000000 +0100 @@ -7,7 +7,7 @@ our @ISA = qw/Tie::Hash/; use vars qw($VERSION); -$VERSION = "1.92"; # VERSION TEMPLATE: DO NOT CHANGE +$VERSION = "1.95"; # VERSION TEMPLATE: DO NOT CHANGE BEGIN { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Boolean.pm new/XML-LibXML-1.95/lib/XML/LibXML/Boolean.pm --- old/XML-LibXML-1.92/lib/XML/LibXML/Boolean.pm 2012-02-21 18:01:18.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Boolean.pm 2012-03-06 09:38:50.000000000 +0100 @@ -15,7 +15,7 @@ use vars qw ($VERSION); -$VERSION = "1.92"; # VERSION TEMPLATE: DO NOT CHANGE +$VERSION = "1.95"; # VERSION TEMPLATE: DO NOT CHANGE use overload '""' => \&value, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/CDATASection.pod new/XML-LibXML-1.95/lib/XML/LibXML/CDATASection.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/CDATASection.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/CDATASection.pod 2012-03-06 09:39:06.000000000 +0100 @@ -45,7 +45,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Comment.pod new/XML-LibXML-1.95/lib/XML/LibXML/Comment.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/Comment.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Comment.pod 2012-03-06 09:39:06.000000000 +0100 @@ -46,7 +46,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Common.pm new/XML-LibXML-1.95/lib/XML/LibXML/Common.pm --- old/XML-LibXML-1.92/lib/XML/LibXML/Common.pm 2012-02-21 18:01:18.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Common.pm 2012-03-06 09:38:50.000000000 +0100 @@ -23,7 +23,7 @@ @ISA = qw(Exporter); -$VERSION = "1.92"; # VERSION TEMPLATE: DO NOT CHANGE +$VERSION = "1.95"; # VERSION TEMPLATE: DO NOT CHANGE use XML::LibXML qw(:libxml); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Common.pod new/XML-LibXML-1.95/lib/XML/LibXML/Common.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/Common.pod 2012-02-21 18:01:33.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Common.pod 2012-03-06 09:39:06.000000000 +0100 @@ -116,7 +116,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/DOM.pod new/XML-LibXML-1.95/lib/XML/LibXML/DOM.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/DOM.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/DOM.pod 2012-03-06 09:39:06.000000000 +0100 @@ -129,7 +129,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Devel.pm new/XML-LibXML-1.95/lib/XML/LibXML/Devel.pm --- old/XML-LibXML-1.92/lib/XML/LibXML/Devel.pm 2012-02-21 18:01:18.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Devel.pm 2012-03-06 09:38:50.000000000 +0100 @@ -12,7 +12,7 @@ use XML::LibXML; use vars qw ($VERSION); -$VERSION = "1.92"; # VERSION TEMPLATE: DO NOT CHANGE +$VERSION = "1.95"; # VERSION TEMPLATE: DO NOT CHANGE use 5.008_000; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Document.pod new/XML-LibXML-1.95/lib/XML/LibXML/Document.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/Document.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Document.pod 2012-03-06 09:39:06.000000000 +0100 @@ -683,7 +683,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/DocumentFragment.pod new/XML-LibXML-1.95/lib/XML/LibXML/DocumentFragment.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/DocumentFragment.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/DocumentFragment.pod 2012-03-06 09:39:06.000000000 +0100 @@ -27,7 +27,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Dtd.pod new/XML-LibXML-1.95/lib/XML/LibXML/Dtd.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/Dtd.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Dtd.pod 2012-03-06 09:39:06.000000000 +0100 @@ -89,7 +89,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Element.pod new/XML-LibXML-1.95/lib/XML/LibXML/Element.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/Element.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Element.pod 2012-03-06 09:39:06.000000000 +0100 @@ -382,7 +382,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/ErrNo.pm new/XML-LibXML-1.95/lib/XML/LibXML/ErrNo.pm --- old/XML-LibXML-1.92/lib/XML/LibXML/ErrNo.pm 2012-02-21 18:01:18.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/ErrNo.pm 2012-03-06 09:38:50.000000000 +0100 @@ -13,7 +13,7 @@ use strict; use vars qw($VERSION); -$VERSION = "1.92"; # VERSION TEMPLATE: DO NOT CHANGE +$VERSION = "1.95"; # VERSION TEMPLATE: DO NOT CHANGE use constant ERR_OK => 0; use constant ERR_INTERNAL_ERROR => 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/ErrNo.pod new/XML-LibXML-1.95/lib/XML/LibXML/ErrNo.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/ErrNo.pod 2012-02-21 18:01:33.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/ErrNo.pod 2012-03-06 09:39:06.000000000 +0100 @@ -14,7 +14,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Error.pm new/XML-LibXML-1.95/lib/XML/LibXML/Error.pm --- old/XML-LibXML-1.92/lib/XML/LibXML/Error.pm 2012-02-21 18:01:18.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Error.pm 2012-03-06 09:38:50.000000000 +0100 @@ -29,7 +29,7 @@ fallback => 1; $WARNINGS = 0; # 0: supress, 1: report via warn, 2: report via die -$VERSION = "1.92"; # VERSION TEMPLATE: DO NOT CHANGE +$VERSION = "1.95"; # VERSION TEMPLATE: DO NOT CHANGE use constant XML_ERR_NONE => 0; use constant XML_ERR_WARNING => 1; # A simple warning diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Error.pod new/XML-LibXML-1.95/lib/XML/LibXML/Error.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/Error.pod 2012-02-21 18:01:33.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Error.pod 2012-03-06 09:39:06.000000000 +0100 @@ -244,7 +244,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/InputCallback.pod new/XML-LibXML-1.95/lib/XML/LibXML/InputCallback.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/InputCallback.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/InputCallback.pod 2012-03-06 09:39:06.000000000 +0100 @@ -280,7 +280,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Literal.pm new/XML-LibXML-1.95/lib/XML/LibXML/Literal.pm --- old/XML-LibXML-1.92/lib/XML/LibXML/Literal.pm 2012-02-21 18:01:18.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Literal.pm 2012-03-06 09:38:50.000000000 +0100 @@ -13,7 +13,7 @@ use strict; use vars qw ($VERSION); -$VERSION = "1.92"; # VERSION TEMPLATE: DO NOT CHANGE +$VERSION = "1.95"; # VERSION TEMPLATE: DO NOT CHANGE use overload '""' => \&value, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Namespace.pod new/XML-LibXML-1.95/lib/XML/LibXML/Namespace.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/Namespace.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Namespace.pod 2012-03-06 09:39:06.000000000 +0100 @@ -130,7 +130,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Node.pod new/XML-LibXML-1.95/lib/XML/LibXML/Node.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/Node.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Node.pod 2012-03-06 09:39:06.000000000 +0100 @@ -739,7 +739,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/NodeList.pm new/XML-LibXML-1.95/lib/XML/LibXML/NodeList.pm --- old/XML-LibXML-1.92/lib/XML/LibXML/NodeList.pm 2012-02-21 18:01:18.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/NodeList.pm 2012-03-06 09:38:50.000000000 +0100 @@ -17,7 +17,7 @@ use XML::LibXML::Number; use vars qw($VERSION); -$VERSION = "1.92"; # VERSION TEMPLATE: DO NOT CHANGE +$VERSION = "1.95"; # VERSION TEMPLATE: DO NOT CHANGE use overload '""' => \&to_literal, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Number.pm new/XML-LibXML-1.95/lib/XML/LibXML/Number.pm --- old/XML-LibXML-1.92/lib/XML/LibXML/Number.pm 2012-02-21 18:01:18.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Number.pm 2012-03-06 09:38:50.000000000 +0100 @@ -13,7 +13,7 @@ use strict; use vars qw ($VERSION); -$VERSION = "1.92"; # VERSION TEMPLATE: DO NOT CHANGE +$VERSION = "1.95"; # VERSION TEMPLATE: DO NOT CHANGE use overload '""' => \&value, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/PI.pod new/XML-LibXML-1.95/lib/XML/LibXML/PI.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/PI.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/PI.pod 2012-03-06 09:39:06.000000000 +0100 @@ -74,7 +74,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Parser.pod new/XML-LibXML-1.95/lib/XML/LibXML/Parser.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/Parser.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Parser.pod 2012-03-06 09:39:06.000000000 +0100 @@ -969,7 +969,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Pattern.pod new/XML-LibXML-1.95/lib/XML/LibXML/Pattern.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/Pattern.pod 2012-02-21 18:01:33.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Pattern.pod 2012-03-06 09:39:06.000000000 +0100 @@ -94,7 +94,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Reader.pm new/XML-LibXML-1.95/lib/XML/LibXML/Reader.pm --- old/XML-LibXML-1.92/lib/XML/LibXML/Reader.pm 2012-02-21 18:01:18.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Reader.pm 2012-03-06 09:38:50.000000000 +0100 @@ -14,7 +14,7 @@ use warnings; use vars qw ($VERSION); -$VERSION = "1.92"; # VERSION TEMPLATE: DO NOT CHANGE +$VERSION = "1.95"; # VERSION TEMPLATE: DO NOT CHANGE use 5.008_000; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Reader.pod new/XML-LibXML-1.95/lib/XML/LibXML/Reader.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/Reader.pod 2012-02-21 18:01:33.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Reader.pod 2012-03-06 09:39:06.000000000 +0100 @@ -656,7 +656,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/RegExp.pod new/XML-LibXML-1.95/lib/XML/LibXML/RegExp.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/RegExp.pod 2012-02-21 18:01:33.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/RegExp.pod 2012-03-06 09:39:06.000000000 +0100 @@ -58,7 +58,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/RelaxNG.pod new/XML-LibXML-1.95/lib/XML/LibXML/RelaxNG.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/RelaxNG.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/RelaxNG.pod 2012-03-06 09:39:06.000000000 +0100 @@ -69,7 +69,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/SAX/Builder.pm new/XML-LibXML-1.95/lib/XML/LibXML/SAX/Builder.pm --- old/XML-LibXML-1.92/lib/XML/LibXML/SAX/Builder.pm 2012-02-21 18:01:18.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/SAX/Builder.pm 2012-03-06 09:38:50.000000000 +0100 @@ -18,7 +18,7 @@ return $XML::LibXML::__threads_shared ? 0 : 1; } -$VERSION = "1.92"; # VERSION TEMPLATE: DO NOT CHANGE +$VERSION = "1.95"; # VERSION TEMPLATE: DO NOT CHANGE sub new { my $class = shift; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/SAX/Builder.pod new/XML-LibXML-1.95/lib/XML/LibXML/SAX/Builder.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/SAX/Builder.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/SAX/Builder.pod 2012-03-06 09:39:06.000000000 +0100 @@ -38,7 +38,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/SAX/Generator.pm new/XML-LibXML-1.95/lib/XML/LibXML/SAX/Generator.pm --- old/XML-LibXML-1.92/lib/XML/LibXML/SAX/Generator.pm 2012-02-21 18:01:18.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/SAX/Generator.pm 2012-03-06 09:38:50.000000000 +0100 @@ -14,7 +14,7 @@ use XML::LibXML; use vars qw ($VERSION); -$VERSION = "1.92"; # VERSION TEMPLATE: DO NOT CHANGE +$VERSION = "1.95"; # VERSION TEMPLATE: DO NOT CHANGE sub CLONE_SKIP { return $XML::LibXML::__threads_shared ? 0 : 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/SAX/Parser.pm new/XML-LibXML-1.95/lib/XML/LibXML/SAX/Parser.pm --- old/XML-LibXML-1.92/lib/XML/LibXML/SAX/Parser.pm 2012-02-21 18:01:18.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/SAX/Parser.pm 2012-03-06 09:38:50.000000000 +0100 @@ -17,7 +17,7 @@ use XML::SAX::Base; use XML::SAX::DocumentLocator; -$VERSION = "1.92"; # VERSION TEMPLATE: DO NOT CHANGE +$VERSION = "1.95"; # VERSION TEMPLATE: DO NOT CHANGE @ISA = ('XML::SAX::Base'); sub CLONE_SKIP { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/SAX.pm new/XML-LibXML-1.95/lib/XML/LibXML/SAX.pm --- old/XML-LibXML-1.92/lib/XML/LibXML/SAX.pm 2012-02-21 18:01:18.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/SAX.pm 2012-03-06 09:38:50.000000000 +0100 @@ -12,7 +12,7 @@ use strict; use vars qw($VERSION @ISA); -$VERSION = "1.92"; # VERSION TEMPLATE: DO NOT CHANGE +$VERSION = "1.95"; # VERSION TEMPLATE: DO NOT CHANGE use XML::LibXML; use XML::SAX::Base; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/SAX.pod new/XML-LibXML-1.95/lib/XML/LibXML/SAX.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/SAX.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/SAX.pod 2012-03-06 09:39:06.000000000 +0100 @@ -47,7 +47,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Schema.pod new/XML-LibXML-1.95/lib/XML/LibXML/Schema.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/Schema.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Schema.pod 2012-03-06 09:39:06.000000000 +0100 @@ -65,7 +65,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/Text.pod new/XML-LibXML-1.95/lib/XML/LibXML/Text.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/Text.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/Text.pod 2012-03-06 09:39:06.000000000 +0100 @@ -170,7 +170,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/XPathContext.pm new/XML-LibXML-1.95/lib/XML/LibXML/XPathContext.pm --- old/XML-LibXML-1.92/lib/XML/LibXML/XPathContext.pm 2012-02-21 18:01:18.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/XPathContext.pm 2012-03-06 09:38:50.000000000 +0100 @@ -16,7 +16,7 @@ use XML::LibXML; use XML::LibXML::NodeList; -$VERSION = "1.92"; # VERSION TEMPLATE: DO NOT CHANGE +$VERSION = "1.95"; # VERSION TEMPLATE: DO NOT CHANGE # should LibXML XPath data types be used for simple objects # when passing parameters to extension functions (default: no) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/XPathContext.pod new/XML-LibXML-1.95/lib/XML/LibXML/XPathContext.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/XPathContext.pod 2012-02-21 18:01:32.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/XPathContext.pod 2012-03-06 09:39:06.000000000 +0100 @@ -359,7 +359,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/lib/XML/LibXML/XPathExpression.pod new/XML-LibXML-1.95/lib/XML/LibXML/XPathExpression.pod --- old/XML-LibXML-1.92/lib/XML/LibXML/XPathExpression.pod 2012-02-21 18:01:33.000000000 +0100 +++ new/XML-LibXML-1.95/lib/XML/LibXML/XPathExpression.pod 2012-03-06 09:39:06.000000000 +0100 @@ -52,7 +52,7 @@ =head1 VERSION -1.92 +1.95 =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/t/03doc.t new/XML-LibXML-1.95/t/03doc.t --- old/XML-LibXML-1.92/t/03doc.t 2011-07-01 23:08:14.000000000 +0200 +++ new/XML-LibXML-1.95/t/03doc.t 2012-03-06 09:31:48.000000000 +0100 @@ -13,7 +13,7 @@ use warnings; # Should be 168. -use Test::More tests => 168; +use Test::More tests => 167; use XML::LibXML; use XML::LibXML::Common qw(:libxml); @@ -582,15 +582,26 @@ # TEST _count_local_name($doc2, 'A', 3, q{3 As}); } +=begin taken_out + # This was taken out because the XML uses an undefined namespace. + # I don't know why this test was introduced in the first place, + # but it fails now + # + # This test fails in this bug report - + # https://rt.cpan.org/Ticket/Display.html?id=75403 + # -- Shlomi Fish { $parser2->recover(1); local $SIG{'__WARN__'} = sub { print "warning caught: @_\n"; }; - my $doc2 = $parser2->parse_string($string4); - # TEST - _count_local_name( $doc2, 'A', 3, q{3 As}); + # my $doc2 = $parser2->parse_string($string4); + #-TEST + # _count_local_name( $doc2, 'A', 3, q{3 As}); } +=end taken_out + +=cut { my $doc2 = $parser2->parse_string($string5); # TEST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-LibXML-1.92/t/71overloads.t new/XML-LibXML-1.95/t/71overloads.t --- old/XML-LibXML-1.92/t/71overloads.t 2012-02-21 12:57:06.000000000 +0100 +++ new/XML-LibXML-1.95/t/71overloads.t 2012-03-03 21:00:02.000000000 +0100 @@ -1,6 +1,6 @@ use strict; use warnings; -use Test::More tests => 16; +use Test::More tests => 25; use XML::LibXML; my $root = XML::LibXML->load_xml( IO => \*DATA )->documentElement; @@ -137,5 +137,81 @@ '!!! toStringEC14N', ); +# These are tests for: +# https://rt.cpan.org/Ticket/Display.html?id=75257 +# https://rt.cpan.org/Ticket/Display.html?id=75293 +# https://rt.cpan.org/Ticket/Display.html?id=75259 +# (Three duplicate reports for the same problem.) + +# TEST +is_deeply( + [($root == $root)], + [1], + '== comparison', +); + +# TEST +is_deeply( + [($root eq $root)], + [1], + 'eq comparison', +); + +# TEST +is_deeply( + [($root == 'not-root')], + [''], + '== negative comparison', +); + +# TEST +is_deeply( + [($root == 'not-root')], + [''], + '== negative comparison', +); + +# TEST +is_deeply( + [!($root != 'not-root')], + [''], + '!== negative comparison', +); + +# TEST +is_deeply( + [($root eq 'not-root')], + [''], + 'eq negative comparison', +); + +# TEST +is_deeply( + [!($root ne 'not-root')], + [''], + 'eq negative comparison', +); + +{ + my $doc = XML::LibXML->load_xml( string => <<'EOT' )->documentElement; +<foo> + <bar /> + <baz /> +</foo> +EOT + + my ($bar_elem) = $doc->findnodes('//bar'); + my ($baz_elem) = $doc->findnodes('//baz'); + + # TEST + is_deeply([$bar_elem == $baz_elem], [''], + '== comparison between two differenet nodes' + ); + + # TEST + is_deeply([$bar_elem eq $baz_elem], [''], + 'eq comparison between two differenet nodes' + ); +} __DATA__ <root attr1="foo" xmlns:x="http://localhost/" x:attr2="bar" /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Params-Util for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package perl-Params-Util for openSUSE:Factory checked in at 2012-03-06 14:06:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Params-Util (Old) and /work/SRC/openSUSE:Factory/.perl-Params-Util.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Params-Util", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Params-Util/perl-Params-Util.changes 2011-09-23 12:38:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Params-Util.new/perl-Params-Util.changes 2012-03-06 14:06:19.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Mar 6 08:06:12 UTC 2012 - coolo(a)suse.com + +- updated to 1.06 + - Remove the need for the sanexs.c file by generating into a temp + file instead. + - Restore compatibility with pre-5.8.8 Perls without a working + compiler available install time (RIBASUSHI) + +------------------------------------------------------------------- Old: ---- Params-Util-1.04.tar.gz New: ---- Params-Util-1.06.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Params-Util.spec ++++++ --- /var/tmp/diff_new_pack.7n3g6f/_old 2012-03-06 14:06:20.000000000 +0100 +++ /var/tmp/diff_new_pack.7n3g6f/_new 2012-03-06 14:06:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Params-Util # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,20 +16,21 @@ # - Name: perl-Params-Util -Version: 1.04 -Release: 1 -License: GPL-1.0+ or Artistic-1.0 +Version: 1.06 +Release: 0 %define cpan_name Params-Util Summary: Simple, compact and correct param-checking functions -Url: http://search.cpan.org/dist/Params-Util/ +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl +Url: http://search.cpan.org/dist/Params-Util/ Source: http://www.cpan.org/authors/id/A/AD/ADAMK/%{cpan_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(ExtUtils::CBuilder) >= 0.27 +#BuildRequires: perl(A) +#BuildRequires: perl(Params::Util) %{perl_requires} %description @@ -75,11 +76,8 @@ %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes LICENSE README +%doc Changes LICENSE MYMETA.json README %changelog ++++++ Params-Util-1.04.tar.gz -> Params-Util-1.06.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Params-Util-1.04/Changes new/Params-Util-1.06/Changes --- old/Params-Util-1.04/Changes 2011-04-20 09:15:25.000000000 +0200 +++ new/Params-Util-1.06/Changes 2012-03-01 13:39:39.000000000 +0100 @@ -1,5 +1,13 @@ Revision history for Perl extension Params-Util +1.06 Thu 1 Mar 2012 + - Remove the need for the sanexs.c file by generating into a temp + file instead. + +1.05 Thu 1 Mar 2012 + - Restore compatibility with pre-5.8.8 Perls without a working + compiler available install time (RIBASUSHI) + 1.04 Wed 20 Apr 2011 - Fixed #67522 have_compiler returns diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Params-Util-1.04/LICENSE new/Params-Util-1.06/LICENSE --- old/Params-Util-1.04/LICENSE 2011-04-20 09:15:25.000000000 +0200 +++ new/Params-Util-1.06/LICENSE 2012-03-01 13:39:39.000000000 +0100 @@ -8,266 +8,286 @@ ---------------------------------------------------------------------------- -The General Public License (GPL) -Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 -Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, -Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute -verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to most of -the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to your programs, too. -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom -to distribute copies of free software (and charge for this service if you wish), that -you receive source code or can get it if you want it, that you can change the -software or use pieces of it in new free programs; and that you know you can do -these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for a -fee, you must give the recipients all the rights that you have. You must make -sure that they, too, receive or can get the source code. And you must show -them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) offer -you this license which gives you legal permission to copy, distribute and/or -modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced by -others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We wish -to avoid the danger that redistributors of a free program will individually obtain -patent licenses, in effect making the program proprietary. To prevent this, we -have made it clear that any patent must be licensed for everyone's free use or -not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -GNU GENERAL PUBLIC LICENSE -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND -MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or translated -into another language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is not -restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and appropriately -publish on each copy an appropriate copyright notice and disclaimer of warranty; -keep intact all the notices that refer to this License and to the absence of any -warranty; and give any other recipients of the Program a copy of this License + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License along with the Program. -You may charge a fee for the physical act of transferring a copy, and you may at -your option offer warranty protection in exchange for a fee. +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such -modifications or work under the terms of Section 1 above, provided that you also -meet all of these conditions: - -a) You must cause the modified files to carry prominent notices stating that you -changed the files and the date of any change. - -b) You must cause any work that you distribute or publish, that in whole or in -part contains or is derived from the Program or any part thereof, to be licensed -as a whole at no charge to all third parties under the terms of this License. - -c) If the modified program normally reads commands interactively when run, you -must cause it, when started running for such interactive use in the most ordinary -way, to print or display an announcement including an appropriate copyright -notice and a notice that there is no warranty (or else, saying that you provide a -warranty) and that users may redistribute the program under these conditions, -and telling the user how to view a copy of this License. (Exception: if the -Program itself is interactive but does not normally print such an announcement, -your work based on the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, -and its terms, do not apply to those sections when you distribute them as -separate works. But when you distribute the same sections as part of a whole -which is a work based on the Program, the distribution of the whole must be on -the terms of this License, whose permissions for other licensees extend to the + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. -Thus, it is not the intent of this section to claim rights or contest your rights to -work written entirely by you; rather, the intent is to exercise the right to control -the distribution of derivative or collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and 2 -above provided that you also do one of the following: - -a) Accompany it with the complete corresponding machine-readable source -code, which must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange; or, - -b) Accompany it with a written offer, valid for at least three years, to give any -third party, for a charge no more than your cost of physically performing source -distribution, a complete machine-readable copy of the corresponding source -code, to be distributed under the terms of Sections 1 and 2 above on a medium -customarily used for software interchange; or, - -c) Accompany it with the information you received as to the offer to distribute -corresponding source code. (This alternative is allowed only for noncommercial -distribution and only if you received the program in object code or executable -form with such an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all the -source code for all modules it contains, plus any associated interface definition -files, plus the scripts used to control compilation and installation of the -executable. However, as a special exception, the source code distributed need -not include anything that is normally distributed (in either source or binary form) -with the major components (compiler, kernel, and so on) of the operating system -on which the executable runs, unless that component itself accompanies the -executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so long -as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not accept -this License. Therefore, by modifying or distributing the Program (or any work -based on the Program), you indicate your acceptance of this License to do so, -and all its terms and conditions for copying, distributing or modifying the -Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to copy, -distribute or modify the Program subject to these terms and conditions. You -may not impose any further restrictions on the recipients' exercise of the rights -granted herein. You are not responsible for enforcing compliance by third parties -to this License. - -7. If, as a consequence of a court judgment or allegation of patent infringement -or for any other reason (not limited to patent issues), conditions are imposed on -you (whether by court order, agreement or otherwise) that contradict the -conditions of this License, they do not excuse you from the conditions of this -License. If you cannot distribute so as to satisfy simultaneously your obligations -under this License and any other pertinent obligations, then as a consequence -you may not distribute the Program at all. For example, if a patent license would -not permit royalty-free redistribution of the Program by all those who receive -copies directly or indirectly through you, then the only way you could satisfy -both it and this License would be to refrain entirely from distribution of the -Program. - -If any portion of this section is held invalid or unenforceable under any particular -circumstance, the balance of the section is intended to apply and the section as -a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or other -property right claims or to contest validity of any such claims; this section has -the sole purpose of protecting the integrity of the free software distribution -system, which is implemented by public license practices. Many people have -made generous contributions to the wide range of software distributed through -that system in reliance on consistent application of that system; it is up to the -author/donor to decide if he or she is willing to distribute software through any -other system and a licensee cannot impose that choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain countries -either by patents or by copyrighted interfaces, the original copyright holder who -places the Program under this License may add an explicit geographical -distribution limitation excluding those countries, so that distribution is permitted -only in or among countries not thus excluded. In such case, this License -incorporates the limitation as if written in the body of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems or -concerns. - -Each version is given a distinguishing version number. If the Program specifies a -version number of this License which applies to it and "any later version", you -have the option of following the terms and conditions either of that version or of -any later version published by the Free Software Foundation. If the Program does -not specify a version number of this License, you may choose any version ever -published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of all -derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS -NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE -COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM -"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR -IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE -ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR -CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED -TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY -WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS -PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES -ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM -(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY -OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS -BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. -END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS ---------------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Params-Util-1.04/MANIFEST new/Params-Util-1.06/MANIFEST --- old/Params-Util-1.04/MANIFEST 2011-04-20 09:15:53.000000000 +0200 +++ new/Params-Util-1.06/MANIFEST 2012-03-01 13:40:07.000000000 +0100 @@ -3,8 +3,8 @@ LICENSE Makefile.PL MANIFEST This list of files +MYMETA.json README -sanexs.c t/01_compile.t t/02_main.t t/03_all.t @@ -35,4 +35,5 @@ xt/meta.t xt/pmv.t xt/pod.t -META.yml Module meta-data (added by MakeMaker) +META.yml Module YAML meta-data (added by MakeMaker) +META.json Module JSON meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Params-Util-1.04/META.json new/Params-Util-1.06/META.json --- old/Params-Util-1.04/META.json 1970-01-01 01:00:00.000000000 +0100 +++ new/Params-Util-1.06/META.json 2012-03-01 13:40:07.000000000 +0100 @@ -0,0 +1,45 @@ +{ + "abstract" : "Simple, compact and correct param-checking functions", + "author" : [ + "Adam Kennedy <adamk(a)cpan.org>" + ], + "dynamic_config" : 1, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112621", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Params-Util", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.52", + "File::Spec" : "0.80", + "Test::More" : "0.42" + } + }, + "configure" : { + "requires" : { + "ExtUtils::CBuilder" : "0.27", + "ExtUtils::MakeMaker" : "6.52" + } + }, + "runtime" : { + "requires" : { + "Scalar::Util" : "1.18", + "perl" : "5.00503" + } + } + }, + "release_status" : "stable", + "version" : "1.06" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Params-Util-1.04/META.yml new/Params-Util-1.06/META.yml --- old/Params-Util-1.04/META.yml 2011-04-20 09:15:53.000000000 +0200 +++ new/Params-Util-1.06/META.yml 2012-03-01 13:40:07.000000000 +0100 @@ -1,26 +1,26 @@ ---- #YAML:1.0 -name: Params-Util -version: 1.04 -abstract: Simple, compact and correct param-checking functions +--- +abstract: 'Simple, compact and correct param-checking functions' author: - - Adam Kennedy <adamk(a)cpan.org> -license: perl -distribution_type: module -configure_requires: - ExtUtils::CBuilder: 0.27 - ExtUtils::MakeMaker: 6.52 + - 'Adam Kennedy <adamk(a)cpan.org>' build_requires: - ExtUtils::MakeMaker: 6.52 - File::Spec: 0.80 - Test::More: 0.42 -requires: - perl: 5.00503 - Scalar::Util: 1.18 -no_index: - directory: - - t - - inc -generated_by: ExtUtils::MakeMaker version 6.56 + ExtUtils::MakeMaker: 6.52 + File::Spec: 0.80 + Test::More: 0.42 +configure_requires: + ExtUtils::CBuilder: 0.27 + ExtUtils::MakeMaker: 6.52 +dynamic_config: 1 +generated_by: 'ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112621' +license: perl meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 +name: Params-Util +no_index: + directory: + - t + - inc +requires: + Scalar::Util: 1.18 + perl: 5.00503 +version: 1.06 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Params-Util-1.04/MYMETA.json new/Params-Util-1.06/MYMETA.json --- old/Params-Util-1.04/MYMETA.json 1970-01-01 01:00:00.000000000 +0100 +++ new/Params-Util-1.06/MYMETA.json 2012-03-01 13:40:00.000000000 +0100 @@ -0,0 +1,45 @@ +{ + "abstract" : "Simple, compact and correct param-checking functions", + "author" : [ + "Adam Kennedy <adamk(a)cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112621", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Params-Util", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.52", + "File::Spec" : "0.80", + "Test::More" : "0.42" + } + }, + "configure" : { + "requires" : { + "ExtUtils::CBuilder" : "0.27", + "ExtUtils::MakeMaker" : "6.52" + } + }, + "runtime" : { + "requires" : { + "Scalar::Util" : "1.18", + "perl" : "5.00503" + } + } + }, + "release_status" : "stable", + "version" : "1.06" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Params-Util-1.04/Makefile.PL new/Params-Util-1.06/Makefile.PL --- old/Params-Util-1.04/Makefile.PL 2011-04-20 09:15:25.000000000 +0200 +++ new/Params-Util-1.06/Makefile.PL 2012-03-01 13:39:39.000000000 +0100 @@ -1,5 +1,7 @@ -use 5.00503; use strict; +BEGIN { + require 5.00503; +} use Config; use ExtUtils::MakeMaker (); @@ -68,7 +70,7 @@ 'ExtUtils::CBuilder' => '0.27', }, PREREQ_PM => { - 'Scalar::Util' => '1.18', + 'Scalar::Util' => $make_xs ? '1.18' : '1.10', }, BUILD_REQUIRES => { 'ExtUtils::MakeMaker' => '6.52', @@ -99,26 +101,28 @@ # Modified from eumm-upgrade by Alexandr Ciornii. sub WriteMakefile { - my %params=@_; - my $eumm_version=$ExtUtils::MakeMaker::VERSION; - $eumm_version=eval $eumm_version; - die "EXTRA_META is deprecated" if exists $params{EXTRA_META}; - die "License not specified" unless exists $params{LICENSE}; - if ( $params{BUILD_REQUIRES} and $eumm_version < 6.5503 ) { - #EUMM 6.5502 has problems with BUILD_REQUIRES - $params{PREREQ_PM}={ %{$params{PREREQ_PM} || {}} , %{$params{BUILD_REQUIRES}} }; - delete $params{BUILD_REQUIRES}; - } - delete $params{CONFIGURE_REQUIRES} if $eumm_version < 6.52; - delete $params{MIN_PERL_VERSION} if $eumm_version < 6.48; - delete $params{META_MERGE} if $eumm_version < 6.46; - delete $params{META_ADD} if $eumm_version < 6.46; - delete $params{LICENSE} if $eumm_version < 6.31; - delete $params{AUTHOR} if $] < 5.005; - delete $params{ABSTRACT_FROM} if $] < 5.005; - delete $params{BINARY_LOCATION} if $] < 5.005; - - ExtUtils::MakeMaker::WriteMakefile(%params); + my %params=@_; + my $eumm_version=$ExtUtils::MakeMaker::VERSION; + $eumm_version=eval $eumm_version; + die "EXTRA_META is deprecated" if exists $params{EXTRA_META}; + die "License not specified" unless exists $params{LICENSE}; + if ( $params{BUILD_REQUIRES} and $eumm_version < 6.5503 ) { + #EUMM 6.5502 has problems with BUILD_REQUIRES + $params{PREREQ_PM} = { + %{$params{PREREQ_PM} || {}}, + %{$params{BUILD_REQUIRES}}, + }; + delete $params{BUILD_REQUIRES}; + } + delete $params{CONFIGURE_REQUIRES} if $eumm_version < 6.52; + delete $params{MIN_PERL_VERSION} if $eumm_version < 6.48; + delete $params{META_MERGE} if $eumm_version < 6.46; + delete $params{META_ADD} if $eumm_version < 6.46; + delete $params{LICENSE} if $eumm_version < 6.31; + delete $params{AUTHOR} if $] < 5.005; + delete $params{ABSTRACT_FROM} if $] < 5.005; + delete $params{BINARY_LOCATION} if $] < 5.005; + ExtUtils::MakeMaker::WriteMakefile(%params); } # Secondary compile testing via ExtUtils::CBuilder @@ -141,9 +145,34 @@ # Lack of a compiler at all return 0; } + + + # Write a C file representative of what XS becomes + require File::Temp; + my ( $FH, $tmpfile ) = File::Temp::tempfile( + "sanexs-XXXXX", + SUFFIX => '.c', + ); + binmode $FH; + print $FH <<'END_C'; +#include "EXTERN.h" +#include "perl.h" +#include "XSUB.h" + +int main(int argc, char **argv) { + return 0; +} + +int boot_sanexs() { + return 1; +} + +END_C + close $FH; + eval { $object = $builder->compile( - source => 'sanexs.c', + source => $tmpfile, ); @libs = $builder->link( objects => $object, @@ -151,7 +180,7 @@ ); }; my $broken = !! $@; - foreach ( $object, @libs ) { + foreach ( $tmpfile, $object, @libs ) { next unless defined $_; 1 while unlink $_; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Params-Util-1.04/README new/Params-Util-1.06/README --- old/Params-Util-1.04/README 2011-04-20 09:15:25.000000000 +0200 +++ new/Params-Util-1.06/README 2012-03-01 13:39:39.000000000 +0100 @@ -98,6 +98,11 @@ Returns the string as a convenience if it is a valid class name, or "undef" if not. + _CLASSDOES $string, $role + This routine behaves exactly like "_CLASSISA", but checks with "->DOES" + rather than "->isa". This is probably only a good idea to use on Perl + 5.10 or later, when UNIVERSAL::DOES has been implemented. + _SUBCLASS $string, $class The "_SUBCLASS" function is intended to be imported into your package, and provides a convenient way to test to see if a value is a string that @@ -288,6 +293,11 @@ Returns the object itself as a convenience, or "undef" if the value provided is not an object of that type. + _INSTANCEDOES $object, $role + This routine behaves exactly like "_INSTANCE", but checks with "->DOES" + rather than "->isa". This is probably only a good idea to use on Perl + 5.10 or later, when UNIVERSAL::DOES has been implemented. + _REGEX $value The "_REGEX" function is intended to be imported into your package, and provides a convenient way to test for a regular expression. @@ -378,7 +388,7 @@ Params::Validate COPYRIGHT - Copyright 2005 - 2011 Adam Kennedy. + Copyright 2005 - 2012 Adam Kennedy. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Params-Util-1.04/lib/Params/Util.pm new/Params-Util-1.06/lib/Params/Util.pm --- old/Params-Util-1.04/lib/Params/Util.pm 2011-04-20 09:15:25.000000000 +0200 +++ new/Params-Util-1.06/lib/Params/Util.pm 2012-03-01 13:39:39.000000000 +0100 @@ -64,20 +64,20 @@ use vars qw{$VERSION @ISA @EXPORT_OK %EXPORT_TAGS}; -$VERSION = '1.04'; +$VERSION = '1.06'; @ISA = qw{ Exporter DynaLoader }; @EXPORT_OK = qw{ _STRING _IDENTIFIER - _CLASS _CLASSISA _SUBCLASS _DRIVER + _CLASS _CLASSISA _SUBCLASS _DRIVER _CLASSDOES _NUMBER _POSINT _NONNEGINT _SCALAR _SCALAR0 _ARRAY _ARRAY0 _ARRAYLIKE _HASH _HASH0 _HASHLIKE _CODE _CODELIKE - _INVOCANT _REGEX _INSTANCE + _INVOCANT _REGEX _INSTANCE _INSTANCEDOES _SET _SET0 _HANDLE }; @@ -89,6 +89,30 @@ 1; } unless $ENV{PERL_PARAMS_UTIL_PP}; +# Use a private pure-perl copy of looks_like_number if the version of +# Scalar::Util is old (for whatever reason). +my $SU = eval "$Scalar::Util::VERSION" || 0; +if ( $SU >= 1.18 ) { + Scalar::Util->import('looks_like_number'); +} else { + eval <<'END_PERL'; +sub looks_like_number { + local $_ = shift; + + # checks from perlfaq4 + return 0 if !defined($_); + if (ref($_)) { + return overload::Overloaded($_) ? defined(0 + $_) : 0; + } + return 1 if (/^[+-]?[0-9]+$/); # is a +/- integer + return 1 if (/^([+-]?)(?=[0-9]|\.[0-9])[0-9]*(\.[0-9]*)?([Ee]([+-]?[0-9]+))?$/); # a C float + return 1 if ($] >= 5.008 and /^(Inf(inity)?|NaN)$/i) or ($] >= 5.006001 and /^Inf$/i); + + 0; +} +END_PERL +} + @@ -195,6 +219,21 @@ } END_PERL +=head2 _CLASSDOES $string, $role + +This routine behaves exactly like C<L</_CLASSISA>>, but checks with C<< ->DOES +>> rather than C<< ->isa >>. This is probably only a good idea to use on Perl +5.10 or later, when L<UNIVERSAL::DOES|UNIVERSAL::DOES/DOES> has been +implemented. + +=cut + +eval <<'END_PERL' unless defined &_CLASSDOES; +sub _CLASSDOES ($$) { + (defined $_[0] and ! ref $_[0] and $_[0] =~ m/^[^\W\d]\w*(?:::\w+)*\z/s and $_[0]->DOES($_[1])) ? $_[0] : undef; +} +END_PERL + =pod =head2 _SUBCLASS $string, $class @@ -239,7 +278,7 @@ eval <<'END_PERL' unless defined &_NUMBER; sub _NUMBER ($) { - ( defined $_[0] and ! ref $_[0] and Scalar::Util::looks_like_number($_[0]) ) + ( defined $_[0] and ! ref $_[0] and looks_like_number($_[0]) ) ? $_[0] : undef; } @@ -585,6 +624,21 @@ } END_PERL +=head2 _INSTANCEDOES $object, $role + +This routine behaves exactly like C<L</_INSTANCE>>, but checks with C<< ->DOES +>> rather than C<< ->isa >>. This is probably only a good idea to use on Perl +5.10 or later, when L<UNIVERSAL::DOES|UNIVERSAL::DOES/DOES> has been +implemented. + +=cut + +eval <<'END_PERL' unless defined &_INSTANCEDOES; +sub _INSTANCEDOES ($$) { + (Scalar::Util::blessed($_[0]) and $_[0]->DOES($_[1])) ? $_[0] : undef; +} +END_PERL + =pod =head2 _REGEX $value @@ -801,7 +855,7 @@ =head1 COPYRIGHT -Copyright 2005 - 2011 Adam Kennedy. +Copyright 2005 - 2012 Adam Kennedy. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Params-Util-1.04/sanexs.c new/Params-Util-1.06/sanexs.c --- old/Params-Util-1.04/sanexs.c 2011-04-20 09:15:25.000000000 +0200 +++ new/Params-Util-1.06/sanexs.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -#include "EXTERN.h" -#include "perl.h" -#include "XSUB.h" - -int main(int argc, char **argv) { - return 0; -} - -int boot_sanexs() { - return 1; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Params-Util-1.04/t/01_compile.t new/Params-Util-1.06/t/01_compile.t --- old/Params-Util-1.04/t/01_compile.t 2011-04-20 09:15:25.000000000 +0200 +++ new/Params-Util-1.06/t/01_compile.t 2012-03-01 13:39:39.000000000 +0100 @@ -16,5 +16,5 @@ # Double check that Scalar::Util is valid require_ok( 'Scalar::Util' ); -ok( $Scalar::Util::VERSION >= 1.18, 'Scalar::Util version is at least 1.18' ); +ok( $Scalar::Util::VERSION >= 1.10, 'Scalar::Util version is at least 1.18' ); ok( defined &Scalar::Util::refaddr, 'Scalar::Util has a refaddr implementation' ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Params-Util-1.04/t/02_main.t new/Params-Util-1.06/t/02_main.t --- old/Params-Util-1.04/t/02_main.t 2011-04-20 09:15:25.000000000 +0200 +++ new/Params-Util-1.06/t/02_main.t 2012-03-01 13:39:39.000000000 +0100 @@ -7,7 +7,7 @@ $ENV{PERL_PARAMS_UTIL_PP} ||= 0; } -use Test::More tests => 612; +use Test::More tests => 632; use File::Spec::Functions ':ALL'; use Scalar::Util 'refaddr'; use Params::Util (); @@ -744,7 +744,19 @@ } +SKIP: { + use_ok( 'Params::Util', '_INSTANCEDOES' ); + skip "DOES tests do not make sense on perls before 5.10", 19 + unless $] >= 5.010; + + null( _INSTANCEDOES(bless({},'Bad'), 'Foo'), '_INSTANCEDOES(bad object) returns undef' ); + + foreach my $object ( @objects ) { + ok( _INSTANCEDOES($object, 'Foo'), '_INSTANCEDOES(object, class) returns true when expected' ); + is( refaddr(_INSTANCEDOES($object, 'Foo')), refaddr($object), '_INSTANCEDOES(object, class) returns the same object' ); + } +} ##################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Params-Util-1.04/t/08_driver.t new/Params-Util-1.06/t/08_driver.t --- old/Params-Util-1.04/t/08_driver.t 2011-04-20 09:15:25.000000000 +0200 +++ new/Params-Util-1.06/t/08_driver.t 2012-03-01 13:39:39.000000000 +0100 @@ -7,7 +7,7 @@ $ENV{PERL_PARAMS_UTIL_PP} ||= 0; } -use Test::More tests => 86; +use Test::More tests => 91; use File::Spec::Functions ':ALL'; BEGIN { ok( ! defined &_CLASSISA, '_CLASSISA does not exist' ); @@ -113,3 +113,15 @@ is( _SUBCLASS('D', 'A'), 'D', 'D: Broken driver is undef' ); is( _SUBCLASS('E', 'A'), undef, 'E: Not a driver returns undef' ); is( _SUBCLASS('F', 'A'), 'F', 'F: Faked isa returns ok' ); + +SKIP: { + use_ok('Params::Util', qw(_CLASSDOES)); + + skip "DOES tests do not make sense on perls before 5.10", 4 + unless $] >= 5.010; + + is( _CLASSDOES('A', 'A'), 'A', 'A: DOES A' ); + is( _CLASSDOES('My_B', 'A'), 'My_B', 'My_B: DOES A' ); + is( _CLASSDOES('E', 'A'), undef, 'E: DOES not A' ); + is( _CLASSDOES('F', 'A'), 'F', 'F: DOES A' ); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Params-Util-1.04/t/11_compile.t new/Params-Util-1.06/t/11_compile.t --- old/Params-Util-1.04/t/11_compile.t 2011-04-20 09:15:49.000000000 +0200 +++ new/Params-Util-1.06/t/11_compile.t 2012-03-01 13:40:00.000000000 +0100 @@ -16,5 +16,5 @@ # Double check that Scalar::Util is valid require_ok( 'Scalar::Util' ); -ok( $Scalar::Util::VERSION >= 1.18, 'Scalar::Util version is at least 1.18' ); +ok( $Scalar::Util::VERSION >= 1.10, 'Scalar::Util version is at least 1.18' ); ok( defined &Scalar::Util::refaddr, 'Scalar::Util has a refaddr implementation' ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Params-Util-1.04/t/12_main.t new/Params-Util-1.06/t/12_main.t --- old/Params-Util-1.04/t/12_main.t 2011-04-20 09:15:49.000000000 +0200 +++ new/Params-Util-1.06/t/12_main.t 2012-03-01 13:40:00.000000000 +0100 @@ -7,7 +7,7 @@ $ENV{PERL_PARAMS_UTIL_PP} ||= 1; } -use Test::More tests => 612; +use Test::More tests => 632; use File::Spec::Functions ':ALL'; use Scalar::Util 'refaddr'; use Params::Util (); @@ -744,7 +744,19 @@ } +SKIP: { + use_ok( 'Params::Util', '_INSTANCEDOES' ); + skip "DOES tests do not make sense on perls before 5.10", 19 + unless $] >= 5.010; + + null( _INSTANCEDOES(bless({},'Bad'), 'Foo'), '_INSTANCEDOES(bad object) returns undef' ); + + foreach my $object ( @objects ) { + ok( _INSTANCEDOES($object, 'Foo'), '_INSTANCEDOES(object, class) returns true when expected' ); + is( refaddr(_INSTANCEDOES($object, 'Foo')), refaddr($object), '_INSTANCEDOES(object, class) returns the same object' ); + } +} ##################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Params-Util-1.04/t/18_driver.t new/Params-Util-1.06/t/18_driver.t --- old/Params-Util-1.04/t/18_driver.t 2011-04-20 09:15:49.000000000 +0200 +++ new/Params-Util-1.06/t/18_driver.t 2012-03-01 13:40:00.000000000 +0100 @@ -7,7 +7,7 @@ $ENV{PERL_PARAMS_UTIL_PP} ||= 1; } -use Test::More tests => 86; +use Test::More tests => 91; use File::Spec::Functions ':ALL'; BEGIN { ok( ! defined &_CLASSISA, '_CLASSISA does not exist' ); @@ -113,3 +113,15 @@ is( _SUBCLASS('D', 'A'), 'D', 'D: Broken driver is undef' ); is( _SUBCLASS('E', 'A'), undef, 'E: Not a driver returns undef' ); is( _SUBCLASS('F', 'A'), 'F', 'F: Faked isa returns ok' ); + +SKIP: { + use_ok('Params::Util', qw(_CLASSDOES)); + + skip "DOES tests do not make sense on perls before 5.10", 4 + unless $] >= 5.010; + + is( _CLASSDOES('A', 'A'), 'A', 'A: DOES A' ); + is( _CLASSDOES('My_B', 'A'), 'My_B', 'My_B: DOES A' ); + is( _CLASSDOES('E', 'A'), undef, 'E: DOES not A' ); + is( _CLASSDOES('F', 'A'), 'F', 'F: DOES A' ); +} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-DBM-Deep for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package perl-DBM-Deep for openSUSE:Factory checked in at 2012-03-06 14:06:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-DBM-Deep (Old) and /work/SRC/openSUSE:Factory/.perl-DBM-Deep.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-DBM-Deep", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-DBM-Deep/perl-DBM-Deep.changes 2011-11-21 12:39:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-DBM-Deep.new/perl-DBM-Deep.changes 2012-03-06 14:06:18.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 29 16:01:17 CET 2012 - ro(a)suse.de + +- update Build_n_Test patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-DBM-Deep.spec ++++++ --- /var/tmp/diff_new_pack.LM4Lds/_old 2012-03-06 14:06:19.000000000 +0100 +++ /var/tmp/diff_new_pack.LM4Lds/_new 2012-03-06 14:06:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-DBM-Deep # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,17 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %bcond_with test Name: perl-DBM-Deep %define cpan_name DBM-Deep Summary: Pure perl multi-level hash/array DBM that supports transactions -Version: 2.0004 -Release: 1 License: GPL-1.0+ or Artistic-1.0 Group: Development/Libraries/Perl +Version: 2.0004 +Release: 0 Url: http://search.cpan.org/dist/DBM-Deep/ Source: http://www.cpan.org/modules/by-module/DBM/DBM-Deep-%{version}.tar.gz # would require Test::More >= 0.88 (done_testing) @@ -36,13 +35,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} BuildRequires: perl -BuildRequires: perl(Module::Build) BuildRequires: perl-macros BuildRequires: perl(Digest::MD5) >= 1.00 BuildRequires: perl(Fcntl) >= 0.01 BuildRequires: perl(File::Path) >= 0.01 BuildRequires: perl(File::Temp) >= 0.01 BuildRequires: perl(IO::Scalar) >= 0.01 +BuildRequires: perl(Module::Build) BuildRequires: perl(Scalar::Util) >= 1.14 BuildRequires: perl(Test::Deep) >= 0.095 BuildRequires: perl(Test::Exception) >= 0.21 ++++++ perl-DBM-Deep_Build_n_Test.patch ++++++ ++++ 773 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/perl-DBM-Deep/perl-DBM-Deep_Build_n_Test.patch ++++ and /work/SRC/openSUSE:Factory/.perl-DBM-Deep.new/perl-DBM-Deep_Build_n_Test.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Data-OptList for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package perl-Data-OptList for openSUSE:Factory checked in at 2012-03-06 14:06:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Data-OptList (Old) and /work/SRC/openSUSE:Factory/.perl-Data-OptList.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Data-OptList", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Data-OptList/perl-Data-OptList.changes 2011-11-21 12:38:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Data-OptList.new/perl-Data-OptList.changes 2012-03-06 14:06:05.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 29 17:09:20 CET 2012 - ro(a)suse.de + +- add old_test_more patch to build with sle11 + +------------------------------------------------------------------- New: ---- old_test_more.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Data-OptList.spec ++++++ --- /var/tmp/diff_new_pack.fOL4MT/_old 2012-03-06 14:06:06.000000000 +0100 +++ /var/tmp/diff_new_pack.fOL4MT/_new 2012-03-06 14:06:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Data-OptList # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,18 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: perl-Data-OptList %define cpan_name Data-OptList Summary: Parse and validate simple name/value option pairs -Version: 0.107 -Release: 4 License: Artistic-1.0 Group: Development/Libraries/Perl +Version: 0.107 +Release: 0 Url: http://search.cpan.org/dist/Data-OptList Source: http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Data-OptList-%{version}.ta… +%if 0%{?suse_version} < 1120 +Patch0: old_test_more.patch +%endif BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} @@ -34,13 +35,13 @@ BuildRequires: perl-macros BuildRequires: perl(List::Util) >= 0.00 # other not perl || perl-base -BuildRequires: perl(Sub::Install) >= 0.921 BuildRequires: perl(Params::Util) >= 0.14 +BuildRequires: perl(Sub::Install) >= 0.921 # Requires: perl(List::Util) >= 0.00 # other not perl || perl-base -Requires: perl(Sub::Install) >= 0.921 Requires: perl(Params::Util) >= 0.14 +Requires: perl(Sub::Install) >= 0.921 %description Hashes are great for storing named data, but if you want more than one @@ -79,6 +80,9 @@ %prep %setup -q -n %{cpan_name}-%{version} +%if 0%{?suse_version} < 1120 +%patch0 +%endif %build %{__perl} Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall" ++++++ old_test_more.patch ++++++ --- Makefile.PL +++ Makefile.PL @@ -12,7 +12,7 @@ 'ABSTRACT' => 'parse and validate simple name/value option pairs', 'AUTHOR' => 'Ricardo Signes <rjbs(a)cpan.org>', 'BUILD_REQUIRES' => { - 'Test::More' => '0.96' + 'Test::More' => '0.01' }, 'CONFIGURE_REQUIRES' => { 'ExtUtils::MakeMaker' => '6.30' --- t/mkopt.t +++ t/mkopt.t @@ -10,7 +10,7 @@ use Data::OptList; use Sub::Install; -use Test::More 0.88; +use Test::More qw(no_plan); # let's get a convenient copy to use: @@ -180,4 +180,4 @@ ], ); -done_testing; +#done_testing; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Class-Load for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package perl-Class-Load for openSUSE:Factory checked in at 2012-03-06 14:05:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Class-Load (Old) and /work/SRC/openSUSE:Factory/.perl-Class-Load.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Class-Load", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Class-Load/perl-Class-Load.changes 2012-02-21 12:23:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Class-Load.new/perl-Class-Load.changes 2012-03-06 14:06:00.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 1 01:15:09 CET 2012 - ro(a)suse.de + +- fix build with old Test::More on sle11 + +------------------------------------------------------------------- New: ---- perl-Class-Load-old_test_more.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Class-Load.spec ++++++ --- /var/tmp/diff_new_pack.sZjuF0/_old 2012-03-06 14:06:01.000000000 +0100 +++ /var/tmp/diff_new_pack.sZjuF0/_new 2012-03-06 14:06:01.000000000 +0100 @@ -25,6 +25,9 @@ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Class-Load/ Source: http://www.cpan.org/authors/id/D/DR/DROLSKY/%{cpan_name}-%{version}.tar.gz +%if 0%{?suse_version} <= 1110 +Patch0: perl-Class-Load-old_test_more.patch +%endif BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -67,6 +70,9 @@ %prep %setup -q -n %{cpan_name}-%{version} +%if 0%{?suse_version} <= 1110 +%patch0 +%endif %build %{__perl} Makefile.PL INSTALLDIRS=vendor ++++++ perl-Class-Load-old_test_more.patch ++++++ diff -urN t.orig/000-load.t t/000-load.t --- t.orig/000-load.t 2012-02-18 21:51:26.000000000 +0100 +++ t/000-load.t 2012-03-01 01:14:05.581239000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; use warnings; -use Test::More 0.88; +use Test::More qw(no_plan); use lib 't/lib'; @@ -13,4 +13,4 @@ . Module::Implementation::implementation_for('Class::Load') . ' implementation' ); -done_testing; +#done_testing; diff -urN t.orig/001-is-class-loaded.t t/001-is-class-loaded.t --- t.orig/001-is-class-loaded.t 2012-02-18 21:51:26.000000000 +0100 +++ t/001-is-class-loaded.t 2012-03-01 01:14:05.609240000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; use warnings; -use Test::More 0.88; +use Test::More qw(no_plan); use version; @@ -106,4 +106,4 @@ ok(is_class_loaded('Class::Load::VersionCheck', {-version => 41}), 'Class::Load::VersionCheck has been loaded and the version check passed'); -done_testing; +#done_testing; diff -urN t.orig/002-try-load-class.t t/002-try-load-class.t --- t.orig/002-try-load-class.t 2012-02-18 21:51:26.000000000 +0100 +++ t/002-try-load-class.t 2012-03-01 01:14:05.554239000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; use warnings; -use Test::More 0.88; +use Test::More qw(no_plan); use lib 't/lib'; use Test::Class::Load ':all'; @@ -36,4 +36,4 @@ ok(try_load_class('Class::Load::VersionCheck2', { -version => 41 })); ok(!try_load_class('Class::Load::VersionCheck2', { -version => 43 })); -done_testing; +#done_testing; diff -urN t.orig/003-load-class.t t/003-load-class.t --- t.orig/003-load-class.t 2012-02-18 21:51:26.000000000 +0100 +++ t/003-load-class.t 2012-03-01 01:14:05.605241000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; use warnings; -use Test::More 0.88; +use Test::More qw(no_plan); use lib 't/lib'; use Test::Class::Load ':all'; use Test::Fatal; @@ -53,4 +53,4 @@ load_class('__PACKAGE__') }, qr/__PACKAGE__\.pm.*\@INC/, 'errors sanely on __PACKAGE__.pm' ); -done_testing; +#done_testing; diff -urN t.orig/004-load-double.t t/004-load-double.t --- t.orig/004-load-double.t 2012-02-18 21:51:26.000000000 +0100 +++ t/004-load-double.t 2012-03-01 01:14:05.568241000 +0100 @@ -1,7 +1,7 @@ use strict; use warnings; -use Test::More 0.88; +use Test::More qw(no_plan); use lib 't/lib'; use Test::Class::Load ':all'; use Test::Fatal; @@ -25,4 +25,4 @@ load_class('Class::Load::SyntaxError'); }, qr/syntax error/ ); -done_testing; +#done_testing; diff -urN t.orig/005-load-optional.t t/005-load-optional.t --- t.orig/005-load-optional.t 2012-02-18 21:51:26.000000000 +0100 +++ t/005-load-optional.t 2012-03-01 01:14:05.557248000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; -use Test::More 0.88; +use Test::More qw(no_plan); use Test::Fatal; use lib 't/lib'; use Test::Class::Load qw( :all ); @@ -40,4 +40,4 @@ is( load_optional_class('Class::Load::VersionCheck', {-version => 41}), 1, 'VersionCheck (with ok version) => 1'); -done_testing; +#done_testing; diff -urN t.orig/006-returned-error.t t/006-returned-error.t --- t.orig/006-returned-error.t 2012-02-18 21:51:26.000000000 +0100 +++ t/006-returned-error.t 2012-03-01 01:14:05.565241000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; use warnings; -use Test::More 0.88; +use Test::More qw(no_plan); use lib 't/lib'; use Test::Class::Load ':all'; @@ -46,4 +46,4 @@ is($@, "foo"); } -done_testing; +#done_testing; diff -urN t.orig/007-first-existing.t t/007-first-existing.t --- t.orig/007-first-existing.t 2012-02-18 21:51:26.000000000 +0100 +++ t/007-first-existing.t 2012-03-01 01:14:05.542239000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; use Test::Fatal; -use Test::More 0.88; +use Test::More qw(no_plan); use lib 't/lib'; use Test::Class::Load 'load_first_existing_class'; @@ -121,4 +121,4 @@ 'load_first_existing_class returns loadable class when a class passes the version check' ); -done_testing; +#done_testing; diff -urN t.orig/008-gvstash-bug.t t/008-gvstash-bug.t --- t.orig/008-gvstash-bug.t 2012-02-18 21:51:26.000000000 +0100 +++ t/008-gvstash-bug.t 2012-03-01 01:14:05.536246000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; use Test::Fatal; -use Test::More 0.88; +use Test::More qw(no_plan); use lib 't/lib'; use Test::Class::Load 'load_class'; @@ -21,4 +21,4 @@ }, undef, 'Actually loaded Class::Load::Stash - we were not fooled by mention of this stash in Class::Load::Stash::Sub' ); -done_testing; +#done_testing; diff -urN t.orig/009-invalid-module-name.t t/009-invalid-module-name.t --- t.orig/009-invalid-module-name.t 2012-02-18 21:51:26.000000000 +0100 +++ t/009-invalid-module-name.t 2012-03-01 01:14:05.586239000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; use Test::Fatal; -use Test::More 0.88; +use Test::More qw(no_plan); use lib 't/lib'; use Test::Class::Load 'load_class'; @@ -23,4 +23,4 @@ ); } -done_testing; +#done_testing; diff -urN t.orig/010-isa-false-positive.t t/010-isa-false-positive.t --- t.orig/010-isa-false-positive.t 2012-02-18 21:51:26.000000000 +0100 +++ t/010-isa-false-positive.t 2012-03-01 01:14:05.601248000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; use warnings; -use Test::More 0.88; +use Test::More qw(no_plan); use Test::Fatal; use lib 't/lib'; @@ -65,4 +65,4 @@ 'Class with a syntax error causes an error (second attempt)' ); -done_testing; +#done_testing; diff -urN t.orig/011-without-xs.t t/011-without-xs.t --- t.orig/011-without-xs.t 2012-02-18 21:51:26.000000000 +0100 +++ t/011-without-xs.t 2012-03-01 01:14:05.548250000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; use warnings; -use Test::More 0.88; +use Test::More qw(no_plan); use Test::Fatal; use Test::Requires { @@ -21,4 +21,4 @@ ); } -done_testing(); +#done_testing(); diff -urN t.orig/012-without-implementation.t t/012-without-implementation.t --- t.orig/012-without-implementation.t 2012-02-18 21:51:26.000000000 +0100 +++ t/012-without-implementation.t 2012-03-01 01:14:05.490240000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; use warnings; -use Test::More 0.88; +use Test::More qw(no_plan); use Test::Fatal; use Test::Requires { @@ -18,4 +18,4 @@ ); } -done_testing(); +#done_testing(); diff -urN t.orig/release-cpan-changes.t t/release-cpan-changes.t --- t.orig/release-cpan-changes.t 2012-02-18 21:51:26.000000000 +0100 +++ t/release-cpan-changes.t 2012-03-01 01:14:05.598239000 +0100 @@ -8,8 +8,8 @@ } -use Test::More; +use Test::More qw(no_plan); eval 'use Test::CPAN::Changes'; plan skip_all => 'Test::CPAN::Changes required for this test' if $@; changes_ok(); -done_testing(); +#done_testing(); diff -urN t.orig/release-eol.t t/release-eol.t --- t.orig/release-eol.t 2012-02-18 21:51:26.000000000 +0100 +++ t/release-eol.t 2012-03-01 01:14:05.571251000 +0100 @@ -8,7 +8,7 @@ use strict; use warnings; -use Test::More; +use Test::More qw(no_plan); eval 'use Test::EOL'; plan skip_all => 'Test::EOL required' if $@; diff -urN t.orig/release-no-tabs.t t/release-no-tabs.t --- t.orig/release-no-tabs.t 2012-02-18 21:51:26.000000000 +0100 +++ t/release-no-tabs.t 2012-03-01 01:14:05.545243000 +0100 @@ -8,7 +8,7 @@ use strict; use warnings; -use Test::More; +use Test::More qw(no_plan); eval 'use Test::NoTabs'; plan skip_all => 'Test::NoTabs required' if $@; diff -urN t.orig/release-pod-coverage.t t/release-pod-coverage.t --- t.orig/release-pod-coverage.t 2012-02-18 21:51:26.000000000 +0100 +++ t/release-pod-coverage.t 2012-03-01 01:14:05.593241000 +0100 @@ -11,7 +11,7 @@ use strict; use warnings; -use Test::More; +use Test::More qw(no_plan); use Test::Requires { 'Test::Pod::Coverage' => '1.04', @@ -45,4 +45,4 @@ ); } -done_testing(); +#done_testing(); diff -urN t.orig/release-pod-linkcheck.t t/release-pod-linkcheck.t --- t.orig/release-pod-linkcheck.t 2012-02-18 21:51:26.000000000 +0100 +++ t/release-pod-linkcheck.t 2012-03-01 01:14:05.560248000 +0100 @@ -10,7 +10,7 @@ use strict; use warnings; -use Test::More; +use Test::More qw(no_plan); foreach my $env_skip ( qw( SKIP_POD_LINKCHECK diff -urN t.orig/release-pod-no404s.t t/release-pod-no404s.t --- t.orig/release-pod-no404s.t 2012-02-18 21:51:26.000000000 +0100 +++ t/release-pod-no404s.t 2012-03-01 01:14:05.590240000 +0100 @@ -10,7 +10,7 @@ use strict; use warnings; -use Test::More; +use Test::More qw(no_plan); foreach my $env_skip ( qw( SKIP_POD_NO404S diff -urN t.orig/release-pod-syntax.t t/release-pod-syntax.t --- t.orig/release-pod-syntax.t 2012-02-18 21:51:26.000000000 +0100 +++ t/release-pod-syntax.t 2012-03-01 01:14:05.577245000 +0100 @@ -7,7 +7,7 @@ } } -use Test::More; +use Test::More qw(no_plan); eval "use Test::Pod 1.41"; plan skip_all => "Test::Pod 1.41 required for testing POD" if $@; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-B-Hooks-EndOfScope for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package perl-B-Hooks-EndOfScope for openSUSE:Factory checked in at 2012-03-06 14:05:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-B-Hooks-EndOfScope (Old) and /work/SRC/openSUSE:Factory/.perl-B-Hooks-EndOfScope.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-B-Hooks-EndOfScope", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-B-Hooks-EndOfScope/perl-B-Hooks-EndOfScope.changes 2012-02-28 14:14:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-B-Hooks-EndOfScope.new/perl-B-Hooks-EndOfScope.changes 2012-03-06 14:05:49.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 29 18:13:24 CET 2012 - ro(a)suse.de + +- add old_test_more patch to fix build on sle11 + +------------------------------------------------------------------- New: ---- old_test_more.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-B-Hooks-EndOfScope.spec ++++++ --- /var/tmp/diff_new_pack.0YHoLQ/_old 2012-03-06 14:05:49.000000000 +0100 +++ /var/tmp/diff_new_pack.0YHoLQ/_new 2012-03-06 14:05:49.000000000 +0100 @@ -25,6 +25,9 @@ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/B-Hooks-EndOfScope/ Source: http://www.cpan.org/authors/id/F/FL/FLORA/%{cpan_name}-%{version}.tar.gz +%if 0%{?suse_version} <= 1110 +Patch0: old_test_more.patch +%endif BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -47,6 +50,9 @@ %if 0%{?sles_version} == 10 %{__perl} -p -i -e 's|6.31|6.30|' Makefile.PL %endif +%if 0%{?suse_version} <= 1110 +%patch0 +%endif # MANUAL END %build ++++++ old_test_more.patch ++++++ --- Makefile.PL +++ Makefile.PL @@ -12,7 +12,7 @@ "ABSTRACT" => "Execute code after a scope finished compilation", "AUTHOR" => "Florian Ragwitz <rafl\(a)debian.org>", "BUILD_REQUIRES" => { - "Test::More" => "0.89" + "Test::More" => "0.01" }, "CONFIGURE_REQUIRES" => { "ExtUtils::MakeMaker" => "6.30" --- t/localise.t +++ t/localise.t @@ -1,7 +1,7 @@ use strict; use warnings; -use Test::More 0.89; +use Test::More qw(no_plan); use B::Hooks::EndOfScope; @@ -47,4 +47,4 @@ BEGIN { ok($fired) } } -done_testing; +#done_testing; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Mesa for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at 2012-03-06 14:05:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Mesa (Old) and /work/SRC/openSUSE:Factory/.Mesa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Mesa", Maintainer is "sndirsch(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/Mesa/Mesa.changes 2012-02-25 07:30:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.Mesa.new/Mesa.changes 2012-03-06 14:05:34.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Mar 1 08:22:41 UTC 2012 - coolo(a)suse.com + +- fix baselibs.conf after update of libOSMesa +- do not put the date in generated code, this breaks build-compare + for little to no gain as we know the build date from rpm header + +------------------------------------------------------------------- New: ---- Mesa-nodate.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.VfwsxK/_old 2012-03-06 14:05:36.000000000 +0100 +++ /var/tmp/diff_new_pack.VfwsxK/_new 2012-03-06 14:05:36.000000000 +0100 @@ -62,11 +62,12 @@ Provides: intel-i810-Mesa = %{version} Obsoletes: intel-i810-Mesa < %{version} Provides: xorg-x11-Mesa = %{version} -Obsoletes: xorg-x11-Mesa < %{version} Obsoletes: Mesa-nouveau3d +Obsoletes: xorg-x11-Mesa < %{version} # bug437293 %ifarch ppc64 -Obsoletes: XFree86-Mesa-64bit < %{version} Mesa-64bit < %{version} +Obsoletes: Mesa-64bit < %{version} +Obsoletes: XFree86-Mesa-64bit < %{version} Provides: Mesa-64bit < %{version} Provides: XFree86-Mesa-64bit = %{version} %endif @@ -80,6 +81,8 @@ Source4: manual-pages.tar.bz2 Source5: drirc Source6: %name-rpmlintrc +# PATCH-FIX-OPENSUSE do not put dates in sources to fix build-compare +Patch1: Mesa-nodate.diff # to be upstreamed Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch # already upstream @@ -110,19 +113,21 @@ Requires: Mesa-libGLESv2-devel = %version Requires: Mesa-libGLU-devel = %version Requires: Mesa-libIndirectGL1 = %version -Requires: libOSMesa8 = %version Requires: Mesa-libglapi0 = %version +Requires: libOSMesa8 = %version Requires: libgbm-devel # bug437293 %ifarch ppc64 -Obsoletes: XFree86-Mesa-devel-64bit < %{version} Mesa-devel-64bit < %{version} +Obsoletes: Mesa-devel-64bit < %{version} +Obsoletes: XFree86-Mesa-devel-64bit < %{version} Provides: Mesa-devel-64bit = %{version} Provides: XFree86-Mesa-devel-64bit = %{version} %endif # Provides: Mesa-devel-static = %{version} Provides: xorg-x11-Mesa-devel = %{version} -Obsoletes: xorg-x11-Mesa-devel < %{version} Mesa-devel-static < %{version} +Obsoletes: Mesa-devel-static < %{version} +Obsoletes: xorg-x11-Mesa-devel < %{version} %description devel Mesa is a 3-D graphics library with an API which is very similar to @@ -354,6 +359,7 @@ %prep %setup -n %{name}-%{_version} -b4 -q +%patch1 -p1 # no need to build (GLUT-)Demos rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl} # we use freeglut ++++++ Mesa-nodate.diff ++++++ Index: Mesa-7.11.1/src/mesa/main/es_generator.py =================================================================== --- Mesa-7.11.1.orig/src/mesa/main/es_generator.py 2011-11-17 20:45:06.000000000 +0100 +++ Mesa-7.11.1/src/mesa/main/es_generator.py 2012-03-01 09:27:01.392009165 +0100 @@ -182,9 +182,8 @@ print """/* DO NOT EDIT **************** * THIS FILE AUTOMATICALLY GENERATED BY THE %s SCRIPT * API specification file: %s * GLES version: %s - * date: %s */ -""" % (program, functionList, version, time.strftime("%Y-%m-%d %H:%M:%S")) +""" % (program, functionList, version) # The headers we choose are version-specific. print """ ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.VfwsxK/_old 2012-03-06 14:05:36.000000000 +0100 +++ /var/tmp/diff_new_pack.VfwsxK/_new 2012-03-06 14:05:36.000000000 +0100 @@ -10,7 +10,7 @@ requires "Mesa-libGLESv2-devel-<targettype> = <version>" requires "Mesa-libGLU-devel-<targettype> = <version>" requires "Mesa-libIndirectGL1-<targettype> = <version>" - requires "libOSMesa7-<targettype> = <version>" + requires "libOSMesa8-<targettype> = <version>" requires "libgbm-devel-<targettype>" requires "Mesa-libglapi0-<targettype> = <version>" obsoletes "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libwmf for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package libwmf for openSUSE:Factory checked in at 2012-03-06 14:05:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libwmf (Old) and /work/SRC/openSUSE:Factory/.libwmf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libwmf", Maintainer is "nadvornik(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes 2011-11-23 19:36:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libwmf.new/libwmf.changes 2012-03-06 14:05:26.000000000 +0100 @@ -1,0 +2,17 @@ +Sat Mar 3 09:50:58 UTC 2012 - jengelh(a)medozas.de + +- Add libjpeg-devel as BuildRequires, needed to resolve build error +- Add selected Xorg packages to BR to have wmf2x be built again + +------------------------------------------------------------------- +Mon Jan 30 00:19:40 UTC 2012 - jengelh(a)medozas.de + +- Remove further redundant sections + +------------------------------------------------------------------- +Tue Nov 29 15:23:14 UTC 2011 - jengelh(a)medozas.de + +- Actually use "libwmf-tools" instead of wmf-utils, this goes much + more in line with the preexisting libwpd-tools and libwps-tools. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwmf.spec ++++++ --- /var/tmp/diff_new_pack.KyFgMT/_old 2012-03-06 14:05:28.000000000 +0100 +++ /var/tmp/diff_new_pack.KyFgMT/_new 2012-03-06 14:05:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libwmf # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,18 +16,26 @@ # - Name: libwmf %define lname libwmf-0_2-7 -BuildRequires: gd-devel gtk2-devel libtiff-devel libxml2-devel update-desktop-files +BuildRequires: gd-devel +BuildRequires: gtk2-devel +BuildRequires: libjpeg-devel +BuildRequires: libtiff-devel +BuildRequires: libxml2-devel +BuildRequires: update-desktop-files +BuildRequires: xorg-x11-proto-devel +BuildRequires: xorg-x11-util-devel +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xt) Provides: wv:/usr/bin/wmftopng Provides: mswordvw:/usr/bin/wmftopng -License: LGPL-2.1+ -Group: Productivity/Graphics/Other Version: 0.2.8.4 -Release: 218 +Release: 0 Summary: Utilities for Displaying and Converting Metafile Images -URL: http://wvWare.sourceforge.net/ +License: LGPL-2.1+ +Group: Productivity/Graphics/Other +Url: http://wvWare.sourceforge.net/ Source: libwmf-%{version}.tar.bz2 Source2: baselibs.conf Patch: libwmf-%{version}-ia64.patch @@ -42,21 +50,14 @@ using the X Window System or convert them to standard formats such as PNG, JPEG, PS, EPS, and more. - - -Authors: --------- - Caolan McNamara - Francis James Franklin <fjf(a)alinameridon.com> - -%package -n wmf-utils +%package tools Summary: Utilities for Displaying and Converting Metafile Images Group: Productivity/Graphics/Other # Prov/Obs added on 2011-11-22 (post openSUSE 12.1) -Provides: libwmf = %version-%release -Obsoletes: libwmf < %version-%release +Provides: libwmf = %version-%release, wmf-utils = %version-%release +Obsoletes: libwmf < %version-%release, wmf-utils < %version-%release -%description -n wmf-utils +%description tools These utilities read metafile images and can either display them using the X Window System or convert them to standard formats such as PNG, JPEG, PS, EPS, and more. @@ -80,13 +81,6 @@ The libwmf-devel package contains the header files and static libraries necessary for developing programs using libwmf. - - -Authors: --------- - Caolan McNamara - Francis James Franklin <fjf(a)alinameridon.com> - %package gnome Summary: GNOME plugin for displaying and Converting Metafile Images Group: System/Libraries @@ -96,13 +90,6 @@ using the X Window System or convert them to standard formats such as PNG, JPEG, PS, EPS, and more. - - -Authors: --------- - Caolan McNamara - Francis James Franklin <fjf(a)alinameridon.com> - %prep %setup -q %patch -p0 @@ -116,7 +103,6 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr/include/libwmf make DESTDIR=$RPM_BUILD_ROOT \ wmfdocdir=%{_defaultdocdir}/libwmf \ @@ -128,7 +114,7 @@ %postun -n %lname -p /sbin/ldconfig -%files -n wmf-utils +%files tools %defattr(-,root,root) /usr/bin/libwmf-fontmap /usr/bin/wmf2eps -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit glibmm2 for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package glibmm2 for openSUSE:Factory checked in at 2012-03-06 14:05:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glibmm2 (Old) and /work/SRC/openSUSE:Factory/.glibmm2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glibmm2", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/glibmm2/glibmm2.changes 2012-02-28 19:22:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.glibmm2.new/glibmm2.changes 2012-03-06 14:05:14.000000000 +0100 @@ -1,0 +2,20 @@ +Mon Feb 27 12:46:36 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 2.31.18.1: + + gmmproc: + - h2def.py: Handle types such as 'const gchar* const *' for + functions. + - _WRAP_PROPERTY(): Allow properties to be deprecated. + + Gio: + - Application: Derive from the ActionGroup interface. + - Application: Add missing virtual functions and + get/set_default() methods. + - Add MenuModel, MenuAttribute, MenuLink and MenuIter. + + Gio::DBus: + - ActionGroup, MenuModel: Have get() methods instead of + create() methods (bgo#637445). + - Add DBus::MenuModel. + - Connection: Add the MenuModel export/unexport methods. + - Add class documentation. + +------------------------------------------------------------------- Old: ---- glibmm-2.31.18.tar.xz New: ---- glibmm-2.31.18.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibmm2.spec ++++++ --- /var/tmp/diff_new_pack.qPB7vh/_old 2012-03-06 14:05:16.000000000 +0100 +++ /var/tmp/diff_new_pack.qPB7vh/_new 2012-03-06 14:05:16.000000000 +0100 @@ -21,7 +21,7 @@ Name: glibmm2 %define _name glibmm -Version: 2.31.18 +Version: 2.31.18.1 Release: 0 Summary: C++ Interface for Glib License: LGPL-2.1+ @@ -69,8 +69,8 @@ %package devel Summary: C++ Interface for GLib Group: Development/Libraries/C and C++ -Requires: libglibmm%{so_ver} = %{version} Requires: libgiomm%{so_ver} = %{version} +Requires: libglibmm%{so_ver} = %{version} Provides: glibmm24-devel = %{version} Obsoletes: glibmm24-devel < %{version} Provides: %{name}-doc = %{version} -- 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-bootloader for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2012-03-06 13:42:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader", Maintainer is "snwint(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2012-01-20 20:29:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2012-03-06 13:42:15.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 5 14:42:10 CET 2012 - mchang(a)suse.com + +- add basic grub2 support that only handles installs +- 2.23.0 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.22.0.tar.bz2 New: ---- yast2-bootloader-2.23.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.5POz10/_old 2012-03-06 13:42:17.000000000 +0100 +++ /var/tmp/diff_new_pack.5POz10/_new 2012-03-06 13:42:17.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 2.22.0 +Version: 2.23.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -91,6 +91,7 @@ export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +%{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works ++++++ yast2-bootloader-2.22.0.tar.bz2 -> yast2-bootloader-2.23.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.22.0/VERSION new/yast2-bootloader-2.23.0/VERSION --- old/yast2-bootloader-2.22.0/VERSION 2012-01-13 11:33:35.000000000 +0100 +++ new/yast2-bootloader-2.23.0/VERSION 2012-03-05 15:09:26.000000000 +0100 @@ -1 +1 @@ -2.22.0 +2.23.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.22.0/configure new/yast2-bootloader-2.23.0/configure --- old/yast2-bootloader-2.22.0/configure 2012-01-20 12:31:03.000000000 +0100 +++ new/yast2-bootloader-2.23.0/configure 2012-03-05 15:09:51.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-bootloader 2.22.0. +# Generated by GNU Autoconf 2.68 for yast2-bootloader 2.23.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='yast2-bootloader' PACKAGE_TARNAME='yast2-bootloader' -PACKAGE_VERSION='2.22.0' -PACKAGE_STRING='yast2-bootloader 2.22.0' +PACKAGE_VERSION='2.23.0' +PACKAGE_STRING='yast2-bootloader 2.23.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1364,7 +1364,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-bootloader 2.22.0 to adapt to many kinds of systems. +\`configure' configures yast2-bootloader 2.23.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1436,7 +1436,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-bootloader 2.22.0:";; + short | recursive ) echo "Configuration of yast2-bootloader 2.23.0:";; esac cat <<\_ACEOF @@ -1552,7 +1552,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-bootloader configure 2.22.0 +yast2-bootloader configure 2.23.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2005,7 +2005,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-bootloader $as_me 2.22.0, which was +It was created by yast2-bootloader $as_me 2.23.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2935,7 +2935,7 @@ # Define the identity of the package. PACKAGE='yast2-bootloader' - VERSION='2.22.0' + VERSION='2.23.0' cat >>confdefs.h <<_ACEOF @@ -3057,7 +3057,7 @@ -VERSION="2.22.0" +VERSION="2.23.0" RPMNAME="yast2-bootloader" MAINTAINER="Steffen Winterfeldt <snwint(a)suse.de>" @@ -16127,7 +16127,7 @@ fi -ac_config_files="$ac_config_files Makefile src/routines/Makefile src/modules/Makefile src/lilo/Makefile src/grub/Makefile src/elilo/Makefile src/ppc/Makefile src/zipl/Makefile src/config/Makefile src/clients/Makefile src/Makefile scripts/Makefile agents/Makefile doc/autodocs/Makefile doc/Makefile" +ac_config_files="$ac_config_files Makefile src/routines/Makefile src/modules/Makefile src/lilo/Makefile src/grub/Makefile src/grub2/Makefile src/elilo/Makefile src/ppc/Makefile src/zipl/Makefile src/config/Makefile src/clients/Makefile src/Makefile scripts/Makefile agents/Makefile doc/autodocs/Makefile doc/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16695,7 +16695,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-bootloader $as_me 2.22.0, which was +This file was extended by yast2-bootloader $as_me 2.23.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16761,7 +16761,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-bootloader config.status 2.22.0 +yast2-bootloader config.status 2.23.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -17275,6 +17275,7 @@ "src/modules/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/Makefile" ;; "src/lilo/Makefile") CONFIG_FILES="$CONFIG_FILES src/lilo/Makefile" ;; "src/grub/Makefile") CONFIG_FILES="$CONFIG_FILES src/grub/Makefile" ;; + "src/grub2/Makefile") CONFIG_FILES="$CONFIG_FILES src/grub2/Makefile" ;; "src/elilo/Makefile") CONFIG_FILES="$CONFIG_FILES src/elilo/Makefile" ;; "src/ppc/Makefile") CONFIG_FILES="$CONFIG_FILES src/ppc/Makefile" ;; "src/zipl/Makefile") CONFIG_FILES="$CONFIG_FILES src/zipl/Makefile" ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.22.0/configure.in new/yast2-bootloader-2.23.0/configure.in --- old/yast2-bootloader-2.22.0/configure.in 2012-01-20 12:30:44.000000000 +0100 +++ new/yast2-bootloader-2.23.0/configure.in 2012-03-05 15:09:45.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-bootloader dnl -dnl -- This file is generated by y2autoconf 2.21.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-bootloader, 2.22.0, http://bugs.opensuse.org/, yast2-bootloader) +AC_INIT(yast2-bootloader, 2.23.0, http://bugs.opensuse.org/, yast2-bootloader) 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.22.0" +VERSION="2.23.0" RPMNAME="yast2-bootloader" MAINTAINER="Steffen Winterfeldt <snwint(a)suse.de>" @@ -205,6 +205,7 @@ src/modules/Makefile src/lilo/Makefile src/grub/Makefile +src/grub2/Makefile src/elilo/Makefile src/ppc/Makefile src/zipl/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.22.0/src/Makefile.am new/yast2-bootloader-2.23.0/src/Makefile.am --- old/yast2-bootloader-2.22.0/src/Makefile.am 2009-04-02 10:41:25.000000000 +0200 +++ new/yast2-bootloader-2.23.0/src/Makefile.am 2012-03-05 15:09:25.000000000 +0100 @@ -1 +1 @@ -SUBDIRS = routines modules lilo grub elilo ppc zipl config clients +SUBDIRS = routines modules lilo grub grub2 elilo ppc zipl config clients diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.22.0/src/Makefile.in new/yast2-bootloader-2.23.0/src/Makefile.in --- old/yast2-bootloader-2.22.0/src/Makefile.in 2012-01-20 12:31:07.000000000 +0100 +++ new/yast2-bootloader-2.23.0/src/Makefile.in 2012-03-05 15:09:52.000000000 +0100 @@ -258,7 +258,7 @@ ydatadir = @ydatadir@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ -SUBDIRS = routines modules lilo grub elilo ppc zipl config clients +SUBDIRS = routines modules lilo grub grub2 elilo ppc zipl config clients all: all-recursive .SUFFIXES: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.22.0/src/grub2/Makefile.am new/yast2-bootloader-2.23.0/src/grub2/Makefile.am --- old/yast2-bootloader-2.22.0/src/grub2/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-2.23.0/src/grub2/Makefile.am 2012-03-05 15:09:25.000000000 +0100 @@ -0,0 +1,11 @@ +# +# Makefile.am for bootloader/src +# + +yncludedir = @yncludedir@/bootloader/grub2 + +ynclude_DATA = \ + dialogs.ycp + +EXTRA_DIST = \ + $(ynclude_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.22.0/src/grub2/Makefile.in new/yast2-bootloader-2.23.0/src/grub2/Makefile.in --- old/yast2-bootloader-2.22.0/src/grub2/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-2.23.0/src/grub2/Makefile.in 2012-03-05 15:09:52.000000000 +0100 @@ -0,0 +1,466 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# Makefile.am for bootloader/src +# + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = src/grub2 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/libtool.m4 \ + $(top_srcdir)/ltoptions.m4 $(top_srcdir)/ltsugar.m4 \ + $(top_srcdir)/ltversion.m4 $(top_srcdir)/lt~obsolete.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__installdirs = "$(DESTDIR)$(yncludedir)" +DATA = $(ynclude_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AGENT_LIBADD = @AGENT_LIBADD@ +ALLOCA = @ALLOCA@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINTAINER = @MAINTAINER@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +RPMNAME = @RPMNAME@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +STYLESHEET_CSS = @STYLESHEET_CSS@ +STYLESHEET_HTML = @STYLESHEET_HTML@ +STYLESHEET_PDF = @STYLESHEET_PDF@ +STYLESHEET_YCPDOC = @STYLESHEET_YCPDOC@ +STYLESHEET_YDOC = @STYLESHEET_YDOC@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ +YCPC = @YCPC@ +YCPDOC = @YCPDOC@ +YCPMAKEDEP = @YCPMAKEDEP@ +YDOXYGEN = @YDOXYGEN@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +agentdir = @agentdir@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +clientdir = @clientdir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +desktopdir = @desktopdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +execcompdir = @execcompdir@ +fillupdir = @fillupdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +imagedir = @imagedir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +moduledir = @moduledir@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgconfigdatadir = @pkgconfigdatadir@ +pkgconfigdir = @pkgconfigdir@ +plugindir = @plugindir@ +potdir = @potdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +schemadir = @schemadir@ +scrconfdir = @scrconfdir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +themedir = @themedir@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +yast2dir = @yast2dir@ +ybindir = @ybindir@ +ydatadir = @ydatadir@ +yncludedir = @yncludedir@/bootloader/grub2 +ystartupdir = @ystartupdir@ +ynclude_DATA = \ + dialogs.ycp + +EXTRA_DIST = \ + $(ynclude_DATA) + +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/grub2/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/grub2/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-yncludeDATA: $(ynclude_DATA) + @$(NORMAL_INSTALL) + test -z "$(yncludedir)" || $(MKDIR_P) "$(DESTDIR)$(yncludedir)" + @list='$(ynclude_DATA)'; test -n "$(yncludedir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(yncludedir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(yncludedir)" || exit $$?; \ + done + +uninstall-yncludeDATA: + @$(NORMAL_UNINSTALL) + @list='$(ynclude_DATA)'; test -n "$(yncludedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(yncludedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(yncludedir)" && rm -f $$files +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(yncludedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-yncludeDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-yncludeDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + install-yncludeDATA installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-yncludeDATA + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.22.0/src/grub2/dialogs.ycp new/yast2-bootloader-2.23.0/src/grub2/dialogs.ycp --- old/yast2-bootloader-2.22.0/src/grub2/dialogs.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-2.23.0/src/grub2/dialogs.ycp 2012-03-05 15:09:25.000000000 +0100 @@ -0,0 +1,51 @@ +/** + * File: + * include/bootloader/grub2/dialogs.ycp + * + * Module: + * Bootloader installation and configuration + * + * Summary: + * Dialogs for configuraion i386-specific functions + * + * Authors: + * Jiri Srain <jsrain(a)suse.cz> + * + * $Id: dialogs.ycp 56563 2009-04-02 08:41:25Z jreidinger $ + * + */ + +{ + +textdomain "bootloader"; + + +import "Label"; +import "Wizard"; +import "CWM"; +import "BootCommon"; +import "Stage"; + +include "bootloader/grub/options.ycp"; + +/** + * Cache for genericWidgets function + */ +map<string,map<string,any> > _grub2_widgets = nil; + +/** + * Get generic widgets + * @return a map describing all generic widgets + */ +global map<string,map<string,any> > grub2Widgets () { + if (_grub2_widgets == nil) + { + _grub2_widgets = $[ + "loader_location" : grubBootLoaderLocationWidget (), + ]; + } + return _grub2_widgets; +} + +} //EOF + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.22.0/src/modules/BootCommon.ycp new/yast2-bootloader-2.23.0/src/modules/BootCommon.ycp --- old/yast2-bootloader-2.22.0/src/modules/BootCommon.ycp 2011-10-18 16:30:01.000000000 +0200 +++ new/yast2-bootloader-2.23.0/src/modules/BootCommon.ycp 2012-03-05 15:09:25.000000000 +0100 @@ -15,7 +15,7 @@ * Joachim Plack <jplack(a)suse.de> * Olaf Dabrunz <od(a)suse.de> * - * $Id: BootCommon.ycp 66485 2011-10-18 14:30:01Z snwint $ + * $Id: BootCommon.ycp 67562 2012-03-05 13:48:47Z snwint $ * */ @@ -187,7 +187,7 @@ /** * type of bootloader to configure/being configured - * shall be one of "lilo", "grub", "elilo", "ppc", "zipl" + * shall be one of "lilo", "grub", "elilo", "ppc", "zipl", "grub2" */ string loader_type = nil; @@ -289,7 +289,7 @@ * List of all supported bootloaders */ global list<string> bootloaders = ["lilo", "grub", "elilo", - "zipl", "ppc"]; + "zipl", "ppc", "grub2"]; /** FATE#305008: Failover boot configurations for md arrays with redundancy * if true enable redundancy for md array @@ -589,7 +589,7 @@ "sections" : remapSections(sections), "device_map" : BootStorage::remapDeviceMap(BootStorage::device_mapping), ]; - if ( ! ( loader_type == "grub" ) ) { + if ( ! ( loader_type == "grub" || loader_type == "grub2" ) ) { exp["repl_mbr"] = repl_mbr; exp["activate"] = activate; } @@ -609,7 +609,7 @@ // FIXME: for grub, repl_mbr is replaced by globals["generic_mbr"]; same // for activate; remove the following when no bootloader uses these // variables any more - if ( ! ( loader_type == "grub" ) ) { + if ( ! ( loader_type == "grub" || loader_type == "grub2" ) ) { repl_mbr = settings["repl_mbr"]:false; activate = settings["activate"]:false; } @@ -1043,6 +1043,9 @@ loader_type = (string)SCR::Read (.probe.boot_arch); if (loader_type == "s390") loader_type = "zipl"; + // suppose grub2 should superscede grub .. + if (loader_type == "grub") + loader_type = "grub2"; y2milestone ("Bootloader detection returned %1", loader_type); // lslezak@: Arch::is_xenU() returns true only in PV guest if (Arch::is_uml () || Arch::is_xenU()) @@ -1136,7 +1139,7 @@ global define list<string> getBootloaders () { if (Mode::config ()) { - return ["grub", "lilo", "elilo", "zipl", "ppc", "default", "none"]; + return ["grub", "lilo", "elilo", "zipl", "ppc", "grub2", "default", "none"]; } list<string> ret = [ getLoaderType (false), @@ -1144,7 +1147,7 @@ ]; if (Arch::i386 () || Arch::x86_64 ()) { - ret = (list<string>)merge (ret, ["lilo", "grub"]); + ret = (list<string>)merge (ret, ["lilo", "grub", "grub2"]); if (Arch::x86_64 ()) ret = (list<string>)merge (ret, ["elilo"]); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.22.0/src/modules/BootGRUB2.ycp new/yast2-bootloader-2.23.0/src/modules/BootGRUB2.ycp --- old/yast2-bootloader-2.22.0/src/modules/BootGRUB2.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-2.23.0/src/modules/BootGRUB2.ycp 2012-03-05 15:09:25.000000000 +0100 @@ -0,0 +1,207 @@ +/** + * File: + * modules/BootGRUB2.ycp + * + * Module: + * Bootloader installation and configuration + * + * Summary: + * Module containing specific functions for GRUB2 configuration + * and installation + * + * Authors: + * Jiri Srain <jsrain(a)suse.cz> + * Joachim Plack <jplack(a)suse.de> + * Olaf Dabrunz <od(a)suse.de> + * Philipp Thomas <pth(a)suse.de> + * + * $Id: BootGRUB.ycp 63508 2011-03-04 12:53:27Z jreidinger $ + * + */ + +{ +module "BootGRUB2"; + +textdomain "bootloader"; + +import "Arch"; +import "BootCommon"; +import "BootStorage"; +import "Kernel"; +import "Mode"; +import "Stage"; +import "Storage"; +import "StorageDevices"; +import "Pkg"; +import "HTML"; + +// includes +// for shared some routines with grub +include "bootloader/grub/misc.ycp"; +// for simplified widgets than other +include "bootloader/grub2/dialogs.ycp"; +// general functions + +/** + * Read settings from disk + * @param reread boolean true to force reread settings from system + * @param avoid_reading_device_map do not read new device map from file, use + * internal data + * @return boolean true on success + */ +global boolean Read (boolean reread, boolean avoid_reading_device_map) { + BootCommon::InitializeLibrary (reread, "grub2"); + if (reread) { + BootCommon::ReadFiles (avoid_reading_device_map); + } + // TODO: check if necessary for grub2 + grub_DetectDisks (); + boolean ret = BootCommon::Read (false, avoid_reading_device_map); + + // TODO: check if necessary for grub2 + // refresh device map if not read + if (BootStorage::device_mapping == nil + || size (BootStorage::device_mapping) == 0) + { + BootStorage::ProposeDeviceMap (); + } + + return ret; +} + +/** + * Update read settings to new version of configuration files + */ +global define void Update () { + Read (true, true); + + //we don't handle sections, grub2 section create them for us + //BootCommon::UpdateSections (); + BootCommon::UpdateGlobals (); +} +/** + * Write bootloader settings to disk + * @return boolean true on success + */ +global define boolean Write () { + + boolean ret = BootCommon::UpdateBootloader (); + + //TODO: InstallingToFloppy .. + if (BootCommon::location_changed) { + // bnc #461613 - Unable to boot after making changes to boot loader + // bnc #357290 - module rewrites grub generic code when leaving with no changes, which may corrupt grub + grub_updateMBR (); + + boolean grub_ret = BootCommon::InitializeBootloader (); + if (grub_ret == nil) + grub_ret = false; + + y2milestone ("GRUB return value: %1", grub_ret); + ret = ret && grub_ret; + ret = ret && BootCommon::PostUpdateMBR (); + } + + return ret; +} + +/** + * Reset bootloader settings + * @param init boolean true to repropose also device map + */ +global define void Reset (boolean init) { + if (Mode::autoinst ()) + return; + BootCommon::Reset (init); +} + +/** + * Propose bootloader settings + */ + +global define void Propose () { + y2milestone ("Proposed globals: %1", BootCommon::globals); + grub_LocationProposal (); +} + + +/** + * Display bootloader summary + * @return a list of summary lines + */ + +global define list<string> Summary () { + list<string> result = [ sformat (_("Boot Loader Type: %1"), + BootCommon::getLoaderName (BootCommon::getLoaderType (false), `summary)) ]; + list<string> locations = []; + + if (BootCommon::globals["boot_boot"]:"" == "true") + locations = add(locations, BootStorage::BootPartitionDevice + _(" (\"/boot\")")); + if (BootCommon::globals["boot_extended"]:"" == "true") + locations = add(locations, BootStorage::ExtendedPartitionDevice + _(" (extended)")); + if (BootCommon::globals["boot_root"]:"" == "true") + locations = add(locations, BootStorage::RootPartitionDevice + _(" (\"/\")")); + if (BootCommon::globals["boot_mbr"]:"" == "true") + locations = add(locations, BootCommon::mbrDisk + _(" (MBR)")); + if (haskey (BootCommon::globals, "boot_custom")) + locations = add(locations, BootCommon::globals["boot_custom"]:""); + if (size(locations) > 0) { + // FIXME: should we translate all devices to names and add MBR suffixes? + result = add (result, sformat (_("Status Location: %1"), mergestring (locations, ", "))); + } + + return result; +} + +/** + * Return map of provided functions + * @return a map of functions (eg. $["write":BootGRUB2::Write]) + */ +global map<string, any> GetFunctions () { + return $[ + "read" : Read, + "reset" : Reset, + "propose" : Propose, + "summary" : Summary, + "update" : Update, + "widgets" : grub2Widgets, + "write" : Write, + ]; +} + +/** + * Initializer of GRUB bootloader + */ +global define void Initializer () { + y2milestone ("Called GRUB2 initializer"); + BootCommon::current_bootloader_attribs = $[ + "propose" : false, + "read" : false, + "scratch" : false, + "restore_mbr" : false, + "bootloader_on_disk" : false, + ]; +} + +/** + * Constructor + */ +global define void BootGRUB2 () { + BootCommon::bootloader_attribs["grub2"] = $[ + "required_packages" : ["grub2"], + "loader_name" : "GRUB2", + "initializer" : BootGRUB2::Initializer, + ]; +} + +} // EOF + +/* + * Local variables: + * mode: ycp + * mode: font-lock + * mode: auto-fill + * indent-level: 4 + * fill-column: 78 + * End: + */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.22.0/src/modules/BootSupportCheck.ycp new/yast2-bootloader-2.23.0/src/modules/BootSupportCheck.ycp --- old/yast2-bootloader-2.22.0/src/modules/BootSupportCheck.ycp 2010-05-06 13:15:42.000000000 +0200 +++ new/yast2-bootloader-2.23.0/src/modules/BootSupportCheck.ycp 2012-03-05 15:09:25.000000000 +0100 @@ -74,7 +74,7 @@ * Check that bootloader is known and supported */ boolean KnownLoader () { - if (! contains (["grub", "elilo", "ppc", "zipl", "none"], Bootloader::getLoaderType ())) + if (! contains (["grub", "grub2", "elilo", "ppc", "zipl", "none"], Bootloader::getLoaderType ())) { if (Bootloader::getLoaderType () != "lilo") @@ -125,7 +125,7 @@ if (lt == "elilo") return true; } else { - if ((lt == "grub") || (lt == "lilo")) + if ((lt == "grub") || (lt == "lilo") || (lt == "grub2")) return true; } } @@ -297,6 +297,13 @@ } /** + * GRUB2-related check + */ +global boolean GRUB2 () { + return GRUB(); +} + +/** * ELILO related check */ boolean ELILO () { @@ -348,6 +355,8 @@ supported = PPC () && supported; else if (lt == "zipl") supported = ZIPL () && supported; + else if (lt == "grub2") + supported = GRUB2 () && supported; y2milestone ("Configuration supported: %1", supported); return supported; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.22.0/src/modules/Makefile.am new/yast2-bootloader-2.23.0/src/modules/Makefile.am --- old/yast2-bootloader-2.22.0/src/modules/Makefile.am 2009-04-22 13:48:59.000000000 +0200 +++ new/yast2-bootloader-2.23.0/src/modules/Makefile.am 2012-03-05 15:09:25.000000000 +0100 @@ -11,6 +11,7 @@ BootArch.ycp \ BootELILO.ycp \ BootGRUB.ycp \ + BootGRUB2.ycp \ BootLILO.ycp \ BootPOWERLILO.ycp \ BootZIPL.ycp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.22.0/src/modules/Makefile.in new/yast2-bootloader-2.23.0/src/modules/Makefile.in --- old/yast2-bootloader-2.22.0/src/modules/Makefile.in 2012-01-20 12:31:07.000000000 +0100 +++ new/yast2-bootloader-2.23.0/src/modules/Makefile.in 2012-03-05 15:09:52.000000000 +0100 @@ -258,6 +258,7 @@ BootArch.ycp \ BootELILO.ycp \ BootGRUB.ycp \ + BootGRUB2.ycp \ BootLILO.ycp \ BootPOWERLILO.ycp \ BootZIPL.ycp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.22.0/src/routines/dialogs.ycp new/yast2-bootloader-2.23.0/src/routines/dialogs.ycp --- old/yast2-bootloader-2.22.0/src/routines/dialogs.ycp 2009-08-06 13:50:12.000000000 +0200 +++ new/yast2-bootloader-2.23.0/src/routines/dialogs.ycp 2012-03-05 15:09:25.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: dialogs.ycp 58289 2009-08-06 11:50:12Z juhliarik $ + * $Id: dialogs.ycp 67562 2012-03-05 13:48:47Z snwint $ * */ @@ -81,9 +81,12 @@ */ symbol MainDialog () { y2milestone ("Running Main Dialog"); + string lt = Bootloader::getLoaderType (); term contents = `VBox ( - "tab", - `Right ("adv_button") + "tab", + (lt == "grub2") + ? nil + : `Right ("adv_button") ); // F#300779 - Install diskless client (NFS-root) @@ -98,15 +101,22 @@ } // F#300779: end - list<string> widget_names = ["tab", "adv_button"]; + list<string> widget_names = (lt == "grub2") + ? ["tab"] + : ["tab", "adv_button"]; map<string,map<string,any> > widget_descr = $[]; + widget_descr = (map<string,map<string,any> >) union (CommonGlobalWidgets (), Bootloader::blWidgetMaps ()); widget_descr["tab"] = CWMTab::CreateWidget($[ - "tab_order": ["sections", "installation"], - "tabs": TabsDescr (), - "widget_descr": widget_descr, - "initial_tab" : return_tab, + "tab_order": (lt == "grub2") + ? ["installation"] + : ["sections", "installation"], + "tabs": TabsDescr (), + "widget_descr": widget_descr, + "initial_tab" : (lt == "grub2") + ? "installation" + : return_tab ]); widget_descr["tab", "no_help"] = ""; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.22.0/src/routines/global_widgets.ycp new/yast2-bootloader-2.23.0/src/routines/global_widgets.ycp --- old/yast2-bootloader-2.22.0/src/routines/global_widgets.ycp 2009-04-23 14:56:26.000000000 +0200 +++ new/yast2-bootloader-2.23.0/src/routines/global_widgets.ycp 2012-03-05 15:09:25.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: global_widgets.ycp 56933 2009-04-23 12:56:26Z juhliarik $ + * $Id: global_widgets.ycp 67562 2012-03-05 13:48:47Z snwint $ * */ @@ -314,6 +314,22 @@ return `redraw; } + if (new_bl == "grub2") { + if (Popup::ContinueCancel (_(" +The GRUB2 is still under develope and test. + +Proceed? +"))) + { + BootCommon::other_bl[old_bl] = Bootloader::Export (); + BootCommon::setLoaderType ("grub2"); + Bootloader::Propose (); + BootCommon::location_changed = true; + BootCommon::changed = true; + } + return `redraw; + } + if (Arch::x86_64 ()) { if (new_bl == "elilo") { // continue/cancel pop-up @@ -704,7 +720,7 @@ `HStretch (), `VBox ( `Label (""), - (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo") + (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo" || lt == "grub2") ? `Empty() : "loader_options" ), `HSpacing (2) @@ -721,8 +737,8 @@ : "inst_details", `VStretch () ), `HStretch ()), - "widget_names": (lt == "none" || lt == "default" || lt=="zipl") - ? [ "loader_type", "loader_options"] + "widget_names": (lt == "none" || lt == "default" || lt=="zipl" || lt == "grub2") + ? [ "loader_type", "loader_options", "loader_location"] : [ "loader_type", "loader_options", "loader_location", "inst_details"] ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.22.0/src/routines/switcher.ycp new/yast2-bootloader-2.23.0/src/routines/switcher.ycp --- old/yast2-bootloader-2.22.0/src/routines/switcher.ycp 2009-04-16 08:32:38.000000000 +0200 +++ new/yast2-bootloader-2.23.0/src/routines/switcher.ycp 2012-03-05 15:09:25.000000000 +0100 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: switcher.ycp 56797 2009-04-16 06:32:38Z jreidinger $ + * $Id: switcher.ycp 67562 2012-03-05 13:48:47Z snwint $ * */ @@ -23,6 +23,7 @@ import "BootLILO"; import "BootPOWERLILO"; import "BootZIPL"; +import "BootGRUB2"; import "BootCommon"; /** @@ -38,7 +39,8 @@ "grub" : BootGRUB::GetFunctions, "elilo" : BootELILO::GetFunctions, "zipl" : BootZIPL::GetFunctions, - "ppc" : BootPOWERLILO::GetFunctions + "ppc" : BootPOWERLILO::GetFunctions, + "grub2" : BootGRUB2::GetFunctions ]; map<string,any> () gf = (map<string,any>())(bl_functions[bootloader]:nil); if (gf == nil) -- 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 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2012-03-06 13:41:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vm-install (Old) and /work/SRC/openSUSE:Factory/.vm-install.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vm-install", Maintainer is "CARNOLD(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2012-02-16 15:03:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2012-03-06 13:42:13.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Feb 29 10:15:34 MST 2012 - carnold(a)novell.com + +- KVM: Add 'unsafe' and 'directsync' as options to cache_mode + During installation set the target disk to 'unsafe' for + better performance. + +------------------------------------------------------------------- +Tue Feb 28 14:19:33 MST 2012 - carnold(a)novell.com + +- bnc#725378 - vm-install requires tftp and so conflicts with atftp + Add support for using atftp in place of tftp +- Catch unconfigured bridge error in VMPXE getServAddr. +- PV PXE booting requires kdumptool (kdump package) so add + dependency to spec file. +- Update version to 0.6.0 + +------------------------------------------------------------------- Old: ---- vm-install-0.5.7.tar.bz2 New: ---- vm-install-0.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.oPYckG/_old 2012-03-06 13:42:15.000000000 +0100 +++ /var/tmp/diff_new_pack.oPYckG/_new 2012-03-06 13:42:15.000000000 +0100 @@ -15,22 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: vm-install Url: http://developer.novell.com/wiki/index.php/Vm-install BuildRequires: python-devel BuildRequires: update-desktop-files # For directory ownership: BuildRequires: yast2 -Version: 0.5.7 +Version: 0.6.1 Release: 0 Summary: Tool to Define a Virtual Machine and Install Its Operating System License: GPL-2.0 Group: System/Emulators/PC -Source0: %{name}-0.5.7.tar.bz2 +Source0: %{name}-0.6.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 -Requires: libvirt python-urlgrabber libxml2-python libvirt-python virt-utils udhcp tftp +Requires: libvirt python-urlgrabber libxml2-python libvirt-python virt-utils udhcp kdump %define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()") Recommends: python-gtk ++++++ vm-install-0.5.7.tar.bz2 -> vm-install-0.6.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.5.7/Makefile new/vm-install-0.6.1/Makefile --- old/vm-install-0.5.7/Makefile 2012-01-14 00:04:02.000000000 +0100 +++ new/vm-install-0.6.1/Makefile 2012-02-29 18:15:11.000000000 +0100 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.5.7 +VER = 0.6.1 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.5.7/glade/vm-install.glade new/vm-install-0.6.1/glade/vm-install.glade --- old/vm-install-0.5.7/glade/vm-install.glade 2012-01-30 21:10:57.000000000 +0100 +++ new/vm-install-0.6.1/glade/vm-install.glade 2012-02-29 18:14:50.000000000 +0100 @@ -9568,7 +9568,9 @@ <widget class="GtkComboBox" id="cache-mode-combobox"> <property name="visible">True</property> <property name="items" translatable="yes">default +directsync none +unsafe writeback writethrough</property> <property name="add_tearoffs">False</property> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.5.7/man/vm-install.8 new/vm-install-0.6.1/man/vm-install.8 --- old/vm-install-0.5.7/man/vm-install.8 2012-01-14 00:04:01.000000000 +0100 +++ new/vm-install-0.6.1/man/vm-install.8 2012-01-11 23:44:10.000000000 +0100 @@ -95,11 +95,14 @@ \fIPDEV\fR describes the physical storage. In its simplest form, \fIPDEV\fR can be a path to a file or block device. More complex forms require prefixing -a protocol. Valid protocols are: \fBfile\fR, \fBiscsi\fR, \fBnbd\fR, +a protocol. Valid Xen protocols are: \fBfile\fR, \fBiscsi\fR, \fBnbd\fR, \fBnpiv\fR, \fBphy\fR, \fBtap:aio\fR, \fBtap:qcow\fR, and \fBtap:vmdk\fR. Examples: \fB/dev/hdb\fR, \fBphy:/dev/hdb\fR, \fBtap:qcow:/disks/disk0.qcow\fR, \fBiscsi:iqn.2006-09.de.suse@0ac47ee2-216e-452a-a341-a12624cd0225\fR. +Valid KVM protocols are: \fBfile\fR, \fBnbd\fR, \fBphy\fR, +\fBqcow2\fR, \fBqed\fR, \fBraw\fR, \fBvpc\fR, and \fBvmdk\fR. Other protocols +are available for experimentation. \fIVDEV\fR is the name of the virtual device. \fIVDEV\fR may be named using Xen fully-virtualized or KVM names (\fBhda\fR, \fBhdb\fR, \fBhdc\fR, ...) or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.5.7/setup.py new/vm-install-0.6.1/setup.py --- old/vm-install-0.5.7/setup.py 2012-01-14 00:04:02.000000000 +0100 +++ new/vm-install-0.6.1/setup.py 2012-02-29 18:15:06.000000000 +0100 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.5.7', + version='0.6.1', description='Define a virtual machine and install its operating system', author='Charles Coffing', author_email='ccoffing(a)novell.com', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.5.7/src/vmdisks/disks.py new/vm-install-0.6.1/src/vmdisks/disks.py --- old/vm-install-0.5.7/src/vmdisks/disks.py 2012-01-14 00:04:00.000000000 +0100 +++ new/vm-install-0.6.1/src/vmdisks/disks.py 2012-02-29 18:06:40.000000000 +0100 @@ -389,7 +389,7 @@ 'par': ['parallels'] } -cache_modes = [ 'default', 'none', 'writeback', 'writethrough' ] +cache_modes = [ 'default', 'directsync', 'none', 'unsafe', 'writeback', 'writethrough' ] def parse_string(disk, extended=False, blocks=None): """Parses a text representation of a disk, and returns such a disk object. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.5.7/src/vminstall/VMPXE.py new/vm-install-0.6.1/src/vminstall/VMPXE.py --- old/vm-install-0.5.7/src/vminstall/VMPXE.py 2012-01-14 00:04:01.000000000 +0100 +++ new/vm-install-0.6.1/src/vminstall/VMPXE.py 2012-02-28 23:42:28.000000000 +0100 @@ -61,10 +61,12 @@ data = rfd.read() status = rfd.close() lines = data.splitlines()[1:] + if not lines: + raise PXEError(PXEError.E_NO_BRIDGE) line1 = lines[0] words = line1.split() bridge = words[0] - + log.debug("getServAddr: bridge: %s " % (bridge)) udhcp_result=commands.getstatusoutput(udhcpc_command + " -i " + bridge + @@ -89,6 +91,7 @@ global kernel_list global initrd_list global pxe_label + global tftp_flag def __init__(self): self.__initialized = True @@ -96,6 +99,12 @@ pxe_label='' kernel_list={} initrd_list={} + if os.path.exists('/usr/bin/tftp'): + tftp_flag = True + elif os.path.exists('/usr/bin/atftp'): + tftp_flag = False + else: + tftp_flag = None def _getMediaRoots(self, root, _open=open): """Network install sources may be composed of multiple CDs. YaST lists @@ -180,13 +189,17 @@ return (None, None) def getPXEconfigFromPXEserver(self, options): + if tftp_flag is None: + raise PXEError(PXEError.E_NO_TFTP) try: servaddr=getServAddr(options) except Exception, e: raise e os.chdir(vminstall.paths.imagedir) - commandstr="tftp "+servaddr+" -c get pxelinux.cfg/default" - #commandstr="atftp -g -r pxelinux.cfg/default -l default 147.2.207.153" #for test + if tftp_flag is True: + commandstr="tftp "+servaddr+" -c get pxelinux.cfg/default" + else: + commandstr="atftp -g -r pxelinux.cfg/default -l default " + servaddr cfgfilename="default" getpxeres=commands.getstatusoutput(commandstr) if not tftp_success(getpxeres) or not os.path.exists(cfgfilename): @@ -235,8 +248,10 @@ raise PXEError(PXEError.E_NO_KERNEL) log.debug('k/i: %s, %s'% (kernel_list[options.pxe_label], initrd_list[options.pxe_label])) for i in [kernel_list[options.pxe_label], initrd_list[options.pxe_label]]: - cmd="tftp "+servaddr+" -c get "+ i + " " + os.path.basename(i)+ "." + str(os.getpid()) - #cmd="tftp 147.2.207.153 -c get "+ i #for test + if tftp_flag is True: + cmd="tftp "+servaddr+" -c get "+ i + " " + os.path.basename(i)+ "." + str(os.getpid()) + else: + cmd="atftp -g -r " + i + " -l " + os.path.basename(i) + "." + str(os.getpid()) + " " + servaddr dlres[i]=commands.getstatusoutput(cmd) if not tftp_success (dlres[i]): success=0 @@ -293,7 +308,8 @@ XML file.""" ay = guest.options.os_settings if not ay or ay.startswith('ftp://') or ay.startswith('tftp://') or \ - ay.startswith('http://') or ay.startswith('nfs://'): + ay.startswith('http://') or ay.startswith('nfs://') or \ + ay.startswith('atftp://'): pass else: (fd, tmpdisk) = tempfile.mkstemp(prefix='autoyast.') @@ -361,7 +377,8 @@ ay = options.os_settings if ay: if ay.startswith('ftp://') or ay.startswith('tftp://') or \ - ay.startswith('http://') or ay.startswith('nfs://'): + ay.startswith('http://') or ay.startswith('nfs://') or \ + ay.startswith('atftp://'): pxeargs += ' autoyast=%s' % (ay,) else: ay_vdev = autoyast_vdev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.5.7/src/vminstall/exceptions.py new/vm-install-0.6.1/src/vminstall/exceptions.py --- old/vm-install-0.5.7/src/vminstall/exceptions.py 2012-01-14 00:04:01.000000000 +0100 +++ new/vm-install-0.6.1/src/vminstall/exceptions.py 2012-02-28 23:41:47.000000000 +0100 @@ -215,12 +215,16 @@ msg.pxe_no_pxe_server, msg.pxe_no_config, msg.pxe_no_kernel, - msg.pxe_kernel_warn) + msg.pxe_kernel_warn, + msg.pxe_no_bridge, + msg.pxe_no_tftp) (E_NO_SERVER, E_NO_CONFIG, E_NO_KERNEL, - E_KERNEL_WARN - ) = range(4) + E_KERNEL_WARN, + E_NO_BRIDGE, + E_NO_TFTP + ) = range(6) def __init__(self, err, details=None): Error.__init__(self, err, title=self.titles[err], details=details) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.5.7/src/vminstall/kvm_guest.py new/vm-install-0.6.1/src/vminstall/kvm_guest.py --- old/vm-install-0.5.7/src/vminstall/kvm_guest.py 2012-01-14 00:04:01.000000000 +0100 +++ new/vm-install-0.6.1/src/vminstall/kvm_guest.py 2012-03-01 00:07:09.000000000 +0100 @@ -106,9 +106,17 @@ """Get the disk config in the libvirt XML format""" available_cdroms = [{'hda': 0}, {'hdb': 0}, {'hdc': 0}, {'hdd': 0}] ret = [] + saved_mode = None + target_disk = self.options.disks[0] + if self.isInstall and target_disk: + index, saved_mode = target_disk.get_cache_mode() + # The destination disk only during installation is this considered safe to do + target_disk.set_cache_mode("unsafe") for disk in self.options.disks + self.tmpdisks: use_virtio = self.options.virtio and disk.virtio ret.extend(disk.get_xml_config(use_virtio, available_cdroms)) + if self.isInstall and target_disk: + target_disk.set_cache_mode(saved_mode) return ret def _get_network_xml(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.5.7/src/vminstall/msg.py new/vm-install-0.6.1/src/vminstall/msg.py --- old/vm-install-0.5.7/src/vminstall/msg.py 2012-01-14 00:04:01.000000000 +0100 +++ new/vm-install-0.6.1/src/vminstall/msg.py 2012-02-28 23:43:15.000000000 +0100 @@ -275,6 +275,8 @@ pxe_no_config = _("Can't get the pxelinux.cfg/default file from the pxe server.") pxe_no_kernel = _("Can't download the kernel and initrd from the server.") pxe_kernel_warn = _("This kernel image may not be a paravirtualized xen kernel required for installation, Continue?") +pxe_no_bridge = _("Unable to identify a configured network bridge.") +pxe_no_tftp = _("Paravirtualized PXE booting requires the use of tftp or atftp. Please install one of these packages.") # Network nic_e100 = _("Fully Virtualized Intel e100") -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit virt-manager for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2012-03-06 13:41:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virt-manager", Maintainer is "CARNOLD(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2012-02-14 13:11:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes 2012-03-06 13:42:11.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Mar 5 08:26:17 MST 2012 - carnold(a)novell.com + +- Previous commit should just be Requires: python-gconf + +------------------------------------------------------------------- +Thu Feb 16 06:42:21 MST 2012 - carnold(a)novell.com + +- bnc#745221 - virt-manager should require python-gconf + Requires: python2-gconf >= 1.99.11-7 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.kYnyt0/_old 2012-03-06 13:42:13.000000000 +0100 +++ /var/tmp/diff_new_pack.kYnyt0/_new 2012-03-06 13:42:13.000000000 +0100 @@ -55,6 +55,7 @@ BuildRequires: intltool BuildRequires: scrollkeeper BuildRequires: update-desktop-files +Requires: python-gconf Requires: libvirt-python >= 0.7.0 Requires: vm-install >= 0.5.6 Requires: dbus-1-python -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit telepathy-salut for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package telepathy-salut for openSUSE:Factory checked in at 2012-03-06 13:41:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/telepathy-salut (Old) and /work/SRC/openSUSE:Factory/.telepathy-salut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "telepathy-salut", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/telepathy-salut/telepathy-salut.changes 2012-02-21 12:26:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.telepathy-salut.new/telepathy-salut.changes 2012-03-06 13:42:09.000000000 +0100 @@ -1,0 +2,25 @@ +Thu Mar 1 13:12:48 UTC 2012 - cfarrell(a)suse.com + +- license update: LGPL-2.1+ and MIT + See COPYING + +------------------------------------------------------------------- +Wed Feb 22 07:37:19 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 0.7.1: + + Enhancements: + - fdo#45716: Salut now has a salut-plugins.so library, + similarly to mission-control. + - fdo#42515: Support for building on Android + - fdo#45703: Support for One Big Header Wocky + + Fixes: + - fdo#44020: Unix socket paths for MUC stream tubes too long + - Almost all unit tests failing if IPv6 is not enabled in the + kernel +- Add explicit pkgconfig() BuildRequires that we used to depend on + implicitly: gio-2.0, glib-2.0, gobject-2.0, gthread-2.0. +- Remove doc subpackage, and add appropriate Provides/Obsoletes to + the main subpackage: the doc is too small to make sense as a + separate package. + +------------------------------------------------------------------- Old: ---- telepathy-salut-0.7.0.tar.gz New: ---- telepathy-salut-0.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-salut.spec ++++++ --- /var/tmp/diff_new_pack.ln0EPO/_old 2012-03-06 13:42:11.000000000 +0100 +++ /var/tmp/diff_new_pack.ln0EPO/_new 2012-03-06 13:42:11.000000000 +0100 @@ -17,11 +17,11 @@ Name: telepathy-salut -Version: 0.7.0 +Version: 0.7.1 Release: 0 # FIXME: check if libgcrypt-devel BuildRequires is really needed (see fdo#43992). Last checked: 0.7.0. Summary: Link-local XMPP connection manager for Telepathy -License: GPL-2.0+ +License: LGPL-2.1+ and MIT Group: System/Libraries Url: http://telepathy.freedesktop.org/wiki/ Source: http://telepathy.freedesktop.org/releases/telepathy-salut/%{name}-%{version… @@ -36,26 +36,22 @@ BuildRequires: python-avahi BuildRequires: python-xml BuildRequires: telepathy-glib-devel +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.24 BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(gobject-2.0) >= 2.16 +BuildRequires: pkgconfig(gthread-2.0) >= 2.4 BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(uuid) +# doc subpackage removed during 12.2 development +Provides: %{name}-doc = %{version} +Obsoletes: %{name}-doc < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description A connection manager for Telepathy that implements peer to peer XMPP using local-link as done by and compatible with Apple Bonjour(tm) chat. -%package doc -Summary: Link-local XMPP connection manager for Telepathy (documentation) -Group: Documentation/Other -Requires: %{name} = %{version} - -%description doc -A connection manager for Telepathy that implements peer to peer XMPP -using local-link as done by and compatible with Apple Bonjour(tm) chat. - -This package contains the documentation. - %prep %setup -q @@ -65,6 +61,7 @@ %install %make_install +find %{buildroot} -type f -name "*.la" -delete -print %post -p /sbin/ldconfig @@ -75,15 +72,16 @@ %files %defattr(-,root,root) -%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.salut.service +%doc AUTHORS ChangeLog COPYING NEWS README +%doc %{_docdir}/%{name}/clique.html %dir %{_datadir}/telepathy %dir %{_datadir}/telepathy/managers -%{_datadir}/telepathy/managers/salut.manager +%dir %{_libdir}/telepathy +%{_libdir}/telepathy/salut-0/ +%{_libdir}/libsalut-plugins.so %{_libexecdir}/telepathy-salut -%{_mandir}/man8/telepathy-salut.8.gz - -%files doc -%defattr (-,root,root) -%{_docdir}/%{name} +%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.salut.service +%{_datadir}/telepathy/managers/salut.manager +%{_mandir}/man8/telepathy-salut.8%{?ext_man} %changelog ++++++ telepathy-salut-0.7.0.tar.gz -> telepathy-salut-0.7.1.tar.gz ++++++ ++++ 23203 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rekonq for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package rekonq for openSUSE:Factory checked in at 2012-03-06 13:41:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rekonq (Old) and /work/SRC/openSUSE:Factory/.rekonq.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rekonq", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/rekonq/rekonq.changes 2012-01-09 11:17:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rekonq.new/rekonq.changes 2012-03-06 13:41:44.000000000 +0100 @@ -1,0 +2,23 @@ +Tue Mar 6 08:17:05 UTC 2012 - mlin(a)suse.com + +- Update to version 0.9.0 + * urlbar suggestions improvements + * enable url or text drops in the tabbar + * improved rekonq webkit settings (based on QtWebkit 2.2 features) + * bookmarks toolbar usability improvements + * Applications shortcut (desktop links) + * Many changes in default settings + * Share URL/Text/link by mail + * Usability work on rekonq pages + * new rekonq tabs page (letting you easiily manage tabs) + * let users choose a "default" download dir + * SYNC feature: general infrastucture + ftp sync + * access keys navigation + * (User) session restore + +------------------------------------------------------------------- +Mon Mar 5 14:12:22 UTC 2012 - vdziewiecki(a)suse.com + +- add Provides: browser(npapi) FATE#313084 + +------------------------------------------------------------------- Old: ---- rekonq-0.8.1.tar.bz2 New: ---- rekonq-0.9.0-1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rekonq.spec ++++++ --- /var/tmp/diff_new_pack.lT4QeK/_old 2012-03-06 13:41:45.000000000 +0100 +++ /var/tmp/diff_new_pack.lT4QeK/_new 2012-03-06 13:41:45.000000000 +0100 @@ -16,15 +16,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%define _rversion 0.9.0-1 + Name: rekonq -Version: 0.8.1 +Version: 0.9.0 Release: 1 Summary: WebKit Based Web Browser for KDE4 License: GPL-2.0+ Url: http://rekonq.kde.org/ Group: Productivity/Networking/Web/Browsers -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{_rversion}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes @@ -34,6 +36,7 @@ BuildRequires: update-desktop-files %endif Requires: konqueror +Provides: browser(npapi) Recommends: %{name}-doc = %{version} Recommends: %{name}-lang = %{version} %kde4_runtime_requires @@ -59,7 +62,7 @@ %lang_package %prep -%setup -q +%setup -n %{name}-%{_rversion} %build %cmake_kde4 -d build @@ -78,7 +81,8 @@ %fdupes -s %{buildroot} -%find_lang %{name} +%find_lang %{name} %{name}.lang +%find_lang kwebapp %{name}.lang %kde_post_install @@ -91,6 +95,7 @@ %{_kde4_applicationsdir}/rekonq.desktop %{_kde4_appsdir}/rekonq/ %{_kde4_bindir}/rekonq +%{_kde4_bindir}/kwebapp %{_kde4_iconsdir}/hicolor/*/apps/rekonq.png %{_kde4_libdir}/libkdeinit4_rekonq.so %{_kde4_sharedir}/config.kcfg/rekonq.kcfg -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-virtinst for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package python-virtinst for openSUSE:Factory checked in at 2012-03-06 13:41:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-virtinst (Old) and /work/SRC/openSUSE:Factory/.python-virtinst.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-virtinst", Maintainer is "CARNOLD(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/python-virtinst/python-virtinst.changes 2012-02-22 15:54:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-virtinst.new/python-virtinst.changes 2012-03-06 13:41:38.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 29 15:02:02 MST 2012 - carnold(a)novell.com + +- KVM: Add cache mode support for directsync and unsafe + +------------------------------------------------------------------- New: ---- virtinst-add-cache-modes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-virtinst.spec ++++++ --- /var/tmp/diff_new_pack.gmsZRl/_old 2012-03-06 13:41:39.000000000 +0100 +++ /var/tmp/diff_new_pack.gmsZRl/_new 2012-03-06 13:41:39.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} # This macro is used for the continuous automated builds. It just @@ -42,6 +43,7 @@ Patch10: virtinst-cdrom.diff Patch12: virtinst-storage-ocfs2.diff Patch13: virtinst-qed.diff +Patch14: virtinst-add-cache-modes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildArch: noarch @@ -60,6 +62,7 @@ %endif BuildRequires: gettext BuildRequires: python-devel +Obsoletes: virt-manager <= 0.9.0 %description pyhon-virtinst contains python modules and tools (virt-install, @@ -75,13 +78,13 @@ %patch10 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 %build python setup.py build %install -#rm -rf $RPM_BUILD_ROOT -python setup.py install -O1 --root=$RPM_BUILD_ROOT --prefix=%{_prefix} +python setup.py install --root=$RPM_BUILD_ROOT --prefix=%{_prefix} # Back compat in case people hardcoded old /usr/sbin/virt-install location mkdir -p $RPM_BUILD_ROOT/%{_sbindir} ln -s ../bin/virt-install $RPM_BUILD_ROOT/%{_sbindir}/virt-install ++++++ virtinst-add-cache-modes.diff ++++++ Index: virtinst-0.600.1/virtinst/VirtualDisk.py =================================================================== --- virtinst-0.600.1.orig/virtinst/VirtualDisk.py +++ virtinst-0.600.1/virtinst/VirtualDisk.py @@ -301,10 +301,13 @@ class VirtualDisk(VirtualDevice): driver_types = [DRIVER_TAP_RAW, DRIVER_TAP_QCOW, DRIVER_TAP_QED, DRIVER_TAP_VMDK, DRIVER_TAP_VDISK] + CACHE_MODE_DIRECTSYNC = "directsync" CACHE_MODE_NONE = "none" + CACHE_MODE_UNSAFE = "unsafe" CACHE_MODE_WRITETHROUGH = "writethrough" CACHE_MODE_WRITEBACK = "writeback" - cache_types = [CACHE_MODE_NONE, CACHE_MODE_WRITETHROUGH, + cache_types = [CACHE_MODE_DIRECTSYNC, CACHE_MODE_NONE, + CACHE_MODE_UNSAFE, CACHE_MODE_WRITETHROUGH, CACHE_MODE_WRITEBACK] DEVICE_DISK = "disk" @@ -585,7 +588,7 @@ class VirtualDisk(VirtualDevice): @type bus: C{str} @param shareable: If disk can be shared among VMs @type shareable: C{bool} - @param driverCache: Disk cache mode (none, writethrough, writeback) + @param driverCache: Disk cache mode (none, directsync, unsafe, writethrough, writeback) @type driverCache: member of cache_types @param selinuxLabel: Used for labelling new or relabel existing storage @type selinuxLabel: C{str} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-liblarch_gtk for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package python-liblarch_gtk for openSUSE:Factory checked in at 2012-03-06 13:41:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-liblarch_gtk (Old) and /work/SRC/openSUSE:Factory/.python-liblarch_gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-liblarch_gtk", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.python-liblarch_gtk.new/python-liblarch_gtk.changes 2012-03-06 13:41:31.000000000 +0100 @@ -0,0 +1,11 @@ +------------------------------------------------------------------- +Mon Mar 5 15:45:59 UTC 2012 - cfarrell(a)suse.com + +- license update: LGPL-3.0+ + No GPL-3.0 present in the package. + +------------------------------------------------------------------- +Wed Feb 15 19:34:52 UTC 2012 - dimstar(a)opensuse.org + +- Initial package, version 0.1.0. + New: ---- liblarch_gtk-0.1.0.tar.gz python-liblarch_gtk.changes python-liblarch_gtk.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-liblarch_gtk.spec ++++++ # # spec file for package # # Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands. # # 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/ # Name: python-liblarch_gtk %define _name liblarch_gtk Version: 0.1.0 Release: 0 License: LGPL-3.0+ Summary: GTK bindings for liblarch Url: https://live.gnome.org/liblarch Group: Development/Languages/Python Source: http://gtg.fritalk.com/publique/gtg.fritalk.com/liblarch/0.1/%{_name}-%{ver… BuildRequires: python Requires: python-gobject2 Requires: python-gtk BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %py_requires %description Liblarch is a python library built to easily handle data structure such are lists, trees and acyclic graphs (tree where nodes can have multiple parents) This package provides GTK bindings for liblarch. %prep %setup -q -n %{_name}-%{version} %build python setup.py build %install python setup.py install --root %{buildroot} --prefix %{_prefix} %files %defattr(-,root,root) %doc README LICENSE %{python_sitelib}/%{_name}-%{version}-*.egg-info %{python_sitelib}/%{_name}/ %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit physfs for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package physfs for openSUSE:Factory checked in at 2012-03-06 13:41:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/physfs (Old) and /work/SRC/openSUSE:Factory/.physfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "physfs", Maintainer is "PRusnak(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/physfs/physfs.changes 2011-09-23 12:40:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.physfs.new/physfs.changes 2012-03-06 13:41:19.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Mar 5 15:23:30 UTC 2012 - cfarrell(a)suse.com + +- license update: (LGPL-2.1+ or CPL-1.0) and Zlib + For a license such as this brackets are needed to avoid ambiguity + +------------------------------------------------------------------- +Tue Feb 14 07:36:49 UTC 2012 - coolo(a)suse.com + +- use original tar and avoid _service files +- trying to convert the license to spdx.org + +------------------------------------------------------------------- Old: ---- _service _service:recompress:download_url:physfs-2.0.2.tar.bz2 _service:set_version:physfs.spec New: ---- physfs-2.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ physfs.spec ++++++ --- /var/tmp/diff_new_pack.7PVlyn/_old 2012-03-06 13:41:20.000000000 +0100 +++ /var/tmp/diff_new_pack.7PVlyn/_new 2012-03-06 13:41:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package physfs # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -19,13 +19,13 @@ %define so_nr 1 Name: physfs -Version: to_be_filled_by_service -Release: 3 -License: ZLIB + LGPLv2.1/CPL plus exception +Version: 2.0.2 +Release: 0 Summary: PhysicsFS file abstraction layer for games -Url: http://www.icculus.org/physfs/ +License: (LGPL-2.1+ or CPL-1.0) and Zlib Group: System/Libraries -Source0: %{name}-%{version}.tar.bz2 +Url: http://www.icculus.org/physfs/ +Source0: http://icculus.org/physfs/downloads/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM %{name}-2.0.2-gcc46.patch reddwarf(a)opensuse.org -- Fixes gcc 4.6 compilation. From upstream trunk. Patch0: %{name}-2.0.2-gcc46.patch BuildRequires: cmake @@ -53,8 +53,6 @@ your program is running, etc. %package -n lib%{name}%{so_nr} - - Summary: PhysicsFS file abstraction layer for games Group: System/Libraries # physfs was last used in openSUSE 11.3 @@ -81,8 +79,6 @@ your program is running, etc. %package -n lib%{name}-devel - - Summary: Libraries, includes and more to develop PhysicsFS applications Group: Development/Libraries/C and C++ Requires: lib%{name}%{so_nr} = %{version} @@ -130,7 +126,7 @@ %install cd build -%makeinstall +make DESTDIR=$RPM_BUILD_ROOT install %clean rm -rf %{buildroot} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit phpMyAdmin for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at 2012-03-06 13:41:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old) and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phpMyAdmin", Maintainer is "CrRodriguez(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2012-02-21 12:23:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes 2012-03-06 13:41:07.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 23 12:45:22 UTC 2012 - chris(a)computersalat.de + +- fix changelog + * rename bugs , patches ("{bug,patch} #....") to fit into + bug naming scheme -> "sf#...." + +------------------------------------------------------------------- @@ -7,2 +14,2 @@ - * bug #3460090 [interface] TextareaAutoSelect feature broken - * patch #3375984 [export] PHP Array export might generate invalid php + * sf#3460090 [interface] TextareaAutoSelect feature broken + * sf#3375984 [export] PHP Array export might generate invalid php @@ -10 +17 @@ - * bug #3049209 [import] Import from ODS ignores cell that is the same + * sf#3049209 [import] Import from ODS ignores cell that is the same @@ -12 +19 @@ - * bug #3463933 [display] SELECT DISTINCT displays wrong total records + * sf#3463933 [display] SELECT DISTINCT displays wrong total records @@ -14 +21 @@ - * patch #3458944 [operations] copy table data missing + * sf#3458944 [operations] copy table data missing @@ -16,2 +23,2 @@ - * bug #3469254 [edit] Setting data to NULL and drop-downs - * bug #3477063 [edit] Missing set fields and values in generated + * sf#3469254 [edit] Setting data to NULL and drop-downs + * sf#3477063 [edit] Missing set fields and values in generated @@ -19 +26 @@ - * bug #3460867 [libraries] license issue with TCPDF + * sf#3460867 [libraries] license issue with TCPDF @@ -26,9 +33,9 @@ - - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown - - bug #3442004 [interface] DB suggestion not correct for user with underscore - - bug #3438420 [core] Magic quotes removed in PHP 5.4 - - bug #3398788 [session] No feedback when result is empty (signon auth_type) - - bug #3384035 [display] Problems regarding ShowTooltipAliasTB - - bug #3306875 [edit] Can't rename a database that contains views - - bug #3452506 [edit] Unable to move tables with triggers - - bug #3449659 [navi] Fast filter broken with table tree - - bug #3448485 [GUI] Firefox favicon frameset regression + - sf#3442028 [edit] Inline editing enum fields with null shows no dropdown + - sf#3442004 [interface] DB suggestion not correct for user with underscore + - sf#3438420 [core] Magic quotes removed in PHP 5.4 + - sf#3398788 [session] No feedback when result is empty (signon auth_type) + - sf#3384035 [display] Problems regarding ShowTooltipAliasTB + - sf#3306875 [edit] Can't rename a database that contains views + - sf#3452506 [edit] Unable to move tables with triggers + - sf#3449659 [navi] Fast filter broken with table tree + - sf#3448485 [GUI] Firefox favicon frameset regression @@ -56,12 +63,12 @@ - - bug #3425230 [interface] enum data split at space char (more space to edit) - - bug #3426840 [interface] ENUM/SET editor can't handle commas in values - - bug #3427256 [interface] no links to browse/empty views and tables - - bug #3430377 [interface] Deleted search results remain visible - - bug #3428627 [import] ODS import ignores memory limits - - bug #3426836 [interface] Visual column separation - - bug #3428065 [parser] TRUE not recognized by parser - + patch #3433770 [config] Make location of php-gettext configurable - - patch #3430291 [import] Handle conflicts in some open_basedir situations - - bug #3431427 [display] Dropdown results - setting NULL does not work - - patch #3428764 [edit] Inline edit on multi-server configuration - - patch #3437354 [core] Notice: Array to string conversion in PHP 5.4 + - sf#3425230 [interface] enum data split at space char (more space to edit) + - sf#3426840 [interface] ENUM/SET editor can't handle commas in values + - sf#3427256 [interface] no links to browse/empty views and tables + - sf#3430377 [interface] Deleted search results remain visible + - sf#3428627 [import] ODS import ignores memory limits + - sf#3426836 [interface] Visual column separation + - sf#3428065 [parser] TRUE not recognized by parser + + sf#3433770 [config] Make location of php-gettext configurable + - sf#3430291 [import] Handle conflicts in some open_basedir situations + - sf#3431427 [display] Dropdown results - setting NULL does not work + - sf#3428764 [edit] Inline edit on multi-server configuration + - sf#3437354 [core] Notice: Array to string conversion in PHP 5.4 @@ -70,2 +77,2 @@ - - bug #3439292 [core] Fail to synchronize column with name of keyword - - bug #3425156 [interface] Add column after drop + - sf#3439292 [core] Fail to synchronize column with name of keyword + - sf#3425156 [interface] Add column after drop @@ -73,2 +80,2 @@ - - bug #3441572 [GUI] 'newer version of phpMyAdmin' message not shown in IE8 - - bug #3407235 [interface] Entering the key through a lookup window does not + - sf#3441572 [GUI] 'newer version of phpMyAdmin' message not shown in IE8 + - sf#3407235 [interface] Entering the key through a lookup window does not @@ -95 +102 @@ - - bug #3418610 [interface] Links in navigation when + - sf#3418610 [interface] Links in navigation when @@ -97 +104 @@ - - bug #3418849 [interface] Inline edit shows dropdowns even after closing + - sf#3418849 [interface] Inline edit shows dropdowns even after closing @@ -100,2 +107,2 @@ - - bug #3420229 [doc] Missing documentation section - - bug #3423725 [pdf] Broken PDF file when exporting database to PDF + - sf#3420229 [doc] Missing documentation section + - sf#3423725 [pdf] Broken PDF file when exporting database to PDF @@ -103,2 +110,2 @@ - - bug #3425184 [doc] Fix links to PHP documentation - - bug #3426031 [export] Export to bzip2 is not working + - sf#3425184 [doc] Fix links to PHP documentation + - sf#3426031 [export] Export to bzip2 is not working @@ -106,9 +113,9 @@ - - patch #3404173 InnoDB comment display with tooltips/aliases - - bug #3404886 [navi] Edit SQL statement after error - - bug #3403165 [interface] Collation not displayed for long enum fields - - bug #3399951 [export] Config for export compression not used - - bug #3400690 [privileges] DB-specific privileges won't submit - - bug #3410604 [config] Configuration storage incorrect suggested table name - - bug #3383572 [interface] Cannot execute saved query - - bug #3411535 [display] Full text button unchecks results display options - - bug #3411224 [display] Broken binary column when 'Show binary contents' + - sf#3404173 InnoDB comment display with tooltips/aliases + - sf#3404886 [navi] Edit SQL statement after error + - sf#3403165 [interface] Collation not displayed for long enum fields + - sf#3399951 [export] Config for export compression not used + - sf#3400690 [privileges] DB-specific privileges won't submit + - sf#3410604 [config] Configuration storage incorrect suggested table name + - sf#3383572 [interface] Cannot execute saved query + - sf#3411535 [display] Full text button unchecks results display options + - sf#3411224 [display] Broken binary column when 'Show binary contents' @@ -116,4 +123,4 @@ - - bug #3411633 [core] Call to undefined function PMA_isSuperuser() - - bug #3413743 [interface] Display options link missing after search - - bug #3324161 [core] CSP policy causing designer JS buttons to fail - - bug #3412862 [relation] Relations/constraints are dropped/created + - sf#3411633 [core] Call to undefined function PMA_isSuperuser() + - sf#3413743 [interface] Display options link missing after search + - sf#3324161 [core] CSP policy causing designer JS buttons to fail + - sf#3412862 [relation] Relations/constraints are dropped/created @@ -121,5 +128,5 @@ - - bug #3390832 [display] Delete records from last page breaks search - - bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken - - bug #3414744 [core] External link fails in 3.4.5 - - patch #3314626 [display] CharTextareaRows is not respected - - bug #3417089 [synchronize] Extraneous db choices + - sf#3390832 [display] Delete records from last page breaks search + - sf#3392150 [schema] PMA_User_Schema::processUserChoice() is broken + - sf#3414744 [core] External link fails in 3.4.5 + - sf#3314626 [display] CharTextareaRows is not respected + - sf#3417089 [synchronize] Extraneous db choices @@ -133,4 +140,4 @@ - - bug #3375325 [interface] Page list in navigation frame looks odd - - bug #3313235 [interface] Error div misplaced - - bug #3374802 [interface] Comment on a column breaks inline editing - - patch #3383711 [display] Order by a column in a view doesn't work + - sf#3375325 [interface] Page list in navigation frame looks odd + - sf#3313235 [interface] Error div misplaced + - sf#3374802 [interface] Comment on a column breaks inline editing + - sf#3383711 [display] Order by a column in a view doesn't work @@ -138 +145 @@ - - bug #3386434 [interface] Add missing space to server status + - sf#3386434 [interface] Add missing space to server status @@ -142 +149 @@ - - bug #3392920 [edit] BLOB emptied after editing another column + - sf#3392920 [edit] BLOB emptied after editing another column @@ -150 +157 @@ - - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed + - sf#3323060 [parser] SQL parser breaks AJAX requests if query has unclosed @@ -152,2 +159,2 @@ - - bug #3323101 [parser] Invalid escape sequence in SQL parser - - bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select + - sf#3323101 [parser] Invalid escape sequence in SQL parser + - sf#3348995 [config] $cfg['Export']['asfile'] set to false does not select @@ -155,5 +162,5 @@ - - bug #3340151 [export] Working SQL query exports error page - - bug #3353649 [interface] "Create an index on X columns" form not validated - - bug #3350790 [interface] JS error in Table->Structure->Index->Edit - - bug #3353811 [interface] Info message has "error" class - - bug #3357837 [interface] TABbing through a NULL field in the inline mode + - sf#3340151 [export] Working SQL query exports error page + - sf#3353649 [interface] "Create an index on X columns" form not validated + - sf#3350790 [interface] JS error in Table->Structure->Index->Edit + - sf#3353811 [interface] Info message has "error" class + - sf#3357837 [interface] TABbing through a NULL field in the inline mode @@ -162,3 +169,3 @@ - - bug #3367993 [usability] Missing "Generate Password" button - - bug #3363221 [display] Missing Server Parameter on inline sql query - - bug #3367986 [navi] Drop field -> lost active table + - sf#3367993 [usability] Missing "Generate Password" button + - sf#3363221 [display] Missing Server Parameter on inline sql query + - sf#3367986 [navi] Drop field -> lost active table @@ -166,4 +173,4 @@ - - bug #3374374 [interface] Fix footnote for inexact count while browsing - - bug #3372807 [interface] Fix security warning link in setup - - bug #3374347 [display] Backquotes in normal text on import page - - bug #3358750 [core] With Suhosin, urls are too long in edit links + - sf#3374374 [interface] Fix footnote for inexact count while browsing + - sf#3372807 [interface] Fix security warning link in setup + - sf#3374347 [display] Backquotes in normal text on import page + - sf#3358750 [core] With Suhosin, urls are too long in edit links @@ -192,12 +199,12 @@ - - bug #3311170 [sync] Missing helper icons in Synchronize - - patch #3304473 [setup] Redefine a lable that was wrong - - bug #3304544 [parser] master is not a reserved word - - bug #3307616 [edit] Inline edit updates multiple duplicate rows - - patch #3311539 [edit] Inline edit does not escape backslashes - - bug #3313210 [interface] Columns class sometimes changed for nothing - - patch #3313326 [interface] Some tooltips do not disappear - - bug #3315720 [search] Fix search in non unicode tables ++++ 586 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes ++++ and /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.aHodOl/_old 2012-03-06 13:41:08.000000000 +0100 +++ /var/tmp/diff_new_pack.aHodOl/_new 2012-03-06 13:41:08.000000000 +0100 @@ -15,6 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: phpMyAdmin %define apxs %{_sbindir}/apxs2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Date-Manip for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package perl-Date-Manip for openSUSE:Factory checked in at 2012-03-06 13:40:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Date-Manip (Old) and /work/SRC/openSUSE:Factory/.perl-Date-Manip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Date-Manip", Maintainer is "DLovasko(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Date-Manip/perl-Date-Manip.changes 2012-02-14 13:08:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Date-Manip.new/perl-Date-Manip.changes 2012-03-06 13:41:02.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Mar 6 07:29:06 UTC 2012 - coolo(a)suse.com + +- updated to 6.31 + * Added extended formats to printf method. + * Can now parse formats where the time and zone are not adjacent + * Added PeriodTimeSep config variable. + * Holidays can be used as date strings + * Added new recur modifiers + * Tons of new test cases and bug fixes + +------------------------------------------------------------------- Old: ---- Date-Manip-6.30.tar.gz New: ---- Date-Manip-6.31.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Date-Manip.spec ++++++ --- /var/tmp/diff_new_pack.vCXFdV/_old 2012-03-06 13:41:04.000000000 +0100 +++ /var/tmp/diff_new_pack.vCXFdV/_new 2012-03-06 13:41:04.000000000 +0100 @@ -16,57 +16,65 @@ # -%bcond_with pod - Name: perl-Date-Manip -Version: 6.30 +Version: 6.31 Release: 0 %define cpan_name Date-Manip Summary: Date manipulation routines -License: GPL-1.0+ or Artistic-1.0 +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Date-Manip/ -Source: %{cpan_name}-%{version}.tar.gz -BuildRequires: perl >= 5.10 +Source: http://www.cpan.org/authors/id/S/SB/SBECK/%{cpan_name}-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Module::Build) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -%{perl_requires} -%if %{with pod} -BuildRequires: perl(Test::Pod) -BuildRequires: perl(Test::Pod::Coverage) -%endif -BuildRequires: perl(Carp) -BuildRequires: perl(IO::File) BuildRequires: perl(Test::Inter) BuildRequires: perl(YAML::Syck) -Requires: perl(Carp) -Requires: perl(IO::File) +#BuildRequires: perl(Date::Manip) +#BuildRequires: perl(Date::Manip::Base) +#BuildRequires: perl(Date::Manip::Date) +#BuildRequires: perl(Date::Manip::Delta) +#BuildRequires: perl(Date::Manip::DM5abbrevs) +#BuildRequires: perl(Date::Manip::Lang::index) +#BuildRequires: perl(Date::Manip::Obj) +#BuildRequires: perl(Date::Manip::Recur) +#BuildRequires: perl(Date::Manip::TZ) +#BuildRequires: perl(Date::Manip::TZ_Base) +#BuildRequires: perl(Date::Manip::Zones) +#BuildRequires: perl(Date::Parse) +#BuildRequires: perl(DateTime::Format::DateParse) +#BuildRequires: perl(Win32::TieRegistry) Requires: perl(YAML::Syck) -Obsoletes: perl-DateManip < %{version} -Provides: perl-DateManip = %{version} +%{perl_requires} %description Date::Manip is a series of modules designed to make any common date/time -manipulation easy to do. Operations such as comparing two times, -calculating a time a given amount of time from another, or parsing -international times are all easily done. From the very beginning, the main -focus of Date::Manip has been to be able to do ANY desired date/time -operation easily, not necessarily quickly. Also, it is definitely oriented -towards the type of operations we (as people) tend to think of rather than -those operations used routinely by computers. There are other modules that -can do a subset of the operations available in Date::Manip much quicker -than those presented here, so be sure to read the section SHOULD I USE +operation easy to do. Operations such as comparing two times, determining a +data a given amount of time from another, or parsing international times +are all easily done. It deals with time as it is used in the Gregorian +calendar (the one currently in use) with full support for time changes due +to daylight saving time. + +From the very beginning, the main focus of Date::Manip has been to be able +to do ANY desired date/time operation easily. Many other modules exist +which may do a subset of these operations quicker or more efficiently, but +no other module can do all of the operations available in Date::Manip. + +Since many other date/time modules exist, some of which may do the specific +operation(s) you need faster, be sure to read the section SHOULD I USE DATE::MANIP in the Date::Manip::Misc document before deciding which of the -Date and Time modules from CPAN is for you. +Date and Time modules from CPAN is for you. However, if you want one module +to do it all, Date::Manip is the one to use. %prep %setup -q -n %{cpan_name}-%{version} +find . -type f -print0 | xargs -0 chmod 644 %build -perl Build.PL installdirs=vendor -./Build +%{__perl} Build.PL installdirs=vendor +./Build build flags=%{?_smp_mflags} %check ./Build test @@ -75,11 +83,8 @@ ./Build install destdir=%{buildroot} create_packlist=0 %perl_gen_filelist -%clean -rm -rf %{buildroot} - %files -f %{name}.files -%defattr(-,root,root,-) -%doc HISTORY LICENSE README README.first +%defattr(-,root,root,755) +%doc examples HISTORY LICENSE README README.first %changelog ++++++ Date-Manip-6.30.tar.gz -> Date-Manip-6.31.tar.gz ++++++ ++++ 90055 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Data-Section-Simple for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package perl-Data-Section-Simple for openSUSE:Factory checked in at 2012-03-06 13:40:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Data-Section-Simple (Old) and /work/SRC/openSUSE:Factory/.perl-Data-Section-Simple.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Data-Section-Simple", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Data-Section-Simple/perl-Data-Section-Simple.changes 2011-12-21 12:18:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Data-Section-Simple.new/perl-Data-Section-Simple.changes 2012-03-06 13:40:53.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 2 01:42:33 CET 2012 - ro(a)suse.de + +- fix build on sle11 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Data-Section-Simple.spec ++++++ --- /var/tmp/diff_new_pack.z9z8Xt/_old 2012-03-06 13:40:54.000000000 +0100 +++ /var/tmp/diff_new_pack.z9z8Xt/_new 2012-03-06 13:40:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Data-Section-Simple # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: perl-Data-Section-Simple Version: 0.03 Release: 0 @@ -48,6 +49,11 @@ %prep %setup -q -n %{cpan_name}-%{version} +%if 0%{?suse_version} <= 1110 +for i in `find t -type f` ; do + sed -i -e "s@^\s*use\s\s*Test::More@use lib '%{perl_vendorlib}';\nuse Test::More@" $i +done +%endif %build %{__perl} Makefile.PL INSTALLDIRS=vendor -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-CPANPLUS for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package perl-CPANPLUS for openSUSE:Factory checked in at 2012-03-06 13:40:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-CPANPLUS (Old) and /work/SRC/openSUSE:Factory/.perl-CPANPLUS.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-CPANPLUS", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-CPANPLUS/perl-CPANPLUS.changes 2012-02-24 12:06:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-CPANPLUS.new/perl-CPANPLUS.changes 2012-03-06 13:40:48.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 6 07:27:35 UTC 2012 - coolo(a)suse.com + +- updated to 0.9120 + * Resolved a regression with NA test reports + +------------------------------------------------------------------- Old: ---- CPANPLUS-0.9119.tar.gz New: ---- CPANPLUS-0.9120.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-CPANPLUS.spec ++++++ --- /var/tmp/diff_new_pack.PCO7Ch/_old 2012-03-06 13:40:49.000000000 +0100 +++ /var/tmp/diff_new_pack.PCO7Ch/_new 2012-03-06 13:40:49.000000000 +0100 @@ -17,7 +17,7 @@ Name: perl-CPANPLUS -Version: 0.9119 +Version: 0.9120 Release: 0 %define cpan_name CPANPLUS Summary: API & CLI access to the CPAN mirrors ++++++ CPANPLUS-0.9119.tar.gz -> CPANPLUS-0.9120.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPANPLUS-0.9119/ChangeLog new/CPANPLUS-0.9120/ChangeLog --- old/CPANPLUS-0.9119/ChangeLog 2012-02-23 21:57:50.000000000 +0100 +++ new/CPANPLUS-0.9120/ChangeLog 2012-03-04 13:13:59.000000000 +0100 @@ -1,3 +1,7 @@ +Changes for 0.9120 Sun Mar 4 12:12:52 2012 +================================================ +* Resolved a regression with NA test reports + Changes for 0.9119 Thu Feb 23 20:54:53 2012 ================================================ * Added progress indicators for indexing when diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPANPLUS-0.9119/META.yml new/CPANPLUS-0.9120/META.yml --- old/CPANPLUS-0.9119/META.yml 2012-02-23 21:52:00.000000000 +0100 +++ new/CPANPLUS-0.9120/META.yml 2012-03-04 12:26:28.000000000 +0100 @@ -18,4 +18,4 @@ license: http://dev.perl.org/licenses/ homepage: http://github.com/jib/cpanplus-devel repository: http://github.com/jib/cpanplus-devel -version: 0.9119 +version: 0.9120 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPANPLUS-0.9119/inc/bundle/Archive/Tar/Constant.pm new/CPANPLUS-0.9120/inc/bundle/Archive/Tar/Constant.pm --- old/CPANPLUS-0.9119/inc/bundle/Archive/Tar/Constant.pm 2012-02-10 13:31:49.000000000 +0100 +++ new/CPANPLUS-0.9120/inc/bundle/Archive/Tar/Constant.pm 2012-03-04 12:25:52.000000000 +0100 @@ -3,7 +3,7 @@ BEGIN { require Exporter; - $VERSION = '1.82'; + $VERSION = '1.84'; @ISA = qw[Exporter]; require Time::Local if $^O eq "MacOS"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPANPLUS-0.9119/inc/bundle/Archive/Tar/File.pm new/CPANPLUS-0.9120/inc/bundle/Archive/Tar/File.pm --- old/CPANPLUS-0.9119/inc/bundle/Archive/Tar/File.pm 2012-02-10 13:31:49.000000000 +0100 +++ new/CPANPLUS-0.9120/inc/bundle/Archive/Tar/File.pm 2012-03-04 12:25:52.000000000 +0100 @@ -13,7 +13,7 @@ use vars qw[@ISA $VERSION]; #@ISA = qw[Archive::Tar]; -$VERSION = '1.82'; +$VERSION = '1.84'; ### set value to 1 to oct() it during the unpack ### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPANPLUS-0.9119/inc/bundle/Archive/Tar.pm new/CPANPLUS-0.9120/inc/bundle/Archive/Tar.pm --- old/CPANPLUS-0.9119/inc/bundle/Archive/Tar.pm 2012-02-10 13:31:49.000000000 +0100 +++ new/CPANPLUS-0.9120/inc/bundle/Archive/Tar.pm 2012-03-04 12:25:52.000000000 +0100 @@ -31,7 +31,7 @@ $DEBUG = 0; $WARN = 1; $FOLLOW_SYMLINK = 0; -$VERSION = "1.82"; +$VERSION = "1.84"; $CHOWN = 1; $CHMOD = 1; $SAME_PERMISSIONS = $> == 0 ? 1 : 0; @@ -1451,6 +1451,12 @@ next; } + eval { + if( utf8::is_utf8( $file )) { + utf8::encode( $file ); + } + }; + unless( -e $file || -l $file ) { $self->_error( qq[No such file: '$file'] ); next; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPANPLUS-0.9119/lib/CPANPLUS/Internals/Report.pm new/CPANPLUS-0.9120/lib/CPANPLUS/Internals/Report.pm --- old/CPANPLUS-0.9119/lib/CPANPLUS/Internals/Report.pm 2012-02-12 23:43:26.000000000 +0100 +++ new/CPANPLUS-0.9120/lib/CPANPLUS/Internals/Report.pm 2012-03-04 12:21:07.000000000 +0100 @@ -509,12 +509,13 @@ $message .= REPORT_TESTS_SKIPPED->(); } elsif( $grade eq GRADE_NA) { + my $capture = ( $status && defined $status->{capture} ? $status->{capture} : $buffer ); + ### add the reason for the NA to the buffer - $buffer = join $/, $buffer, map { + $capture = join $/, $capture, map { '[' . $_->tag . '] [' . $_->when . '] ' . $_->message } ( CPANPLUS::Error->stack )[-1]; - my $capture = ( $status && defined $status->{capture} ? $status->{capture} : $buffer ); ### the bit where we inform what went wrong $message .= REPORT_MESSAGE_FAIL_HEADER->( $stage, $capture ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPANPLUS-0.9119/lib/CPANPLUS/Internals.pm new/CPANPLUS-0.9120/lib/CPANPLUS/Internals.pm --- old/CPANPLUS-0.9119/lib/CPANPLUS/Internals.pm 2012-02-23 21:52:00.000000000 +0100 +++ new/CPANPLUS-0.9120/lib/CPANPLUS/Internals.pm 2012-03-04 12:26:28.000000000 +0100 @@ -42,7 +42,7 @@ CPANPLUS::Internals::Report ]; -$VERSION = "0.9119"; +$VERSION = "0.9120"; =pod diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPANPLUS-0.9119/lib/CPANPLUS/Shell/Default.pm new/CPANPLUS-0.9120/lib/CPANPLUS/Shell/Default.pm --- old/CPANPLUS-0.9119/lib/CPANPLUS/Shell/Default.pm 2012-02-23 21:52:00.000000000 +0100 +++ new/CPANPLUS-0.9120/lib/CPANPLUS/Shell/Default.pm 2012-03-04 12:26:28.000000000 +0100 @@ -26,7 +26,7 @@ BEGIN { use vars qw[ $VERSION @ISA ]; @ISA = qw[ CPANPLUS::Shell::_Base::ReadLine ]; - $VERSION = "0.9119"; + $VERSION = "0.9120"; } load CPANPLUS::Shell; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPANPLUS-0.9119/lib/CPANPLUS.pm new/CPANPLUS-0.9120/lib/CPANPLUS.pm --- old/CPANPLUS-0.9119/lib/CPANPLUS.pm 2012-02-23 21:52:00.000000000 +0100 +++ new/CPANPLUS-0.9120/lib/CPANPLUS.pm 2012-03-04 12:26:28.000000000 +0100 @@ -13,7 +13,7 @@ use vars qw( @EXPORT @ISA $VERSION ); @EXPORT = qw( shell fetch get install ); @ISA = qw( Exporter ); - $VERSION = "0.9119"; #have to hardcode or cpan.org gets unhappy + $VERSION = "0.9120"; #have to hardcode or cpan.org gets unhappy } ### purely for backward compatibility, so we can call it from the commandline: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-CPAN-Meta for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package perl-CPAN-Meta for openSUSE:Factory checked in at 2012-03-06 13:40:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-CPAN-Meta (Old) and /work/SRC/openSUSE:Factory/.perl-CPAN-Meta.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-CPAN-Meta", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-CPAN-Meta/perl-CPAN-Meta.changes 2012-02-23 15:33:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-CPAN-Meta.new/perl-CPAN-Meta.changes 2012-03-06 13:40:44.000000000 +0100 @@ -1,0 +2,25 @@ +Tue Mar 6 07:26:18 UTC 2012 - coolo(a)suse.com + +- updated to 2.120630 + [BUGFIX] + + - CPAN::Meta::Requirements now ensures that dotted-decimal versions are + represented in normalized form when stringified. This fixes a + regression in META conversion in 2.120620. + [Reported by Kent Fredric; fixed by David Golden] + + [ADDED] + + - CPAN::Meta::Requirements::add_string_requirements allows building + a requirements specification piecemeal [Cory G. Watson] + + [BUGFIX] + + - Version range handling fixed [RT#75424] + + - CPAN::Meta::Converter handles bad version strings more gracefully, + truncating alphanumerics and otherwise falling back to "0". This + is likely better than dropping a prerequisite or dying. + [RT#75427] + +------------------------------------------------------------------- Old: ---- CPAN-Meta-2.120530.tar.gz New: ---- CPAN-Meta-2.120630.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-CPAN-Meta.spec ++++++ --- /var/tmp/diff_new_pack.cSvUI6/_old 2012-03-06 13:40:45.000000000 +0100 +++ /var/tmp/diff_new_pack.cSvUI6/_new 2012-03-06 13:40:45.000000000 +0100 @@ -17,7 +17,7 @@ Name: perl-CPAN-Meta -Version: 2.120530 +Version: 2.120630 Release: 0 %define cpan_name CPAN-Meta Summary: the distribution metadata for a CPAN dist @@ -35,17 +35,18 @@ BuildRequires: perl(JSON::PP) >= 2.27103 BuildRequires: perl(Parse::CPAN::Meta) >= 1.4400 BuildRequires: perl(Test::More) >= 0.88 -BuildRequires: perl(version) >= 0.82 +BuildRequires: perl(version) >= 0.88 #BuildRequires: perl(CPAN::Meta) #BuildRequires: perl(CPAN::Meta::Converter) #BuildRequires: perl(CPAN::Meta::Feature) #BuildRequires: perl(CPAN::Meta::Prereqs) #BuildRequires: perl(CPAN::Meta::Requirements) #BuildRequires: perl(CPAN::Meta::Validator) +#BuildRequires: perl(Test::Requires) Requires: perl(CPAN::Meta::YAML) >= 0.002 Requires: perl(JSON::PP) >= 2.27103 Requires: perl(Parse::CPAN::Meta) >= 1.4400 -Requires: perl(version) >= 0.82 +Requires: perl(version) >= 0.88 %{perl_requires} %description ++++++ CPAN-Meta-2.120530.tar.gz -> CPAN-Meta-2.120630.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/Changes new/CPAN-Meta-2.120630/Changes --- old/CPAN-Meta-2.120530/Changes 2012-02-22 22:15:40.000000000 +0100 +++ new/CPAN-Meta-2.120630/Changes 2012-03-03 20:48:44.000000000 +0100 @@ -1,5 +1,30 @@ Revision history for CPAN-Meta +2.120630 2012-03-03 14:48:35 EST5EDT + + [BUGFIX] + + - CPAN::Meta::Requirements now ensures that dotted-decimal versions are + represented in normalized form when stringified. This fixes a + regression in META conversion in 2.120620. + [Reported by Kent Fredric; fixed by David Golden] + +2.120620 2012-03-02 12:28:59 EST5EDT + + [ADDED] + + - CPAN::Meta::Requirements::add_string_requirements allows building + a requirements specification piecemeal [Cory G. Watson] + + [BUGFIX] + + - Version range handling fixed [rt.cpan.org #75424] + + - CPAN::Meta::Converter handles bad version strings more gracefully, + truncating alphanumerics and otherwise falling back to "0". This + is likely better than dropping a prerequisite or dying. + [rt.cpan.org #75427] + 2.120530 2012-02-22 16:15:31 EST5EDT [OTHER] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/MANIFEST new/CPAN-Meta-2.120630/MANIFEST --- old/CPAN-Meta-2.120530/MANIFEST 2012-02-22 22:15:40.000000000 +0100 +++ new/CPAN-Meta-2.120630/MANIFEST 2012-03-03 20:48:44.000000000 +0100 @@ -24,6 +24,7 @@ perlcritic.rc t/00-compile.t t/accepts.t +t/bad_version_hook.t t/basic.t t/converter-bad.t t/converter-fail.t @@ -48,6 +49,7 @@ t/data-bad/META-1_4.yml t/data-bad/META-2.json t/data-bad/restrictive-2.json +t/data-bad/version-ranges-2.json t/data-fail/META-1_0.yml t/data-fail/META-1_1.yml t/data-fail/META-1_2.yml @@ -65,6 +67,9 @@ t/data/restricted-2.json t/data/restrictive-1_4.yml t/data/unicode.yml +t/data/version-not-normal.json +t/data/version-ranges-1_4.yml +t/data/version-ranges-2.json t/finalize.t t/from-hash.t t/load-bad.t @@ -76,6 +81,7 @@ t/prereqs.t t/repository.t t/save-load.t +t/strings.t t/validator.t xt/author/critic.t xt/author/pod-spell.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/META.json new/CPAN-Meta-2.120630/META.json --- old/CPAN-Meta-2.120530/META.json 2012-02-22 22:15:40.000000000 +0100 +++ new/CPAN-Meta-2.120630/META.json 2012-03-03 20:48:44.000000000 +0100 @@ -34,13 +34,14 @@ "Scalar::Util" : "0", "perl" : "5.006", "strict" : "0", - "version" : "0.82", + "version" : "0.88", "warnings" : "0" } }, "test" : { "requires" : { "Data::Dumper" : "0", + "File::Basename" : "0", "File::Find" : "0", "File::Spec" : "0", "File::Temp" : "0.20", @@ -54,35 +55,35 @@ "provides" : { "CPAN::Meta" : { "file" : "lib/CPAN/Meta.pm", - "version" : "2.120530" + "version" : "2.120630" }, "CPAN::Meta::Converter" : { "file" : "lib/CPAN/Meta/Converter.pm", - "version" : "2.120530" + "version" : "2.120630" }, "CPAN::Meta::Feature" : { "file" : "lib/CPAN/Meta/Feature.pm", - "version" : "2.120530" + "version" : "2.120630" }, "CPAN::Meta::History" : { "file" : "lib/CPAN/Meta/History.pm", - "version" : "2.120530" + "version" : "2.120630" }, "CPAN::Meta::Prereqs" : { "file" : "lib/CPAN/Meta/Prereqs.pm", - "version" : "2.120530" + "version" : "2.120630" }, "CPAN::Meta::Requirements" : { "file" : "lib/CPAN/Meta/Requirements.pm", - "version" : "2.120530" + "version" : "2.120630" }, "CPAN::Meta::Spec" : { "file" : "lib/CPAN/Meta/Spec.pm", - "version" : "2.120530" + "version" : "2.120630" }, "CPAN::Meta::Validator" : { "file" : "lib/CPAN/Meta/Validator.pm", - "version" : "2.120530" + "version" : "2.120630" } }, "release_status" : "stable", @@ -98,6 +99,6 @@ "web" : "http://github.com/dagolden/cpan-meta" } }, - "version" : "2.120530" + "version" : "2.120630" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/META.yml new/CPAN-Meta-2.120630/META.yml --- old/CPAN-Meta-2.120530/META.yml 2012-02-22 22:15:40.000000000 +0100 +++ new/CPAN-Meta-2.120630/META.yml 2012-03-03 20:48:44.000000000 +0100 @@ -5,6 +5,7 @@ - 'Ricardo Signes <rjbs(a)cpan.org>' build_requires: Data::Dumper: 0 + File::Basename: 0 File::Find: 0 File::Spec: 0 File::Temp: 0.20 @@ -27,28 +28,28 @@ provides: CPAN::Meta: file: lib/CPAN/Meta.pm - version: 2.120530 + version: 2.120630 CPAN::Meta::Converter: file: lib/CPAN/Meta/Converter.pm - version: 2.120530 + version: 2.120630 CPAN::Meta::Feature: file: lib/CPAN/Meta/Feature.pm - version: 2.120530 + version: 2.120630 CPAN::Meta::History: file: lib/CPAN/Meta/History.pm - version: 2.120530 + version: 2.120630 CPAN::Meta::Prereqs: file: lib/CPAN/Meta/Prereqs.pm - version: 2.120530 + version: 2.120630 CPAN::Meta::Requirements: file: lib/CPAN/Meta/Requirements.pm - version: 2.120530 + version: 2.120630 CPAN::Meta::Spec: file: lib/CPAN/Meta/Spec.pm - version: 2.120530 + version: 2.120630 CPAN::Meta::Validator: file: lib/CPAN/Meta/Validator.pm - version: 2.120530 + version: 2.120630 requires: CPAN::Meta::YAML: 0.002 Carp: 0 @@ -57,10 +58,10 @@ Scalar::Util: 0 perl: 5.006 strict: 0 - version: 0.82 + version: 0.88 warnings: 0 resources: bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=CPAN-Meta homepage: https://github.com/dagolden/cpan-meta repository: git://github.com/dagolden/cpan-meta.git -version: 2.120530 +version: 2.120630 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/Makefile.PL new/CPAN-Meta-2.120630/Makefile.PL --- old/CPAN-Meta-2.120530/Makefile.PL 2012-02-22 22:15:40.000000000 +0100 +++ new/CPAN-Meta-2.120630/Makefile.PL 2012-03-03 20:48:44.000000000 +0100 @@ -13,6 +13,7 @@ "AUTHOR" => "David Golden <dagolden\(a)cpan.org>, Ricardo Signes <rjbs\(a)cpan.org>", "BUILD_REQUIRES" => { "Data::Dumper" => 0, + "File::Basename" => 0, "File::Find" => 0, "File::Spec" => 0, "File::Temp" => "0.20", @@ -35,10 +36,10 @@ "Parse::CPAN::Meta" => "1.4400", "Scalar::Util" => 0, "strict" => 0, - "version" => "0.82", + "version" => "0.88", "warnings" => 0 }, - "VERSION" => "2.120530", + "VERSION" => "2.120630", "test" => { "TESTS" => "t/*.t" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/README new/CPAN-Meta-2.120630/README --- old/CPAN-Meta-2.120530/README 2012-02-22 22:15:40.000000000 +0100 +++ new/CPAN-Meta-2.120630/README 2012-03-03 20:48:44.000000000 +0100 @@ -2,7 +2,7 @@ CPAN::Meta - the distribution metadata for a CPAN dist VERSION - version 2.120530 + version 2.120630 SYNOPSIS my $meta = CPAN::Meta->load_file('META.json'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/lib/CPAN/Meta/Converter.pm new/CPAN-Meta-2.120630/lib/CPAN/Meta/Converter.pm --- old/CPAN-Meta-2.120530/lib/CPAN/Meta/Converter.pm 2012-02-22 22:15:40.000000000 +0100 +++ new/CPAN-Meta-2.120630/lib/CPAN/Meta/Converter.pm 2012-03-03 20:48:44.000000000 +0100 @@ -2,11 +2,12 @@ use strict; use warnings; package CPAN::Meta::Converter; -our $VERSION = '2.120530'; # VERSION +our $VERSION = '2.120630'; # VERSION use CPAN::Meta::Validator; -use version 0.82 (); +use CPAN::Meta::Requirements; +use version 0.88 (); use Parse::CPAN::Meta 1.4400 (); sub _dclone { @@ -327,29 +328,36 @@ } } +sub _bad_version_hook { + my ($v) = @_; + $v =~ s{[a-z]+$}{}; # strip trailing alphabetics + my $vobj = eval { version->parse($v) }; + return defined($vobj) ? $vobj : version->parse(0); # or give up +} + sub _version_map { my ($element) = @_; return unless defined $element; if ( ref $element eq 'HASH' ) { - my $new_map = {}; - for my $k ( keys %$element ) { + # XXX turn this into CPAN::Meta::Requirements with bad version hook + # and then turn it back into a hash + my $new_map = CPAN::Meta::Requirements->new( + { bad_version_hook => sub { version->new(0) } } # punt + ); + while ( my ($k,$v) = each %$element ) { next unless _is_module_name($k); - my $value = $element->{$k}; - if ( ! ( defined $value && length $value ) ) { - $new_map->{$k} = 0; - } - elsif ( $value eq 'undef' || $value eq '<undef>' ) { - $new_map->{$k} = 0; - } - elsif ( _is_module_name( $value ) ) { # some weird, old META have this - $new_map->{$k} = 0; - $new_map->{$value} = 0; + if ( !defined($v) || !length($v) || $v eq 'undef' || $v eq '<undef>' ) { + $v = 0; } - else { - $new_map->{$k} = _clean_version($value); + # some weird, old META have bad yml with module => module + # so check if value is like a module name and not like a version + if ( _is_module_name($v) && ! version::is_lax($v) ) { + $new_map->add_minimum($k => 0); + $new_map->add_minimum($v => 0); } + $new_map->add_string_requirement($k => $v); } - return $new_map; + return $new_map->as_string_hash; } elsif ( ref $element eq 'ARRAY' ) { my $hashref = { map { $_ => 0 } @$element }; @@ -432,7 +440,6 @@ my $test_h = _extract_prereqs($_[2]->{prereqs}, qw(test requires)) || {}; my $build_h = _extract_prereqs($_[2]->{prereqs}, qw(build requires)) || {}; - require CPAN::Meta::Requirements; my $test_req = CPAN::Meta::Requirements->from_string_hash($test_h); my $build_req = CPAN::Meta::Requirements->from_string_hash($build_h); @@ -442,7 +449,7 @@ sub _extract_prereqs { my ($prereqs, $phase, $type) = @_; return unless ref $prereqs eq 'HASH'; - return $prereqs->{$phase}{$type}; + return scalar _version_map($prereqs->{$phase}{$type}); } sub _downgrade_optional_features { @@ -1263,7 +1270,7 @@ =head1 VERSION -version 2.120530 +version 2.120630 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/lib/CPAN/Meta/Feature.pm new/CPAN-Meta-2.120630/lib/CPAN/Meta/Feature.pm --- old/CPAN-Meta-2.120530/lib/CPAN/Meta/Feature.pm 2012-02-22 22:15:40.000000000 +0100 +++ new/CPAN-Meta-2.120630/lib/CPAN/Meta/Feature.pm 2012-03-03 20:48:44.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; package CPAN::Meta::Feature; -our $VERSION = '2.120530'; # VERSION +our $VERSION = '2.120630'; # VERSION use CPAN::Meta::Prereqs; @@ -42,7 +42,7 @@ =head1 VERSION -version 2.120530 +version 2.120630 =head1 DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/lib/CPAN/Meta/History.pm new/CPAN-Meta-2.120630/lib/CPAN/Meta/History.pm --- old/CPAN-Meta-2.120530/lib/CPAN/Meta/History.pm 2012-02-22 22:15:40.000000000 +0100 +++ new/CPAN-Meta-2.120630/lib/CPAN/Meta/History.pm 2012-03-03 20:48:44.000000000 +0100 @@ -3,7 +3,7 @@ use strict; use warnings; package CPAN::Meta::History; -our $VERSION = '2.120530'; # VERSION +our $VERSION = '2.120630'; # VERSION 1; @@ -20,7 +20,7 @@ =head1 VERSION -version 2.120530 +version 2.120630 =head1 DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/lib/CPAN/Meta/Prereqs.pm new/CPAN-Meta-2.120630/lib/CPAN/Meta/Prereqs.pm --- old/CPAN-Meta-2.120530/lib/CPAN/Meta/Prereqs.pm 2012-02-22 22:15:40.000000000 +0100 +++ new/CPAN-Meta-2.120630/lib/CPAN/Meta/Prereqs.pm 2012-03-03 20:48:44.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; package CPAN::Meta::Prereqs; -our $VERSION = '2.120530'; # VERSION +our $VERSION = '2.120630'; # VERSION use Carp qw(confess); @@ -149,7 +149,7 @@ =head1 VERSION -version 2.120530 +version 2.120630 =head1 DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/lib/CPAN/Meta/Requirements.pm new/CPAN-Meta-2.120630/lib/CPAN/Meta/Requirements.pm --- old/CPAN-Meta-2.120530/lib/CPAN/Meta/Requirements.pm 2012-02-22 22:15:40.000000000 +0100 +++ new/CPAN-Meta-2.120630/lib/CPAN/Meta/Requirements.pm 2012-03-03 20:48:44.000000000 +0100 @@ -1,7 +1,7 @@ use strict; use warnings; package CPAN::Meta::Requirements; -our $VERSION = '2.120530'; # VERSION +our $VERSION = '2.120630'; # VERSION # ABSTRACT: a set of version requirements for a CPAN dist @@ -10,19 +10,50 @@ use version 0.77 (); # the ->parse method +my @valid_options = qw( bad_version_hook ); + sub new { - my ($class) = @_; - return bless {} => $class; + my ($class, $options) = @_; + $options ||= {}; + Carp::croak "Argument to $class\->new() must be a hash reference" + unless ref $options eq 'HASH'; + my %self = map {; $_ => $options->{$_}} @valid_options; + + return bless \%self => $class; } sub _version_object { my ($self, $version) = @_; - $version = (! defined $version) ? version->parse(0) + my $vobj; + + eval { + $vobj = (! defined $version) ? version->parse(0) : (! Scalar::Util::blessed($version)) ? version->parse($version) : $version; + }; + + if ( my $err = $@ ) { + my $hook = $self->{bad_version_hook}; + $vobj = eval { $hook->($version) } + if ref $hook eq 'CODE'; + unless (Scalar::Util::blessed($vobj) && $vobj->isa("version")) { + $err =~ s{ at .* line \d+.*$}{}; + die "Can't convert '$version': $err"; + } + } - return $version; + # ensure no leading '.' + if ( $vobj =~ m{\A\.} ) { + $vobj = version->parse("0$vobj"); + } + + # ensure normal v-string form + if ( $vobj->is_qv ) { + $vobj = version->parse($vobj->normal); + } + + return $vobj; } @@ -153,25 +184,32 @@ '<' => [ qw(add_maximum add_exclusion) ], ); +sub add_string_requirement { + my ($self, $module, $req) = @_; + + my @parts = split qr{\s*,\s*}, $req; + for my $part (@parts) { + my ($op, $ver) = $part =~ m{\A\s*(==|>=|>|<=|<|!=)\s*(.*)\z}; + + if (! defined $op) { + $self->add_minimum($module => $part); + } else { + Carp::confess("illegal requirement string: $req") + unless my $methods = $methods_for_op{ $op }; + + $self->$_($module => $ver) for @$methods; + } + } +} + + sub from_string_hash { my ($class, $hash) = @_; my $self = $class->new; for my $module (keys %$hash) { - my @parts = split qr{\s*,\s*}, $hash->{ $module }; - for my $part (@parts) { - my ($op, $ver) = split /\s+/, $part, 2; - - if (! defined $ver) { - $self->add_minimum($module => $op); - } else { - Carp::confess("illegal requirement string: $hash->{ $module }") - unless my $methods = $methods_for_op{ $op }; - - $self->$_($module => $ver) for @$methods; - } - } + $self->add_string_requirement($module, $hash->{ $module }); } return $self; @@ -384,7 +422,7 @@ =head1 VERSION -version 2.120530 +version 2.120630 =head1 SYNOPSIS @@ -416,8 +454,21 @@ my $req = CPAN::Meta::Requirements->new; -This returns a new CPAN::Meta::Requirements object. It ignores any arguments -given. +This returns a new CPAN::Meta::Requirements object. It takes an optional +hash reference argument. The following keys are supported: + +=over 4 + +=item * + +<bad_version_hook> -- if provided, when a version cannot be parsed into + +a version object, this code reference will be called with the invalid version +string as an argument. It must return a valid version object. + +=back + +All other keys are ignored. =head2 add_minimum @@ -565,6 +616,37 @@ 'Xyzzy' => '== 6.01', } +=head2 add_string_requirement + + $req->add_string_requirement('Library::Foo' => '>= 1.208, <= 2.206'); + +This method parses the passed in string and adds the appropriate requirement +for the given module. It understands version ranges as described in the +L<CPAN::Meta::Spec/Version Ranges>. For example: + +=over 4 + +=item 1.3 + +=item >= 1.3 + +=item <= 1.3 + +=item == 1.3 + +=item ! 1.3 + +=item > 1.3 + +=item < 1.3 + +=item >= 1.3, ! 1.5, <= 2.0 + +A version number without an operator is equivalent to specifying a minimum +(C<E<gt>=>). Extra whitespace is allowed. + +=back + =head2 from_string_hash my $req = CPAN::Meta::Requirements->from_string_hash( \%hash ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/lib/CPAN/Meta/Spec.pm new/CPAN-Meta-2.120630/lib/CPAN/Meta/Spec.pm --- old/CPAN-Meta-2.120530/lib/CPAN/Meta/Spec.pm 2012-02-22 22:15:40.000000000 +0100 +++ new/CPAN-Meta-2.120630/lib/CPAN/Meta/Spec.pm 2012-03-03 20:48:44.000000000 +0100 @@ -3,7 +3,7 @@ use strict; use warnings; package CPAN::Meta::Spec; -our $VERSION = '2.120530'; # VERSION +our $VERSION = '2.120630'; # VERSION 1; @@ -20,7 +20,7 @@ =head1 VERSION -version 2.120530 +version 2.120630 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/lib/CPAN/Meta/Validator.pm new/CPAN-Meta-2.120630/lib/CPAN/Meta/Validator.pm --- old/CPAN-Meta-2.120530/lib/CPAN/Meta/Validator.pm 2012-02-22 22:15:40.000000000 +0100 +++ new/CPAN-Meta-2.120630/lib/CPAN/Meta/Validator.pm 2012-03-03 20:48:44.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; package CPAN::Meta::Validator; -our $VERSION = '2.120530'; # VERSION +our $VERSION = '2.120630'; # VERSION #--------------------------------------------------------------------------# @@ -838,7 +838,7 @@ =head1 VERSION -version 2.120530 +version 2.120630 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/lib/CPAN/Meta.pm new/CPAN-Meta-2.120630/lib/CPAN/Meta.pm --- old/CPAN-Meta-2.120530/lib/CPAN/Meta.pm 2012-02-22 22:15:40.000000000 +0100 +++ new/CPAN-Meta-2.120630/lib/CPAN/Meta.pm 2012-03-03 20:48:44.000000000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; package CPAN::Meta; -our $VERSION = '2.120530'; # VERSION +our $VERSION = '2.120630'; # VERSION use Carp qw(carp croak); @@ -346,7 +346,7 @@ =head1 VERSION -version 2.120530 +version 2.120630 =head1 SYNOPSIS @@ -668,7 +668,7 @@ =back -=for :stopwords cpan testmatrix url annocpan anno bugtracker rt cpants kwalitee diff irc mailto metadata placeholders +=for :stopwords cpan testmatrix url annocpan anno bugtracker rt cpants kwalitee diff irc mailto metadata placeholders metacpan =head1 SUPPORT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/t/bad_version_hook.t new/CPAN-Meta-2.120630/t/bad_version_hook.t --- old/CPAN-Meta-2.120530/t/bad_version_hook.t 1970-01-01 01:00:00.000000000 +0100 +++ new/CPAN-Meta-2.120630/t/bad_version_hook.t 2012-03-03 20:48:44.000000000 +0100 @@ -0,0 +1,49 @@ +use strict; +use warnings; + +use CPAN::Meta::Requirements; +use version; + +use Test::More 0.88; + +sub dies_ok (&@) { + my ($code, $qr, $comment) = @_; + + my $lived = eval { $code->(); 1 }; + + if ($lived) { + fail("$comment: did not die"); + } else { + like($@, $qr, $comment); + } +} + +sub _fixit { return version->new(42) } + +{ + my $req = CPAN::Meta::Requirements->new( {bad_version_hook => \&_fixit} ); + + $req->add_minimum('Foo::Bar' => 10); + $req->add_minimum('Foo::Baz' => 'invalid_version'); + + is_deeply( + $req->as_string_hash, + { + 'Foo::Bar' => 10, + 'Foo::Baz' => 42, + }, + "hook fixes invalid version", + ); +} + +{ + my $req = CPAN::Meta::Requirements->new( {bad_version_hook => sub { 0 }} ); + + dies_ok { $req->add_minimum('Foo::Baz' => 'invalid_version') } + qr/Invalid version/, + "dies if hook doesn't return version object"; + +} + + +done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/t/converter.t new/CPAN-Meta-2.120630/t/converter.t --- old/CPAN-Meta-2.120530/t/converter.t 2012-02-22 22:15:40.000000000 +0100 +++ new/CPAN-Meta-2.120630/t/converter.t 2012-03-03 20:48:44.000000000 +0100 @@ -7,6 +7,7 @@ use CPAN::Meta::Validator; use CPAN::Meta::Converter; use File::Spec; +use File::Basename qw/basename/; use IO::Dir; use Parse::CPAN::Meta 1.4400; use version; @@ -187,4 +188,56 @@ like( $authors[0], qr/Williåms/, "Unicode characters preserved in authors" ); } +# specific test for version ranges +{ + my @prereq_keys = qw( + prereqs requires build_requires configure_requires + recommends conflicts + ); + for my $case ( qw/ 2 1_4 / ) { + my $suffix = $case eq 2 ? "$case.json" : "$case.yml"; + my $version = $case; + $version =~ tr[_][.]; + my $path = File::Spec->catfile('t','data','version-ranges-' . $suffix); + my $original = Parse::CPAN::Meta->load_file( $path ); + ok( $original, "loaded " . basename $path ); + my $cmc = CPAN::Meta::Converter->new( $original ); + my $converted = $cmc->convert( version => $version ); + for my $h ( $original, $converted ) { + delete $h->{generated_by}; + delete $h->{'meta-spec'}{url}; + for my $k ( @prereq_keys ) { + _normalize_reqs($h->{$k}) if exists $h->{$k}; + } + } + is_deeply( $converted, $original, "version ranges preserved in conversion" ); + } +} + +# specific test for version numbers +{ + my $path = File::Spec->catfile('t','data','version-not-normal.json'); + my $original = Parse::CPAN::Meta->load_file( $path ); + ok( $original, "loaded " . basename $path ); + my $cmc = CPAN::Meta::Converter->new( $original ); + my $converted = $cmc->convert( version => 2 ); + is( $converted->{prereqs}{runtime}{requires}{'File::Find'}, "v0.1.0", "normalize v0.1"); + is( $converted->{prereqs}{runtime}{requires}{'File::Path'}, "v1.0.0", "normalize v1.0.0"); +} + +# CMR standardizes stuff in a way that makes it hard to test original vs final +# so we remove spaces and >= to make them compare the same +sub _normalize_reqs { + my $hr = shift; + for my $k ( keys %$hr ) { + if (ref $hr->{$k} eq 'HASH') { + _normalize_reqs($hr->{$k}); + } + elsif ( ! ref $hr->{$k} ) { + $hr->{$k} =~ s{\s+}{}g; + $hr->{$k} =~ s{>=\s*}{}g; + } + } +} + done_testing; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/t/data/version-not-normal.json new/CPAN-Meta-2.120630/t/data/version-not-normal.json --- old/CPAN-Meta-2.120530/t/data/version-not-normal.json 1970-01-01 01:00:00.000000000 +0100 +++ new/CPAN-Meta-2.120630/t/data/version-not-normal.json 2012-03-03 20:48:44.000000000 +0100 @@ -0,0 +1,45 @@ +{ + "generated_by" : "Module::Build version 0.36", + "meta-spec" : { + "version" : "2", + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec" + }, + "abstract" : "stuff", + "version" : "0.36", + "name" : "Module-Build", + "dynamic_config" : 1, + "author" : [ + "Ken Williams <kwilliams(a)cpan.org>", + "Module-Build List <module-build(a)perl.org>" + ], + "release_status" : "stable", + "license" : [ + "perl_5" + ], + "description" : "Module::Build is a system for building, testing, and installing Perl modules. It is meant to be an alternative to ExtUtils::MakeMaker... blah blah blah", + "prereqs" : { + "runtime" : { + "requires" : { + "File::Copy" : "== 2.21", + "IO::File" : "> 1.12", + "Data::Dumper" : ">= 1", + "File::Spec" : "< 5", + "File::Find" : "v0.1", + "File::Path" : "1.0.0", + "Module::Metadata" : ">= v1.0.2, <= v1.0.10" + } + }, + "build" : { + "requires" : { + "Build::Requires": "1.1", + "Test::More" : "0" + } + }, + "test" : { + "requires" : { + "Test::More" : "0.88", + "Test::Requires" : "1.2" + } + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/t/data/version-ranges-1_4.yml new/CPAN-Meta-2.120630/t/data/version-ranges-1_4.yml --- old/CPAN-Meta-2.120530/t/data/version-ranges-1_4.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/CPAN-Meta-2.120630/t/data/version-ranges-1_4.yml 2012-03-03 20:48:44.000000000 +0100 @@ -0,0 +1,25 @@ +--- +abstract: stuff +author: + - 'Ken Williams <kwilliams(a)cpan.org>' + - 'Module-Build List <module-build(a)perl.org>' +description: 'Module::Build is a system for building, testing, and installing Perl modules. It is meant to be an alternative to ExtUtils::MakeMaker... blah blah blah' +dynamic_config: 1 +generated_by: 'Module::Build version 0.36' +license: perl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 +name: Module-Build +build_requires: + Build::Requires: 1.1 + Test::More: 0 +requires: + Data::Dumper: '>= 1' + File::Copy: '== 2.21' + File::Find: '>1, != 1.19' + File::Path: 0 + File::Spec: '< 5' + IO::File: '> 1.12' + Module::Metadata: '>= v1.0.2, <= v1.0.10' +version: 0.36 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/t/data/version-ranges-2.json new/CPAN-Meta-2.120630/t/data/version-ranges-2.json --- old/CPAN-Meta-2.120530/t/data/version-ranges-2.json 1970-01-01 01:00:00.000000000 +0100 +++ new/CPAN-Meta-2.120630/t/data/version-ranges-2.json 2012-03-03 20:48:44.000000000 +0100 @@ -0,0 +1,45 @@ +{ + "generated_by" : "Module::Build version 0.36", + "meta-spec" : { + "version" : "2", + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec" + }, + "abstract" : "stuff", + "version" : "0.36", + "name" : "Module-Build", + "dynamic_config" : 1, + "author" : [ + "Ken Williams <kwilliams(a)cpan.org>", + "Module-Build List <module-build(a)perl.org>" + ], + "release_status" : "stable", + "license" : [ + "perl_5" + ], + "description" : "Module::Build is a system for building, testing, and installing Perl modules. It is meant to be an alternative to ExtUtils::MakeMaker... blah blah blah", + "prereqs" : { + "runtime" : { + "requires" : { + "File::Copy" : "== 2.21", + "IO::File" : "> 1.12", + "Data::Dumper" : ">= 1", + "File::Spec" : "< 5", + "File::Find" : ">1, != 1.19", + "File::Path" : "0", + "Module::Metadata" : ">= v1.0.2, <= v1.0.10" + } + }, + "build" : { + "requires" : { + "Build::Requires": "1.1", + "Test::More" : "0" + } + }, + "test" : { + "requires" : { + "Test::More" : "0.88", + "Test::Requires" : "1.2" + } + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/t/data-bad/version-ranges-2.json new/CPAN-Meta-2.120630/t/data-bad/version-ranges-2.json --- old/CPAN-Meta-2.120530/t/data-bad/version-ranges-2.json 1970-01-01 01:00:00.000000000 +0100 +++ new/CPAN-Meta-2.120630/t/data-bad/version-ranges-2.json 2012-03-03 20:48:44.000000000 +0100 @@ -0,0 +1,29 @@ +{ + "generated_by" : "Module::Build version 0.36", + "meta-spec" : { + "version" : "2", + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec" + }, + "abstract" : "stuff", + "version" : "0.36", + "name" : "Module-Build", + "dynamic_config" : 1, + "author" : [ + "Ken Williams <kwilliams(a)cpan.org>", + "Module-Build List <module-build(a)perl.org>" + ], + "release_status" : "stable", + "license" : [ + "perl_5" + ], + "description" : "Module::Build is a system for building, testing, and installing Perl modules. It is meant to be an alternative to ExtUtils::MakeMaker... blah blah blah", + "prereqs" : { + "runtime" : { + "requires" : { + "IO::File" : "1.23beta", + "Data::Dumper" : "<= v1.2.a.3", + "File::Spec" : "== mu" + } + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/t/from-hash.t new/CPAN-Meta-2.120630/t/from-hash.t --- old/CPAN-Meta-2.120530/t/from-hash.t 2012-02-22 22:15:40.000000000 +0100 +++ new/CPAN-Meta-2.120630/t/from-hash.t 2012-03-03 20:48:44.000000000 +0100 @@ -41,7 +41,7 @@ }; dies_ok { CPAN::Meta::Requirements->from_string_hash($string_hash) } - qr/illegal/, + qr/Can't convert/, "we die when we can't understand a version spec"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CPAN-Meta-2.120530/t/strings.t new/CPAN-Meta-2.120630/t/strings.t --- old/CPAN-Meta-2.120530/t/strings.t 1970-01-01 01:00:00.000000000 +0100 +++ new/CPAN-Meta-2.120630/t/strings.t 2012-03-03 20:48:44.000000000 +0100 @@ -0,0 +1,46 @@ +use strict; +use warnings; +use Test::More 0.88; + +use CPAN::Meta::Requirements; + +my $req = CPAN::Meta::Requirements->new; + +# Test == +$req->add_string_requirement('Foo::Bar', '== 1.3'); +ok($req->accepts_module('Foo::Bar' => '1.3'), 'exact version (==)'); +ok(!$req->accepts_module('Foo::Bar' => '1.2'), 'lower version (==)'); +ok(!$req->accepts_module('Foo::Bar' => '1.4'), 'higher version (==)'); + +# Test != +$req->add_string_requirement('Foo::Baz', '!= 1.3'); +ok(!$req->accepts_module('Foo::Baz' => '1.3'), 'exact version (!=)'); +ok($req->accepts_module('Foo::Baz' => '1.2'), 'lower version (!=)'); +ok($req->accepts_module('Foo::Baz' => '1.4'), 'higher version (!=)'); + +# Test >= +$req->add_string_requirement('Foo::Gorch', '>= 1.3'); +ok($req->accepts_module('Foo::Gorch' => '1.3'), 'exact version (>=)'); +ok(!$req->accepts_module('Foo::Gorch' => '1.2'), 'lower version (>=)'); +ok($req->accepts_module('Foo::Gorch' => '1.4'), 'higher version (>=)'); + +# Test <= +$req->add_string_requirement('Foo::Graz', '<= 1.3'); +ok($req->accepts_module('Foo::Graz' => '1.3'), 'exact version (<=)'); +ok($req->accepts_module('Foo::Graz' => '1.2'), 'lower version (<=)'); +ok(!$req->accepts_module('Foo::Graz' => '1.4'), 'higher version (<=)'); + +# Test "" +$req->add_string_requirement('Foo::Blurb', '>= 1.3'); +ok($req->accepts_module('Foo::Blurb' => '1.3'), 'exact version (>=)'); +ok(!$req->accepts_module('Foo::Blurb' => '1.2'), 'lower version (>=)'); +ok($req->accepts_module('Foo::Blurb' => '1.4'), 'higher version (>=)'); + +# Test multiple requirements +$req->add_string_requirement('A::Tribe::Called', '>= 1.3, <= 2.0, != 1.6'); +ok($req->accepts_module('A::Tribe::Called' => '1.5'), 'middle version (>=, <=, !)'); +ok(!$req->accepts_module('A::Tribe::Called' => '1.2'), 'lower version (>=, <=, !)'); +ok(!$req->accepts_module('A::Tribe::Called' => '2.1'), 'higher version (>=, <=, !)'); +ok(!$req->accepts_module('A::Tribe::Called' => '1.6'), 'excluded version (>=, <=, !)'); + +done_testing; \ No newline at end of file -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Contextual-Return for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package perl-Contextual-Return for openSUSE:Factory checked in at 2012-03-06 13:40:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Contextual-Return (Old) and /work/SRC/openSUSE:Factory/.perl-Contextual-Return.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Contextual-Return", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Contextual-Return/perl-Contextual-Return.changes 2012-02-28 14:14:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Contextual-Return.new/perl-Contextual-Return.changes 2012-03-06 13:40:35.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 6 07:24:52 UTC 2012 - coolo(a)suse.com + +- updated to 0.004002 + Fixed significant typo (Carp:carp -> Carp::carp) + (thanks everyone who reported it) + +------------------------------------------------------------------- Old: ---- Contextual-Return-0.004001.tar.gz New: ---- Contextual-Return-0.004002.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Contextual-Return.spec ++++++ --- /var/tmp/diff_new_pack.GI2BPY/_old 2012-03-06 13:40:36.000000000 +0100 +++ /var/tmp/diff_new_pack.GI2BPY/_new 2012-03-06 13:40:36.000000000 +0100 @@ -17,7 +17,7 @@ Name: perl-Contextual-Return -Version: 0.004001 +Version: 0.004002 Release: 0 %define cpan_name Contextual-Return Summary: Create context-senstive return values ++++++ Contextual-Return-0.004001.tar.gz -> Contextual-Return-0.004002.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Contextual-Return-0.004001/Changes new/Contextual-Return-0.004002/Changes --- old/Contextual-Return-0.004001/Changes 2012-02-16 09:01:05.000000000 +0100 +++ new/Contextual-Return-0.004002/Changes 2012-03-01 20:18:38.000000000 +0100 @@ -101,3 +101,9 @@ 0.004001 Thu Feb 16 19:01:05 2012 - Fixed annoying POD nit (thanks Salvatore) + + +0.004002 Fri Mar 2 06:18:38 2012 + + - Fixed significant typo (Carp:carp -> Carp::carp) + (thanks everyone who reported it) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Contextual-Return-0.004001/META.json new/Contextual-Return-0.004002/META.json --- old/Contextual-Return-0.004001/META.json 2012-02-16 09:01:07.000000000 +0100 +++ new/Contextual-Return-0.004002/META.json 2012-03-01 20:18:39.000000000 +0100 @@ -39,5 +39,5 @@ } }, "release_status" : "stable", - "version" : "0.004001" + "version" : "0.004002" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Contextual-Return-0.004001/META.yml new/Contextual-Return-0.004002/META.yml --- old/Contextual-Return-0.004001/META.yml 2012-02-16 09:01:07.000000000 +0100 +++ new/Contextual-Return-0.004002/META.yml 2012-03-01 20:18:39.000000000 +0100 @@ -21,4 +21,4 @@ Test::More: 0 Want: 0 version: 0 -version: 0.004001 +version: 0.004002 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Contextual-Return-0.004001/README new/Contextual-Return-0.004002/README --- old/Contextual-Return-0.004001/README 2012-02-16 09:01:05.000000000 +0100 +++ new/Contextual-Return-0.004002/README 2012-03-01 20:18:38.000000000 +0100 @@ -1,4 +1,4 @@ -Contextual::Return version 0.004001 +Contextual::Return version 0.004002 This module provides a collection of named blocks that allow a return statement to return different values depending on the context in which it's diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Contextual-Return-0.004001/lib/Contextual/Return.pm new/Contextual-Return-0.004002/lib/Contextual/Return.pm --- old/Contextual-Return-0.004001/lib/Contextual/Return.pm 2012-02-16 09:01:05.000000000 +0100 +++ new/Contextual-Return-0.004002/lib/Contextual/Return.pm 2012-03-01 20:18:38.000000000 +0100 @@ -35,7 +35,7 @@ } -our $VERSION = '0.004001'; +our $VERSION = '0.004002'; use warnings; use strict; @@ -162,7 +162,7 @@ elsif ($selector_type eq 'Regexp') { my @selected = grep {/$selector/} @ALL_EXPORTS; if (!@selected) { - Carp:carp("use Contextual::Return $selector didn't export anything"); + Carp::carp("use Contextual::Return $selector didn't export anything"); } return map { $_ => sprintf($renamer, $_) } @selected; } @@ -1626,7 +1626,7 @@ =head1 VERSION -This document describes Contextual::Return version 0.004001 +This document describes Contextual::Return version 0.004002 =head1 SYNOPSIS -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Bootloader for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2012-03-06 13:40:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old) and /work/SRC/openSUSE:Factory/.perl-Bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Bootloader", Maintainer is "snwint(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes 2012-02-23 15:33:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes 2012-03-06 13:40:26.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 5 15:38:44 CET 2012 - snwint(a)suse.de + +- integrate grub2 patch + +------------------------------------------------------------------- Old: ---- add-basic-grub2-module.patch perl-Bootloader-0.5.22.tar.bz2 New: ---- perl-Bootloader-0.6.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.k7UDGj/_old 2012-03-06 13:40:28.000000000 +0100 +++ /var/tmp/diff_new_pack.k7UDGj/_new 2012-03-06 13:40:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Bootloader # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: perl-Bootloader -Version: 0.5.22 +Version: 0.6.0 Release: 0 Requires: perl-base = %{perl_version} Requires: e2fsprogs @@ -28,7 +29,6 @@ Source1: update-bootloader Source2: bootloader_entry Source3: boot.readme -Patch: add-basic-grub2-module.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl Conflicts: multipath-tools < 0.4.8-40.25.1 @@ -37,9 +37,17 @@ %description Perl modules for configuring various boot loaders. + + +Authors: +-------- + Jiri Srain <jsrain(a)suse.cz> + Joachim Plack <jplack(a)suse.de> + Alexander Osthof <aosthof(a)suse.de> + Josef Reidinger <jreidinger(a)suse.cz> + %prep %setup -q -%patch -p1 rm -rf perl-Bootloader-testsuite mkdir -p lib mv src lib/Bootloader ++++++ perl-Bootloader-0.5.22.tar.bz2 -> perl-Bootloader-0.6.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.22/src/Core/GRUB2.pm new/perl-Bootloader-0.6.0/src/Core/GRUB2.pm --- old/perl-Bootloader-0.5.22/src/Core/GRUB2.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/perl-Bootloader-0.6.0/src/Core/GRUB2.pm 2012-03-05 15:23:55.000000000 +0100 @@ -0,0 +1,704 @@ +#! /usr/bin/perl -w +# +# Bootloader configuration base library +# + +=head1 NAME + +Bootlader::Core::GRUB2 - library for blank configuration + + +=head1 PREFACE + +This package is the GRUB2 library of the bootloader configuration + +=head1 SYNOPSIS + +use Bootloader::Core::GRUB2; + +C<< $obj_ref = Bootloader::Core::GRUB2->new (); >> + +C<< $unix_dev = Bootloader::Core::GRUB2->GrubDev2UnixDev ($grub_dev); >> + +C<< $files_ref = Bootloader::Core::GRUB2->ListFiles (); >> + +C<< $status = Bootloader::Core::GRUB2->ParseLines (\%files, $avoid_reading_device_map); >> + +C<< $files_ref = Bootloader::Core::GRUB2->CreateLines (); >> + +C<< $settings_ref = Bootloader::Core::GRUB2->GetSettings (); >> + +C<< $status = Bootloader::Core::GRUB2->SetSettings (\%settings); >> + +C<< $status = Bootloader::Core::GRUB2->InitializeBootloader (); >> + + +=head1 DESCRIPTION + +=over 2 + +=cut + + +package Bootloader::Core::GRUB2; + +use strict; + +use Bootloader::Core; +our @ISA = ('Bootloader::Core'); +use Bootloader::Path; + +use Data::Dumper; + +#module interface + +sub GetKernelDevice { + my $self = shift; + my $orig = shift; + my $device = $orig; + + unless (defined ($self->{"udevmap"})) + { + $self->l_warning("GRUB2::GetKernelDevice: Udev mapping is not set"); + return $orig; + } + $device = $self->{"udevmap"}->{$device} + if defined ($self->{"udevmap"}->{$device}); + + $self->l_milestone("GRUB2::GetKernelDevice: From $orig to $device"); + + return $device; +} + +=item +C<< $unix_dev = Bootloader::Core::GRUB2->GrubDev2UnixDev ($grub_dev); >> + +Translates the GRUB2 device (eg. '(hd0,1)') to UNIX device (eg. '/dev/hda1'). +As argument takes the GRUB2 device, returns the UNIX device (both strings) +or argument if translate fail. + +=cut + +# string GrubDev2UnixDev (string grub_dev) +sub GrubDev2UnixDev { + my $self = shift; + my $dev = shift; + + unless ($dev) { + $self->l_error ("GRUB2::GrubDev2UnixDev: Empty device to translate"); + return $dev; + } + if ($dev !~ /^$.*$$/) { + $self->l_warning ("GRUB2::GrubDev2UnixDev: Not translating device $dev"); + return $dev; + } + + my $original = $dev; + my $partition = undef; + + # Check if $dev consists of something like (hd0,1), thus a grub device + # TODO: warns once detect (hd0,0) as GRUB2 partition is one based + if ($dev =~ /$([^,]+),([^,]+)$/) { + $dev = $1; + # GRUB2 device partition is now one based (eg, (hd0,1) = /dev/sda1) + $partition = $2; + } + elsif ($dev =~ /$([^,]+)$/) { + $dev = $1; + } + + my $match_found = 0; + $self->l_milestone ("GRUB2::GrubDev2UnixDev: device_map: ".$self->{"device_map"}); + while ((my $unix, my $fw) = each (%{$self->{"device_map"}})) { + $self->l_milestone ("GRUB2::GrubDev2UnixDev: device_map: $unix <-> $fw."); + } + while ((my $unix, my $fw) = each (%{$self->{"device_map"}})) { + if ($dev eq $fw) { + $dev = $unix; + $match_found = 1; + } + } + + if ($match_found == 0) { + $self->l_error ("GRUB2::GrubDev2UnixDev: did not find a match for $dev in the device map"); + return $original; + } + + # resolve symlinks..... + $dev = $self->GetKernelDevice($dev); + $self->l_milestone ("GRUB2::GrubDev2UnixDev: Kernel device is $dev"); + + if (defined ($partition)) { + my $finded = undef; + foreach my $dev_ref (@{$self->{"partitions"}}) { + if ( $dev_ref->[1] eq $dev + && $dev_ref->[2] == $partition) { + $dev = $dev_ref->[0]; + $self->l_milestone ("GRUB2::GrubDev2UnixDev: Translated $original to $dev"); + $finded = 1;; + } + } + if (defined $finded){ + return $dev; + } + #no partition found so return $dev with partition + $self->l_warning ("GRUB2::GrubDev2UnixDev: No partition found for $dev with $partition."); + return $dev.$partition; + } + + $dev = $self->Member2MD ($dev); + $self->l_milestone ("GRUB2::GrubDev2UnixDev: Translated GRUB2->UNIX: $original to $dev"); + return $dev; +} + +=item +C<< $grub_dev = Bootloader::Core::GRUB2->UnixDev2GrubDev ($unix_dev); >> + +Translates the UNIX device (eg. '/dev/hda1') to GRUB2 device (eg. '(hd0,1)'). +As argument takes the UNIX device, returns the GRUB2 device (both strings). + +=cut + +# Pattern for grub device specification. Please note that this does not work +# with BSD labeled disks which use things like "hd0,b" +# The pattern matches disk or floppy or network or cd +my $grubdev_pattern = "(?:hd\\d+(?:,\\d+)?|fd\\d+|nd|cd)"; + + +# string UnixDev2GrubDev (string unix_dev) +sub UnixDev2GrubDev { + my $self = shift; + my $dev = shift; + my $g_dev; + local $_; + + if ($dev eq "") { + $self->l_error ("GRUB2::UnixDev2GrubDev: Empty device to translate"); + return ""; # return an error + } + + # TODO: check whether listed grubdev valid for grub2 ? + # Seems to be a grub device already + if ($dev =~ /^$${grubdev_pattern}$$/) { + $self->l_warning ("GRUB2::UnixDev2GrubDev: Not translating device $dev"); + return $dev; + } + + $self->l_milestone ("GRUB2::UnixDev2GrubDev: Translating $dev ..."); + + # remove parenthesis to be able to handle entries like "(/dev/sda1)" which + # might be there by error + $dev =~ s/^$(.*)$$/$1/; + + # This gives me the devicename, whether $dev is the device or a link! + # This works for udev (kernel) devices only, devicemapper doesn't + # need to be changed here + + my $original = $dev; + my $kernel_dev = $self->GetKernelDevice($dev); + + $self->l_milestone ("GRUB2::UnixDev2GrubDev: kernel device: $kernel_dev"); + + my $partition = undef; + + if ($kernel_dev =~ m#/dev/md\d+#) { + my @members = @{$self->MD2Members ($kernel_dev) || []}; + # FIXME! This only works for mirroring (Raid1) + $kernel_dev = $self->GetKernelDevice($members[0] || $kernel_dev ); + $self->l_milestone ("GRUB2::UnixDev2GrubDev: First device of MDRaid: $original -> $kernel_dev"); + } + + # print all entries of device.map - for debugging + if ($self->{device_map}) { + $self->l_milestone ("GRUB2::UnixDev2UnixDev: device_map:"); + + for (sort keys %{$self->{device_map}}) { + $self->l_milestone ("unix device: $_ <==> grub device: $self->{device_map}{$_}"); + } + } + else { + $self->l_warning ("GRUB2::UnixDev2GrubDev: empty device_map"); + } + + # fetch the underlying device (sda1 --> sda) + for (@{$self->{partitions}}) { + if ($_->[0] eq $kernel_dev) { + $kernel_dev = $_->[1]; + # grub2 device is one based + $partition = $_->[2]; + $self->l_milestone ("GRUB2::UnixDev2GrubDev: dev base part: $_->[0] $_->[1] $_->[2]"); + last; + } + } + + for (sort keys %{$self->{device_map}}) { + if ($kernel_dev eq $self->GetKernelDevice($_)) { + $g_dev = $self->{device_map}{$_}; + last; + } + } + + # TODO: Is the fallback work for grub2 ??? + # fallback if translation has failed - this is good enough for many cases + # FIXME: this is nonsense - we should return an error + if (!$g_dev) { + $self->l_warning("GRUB2::UnixDev2GrubDev: Unknown device/partition, using fallback"); + + $g_dev = "hd0"; + $partition = undef; + + if ( + $original =~ m#^/dev/(?:vx|das|[ehpsvx])d[a-z]{1,2}(\d+)$# || + $original =~ m#^/dev/\S+\-part(\d+)$# || + $original =~ m#^/dev(?:/[^/]+){1,2}p(\d+)$# + ) { + $partition = $1 - 1; + $partition = 0 if $partition < 0; + } + } + + if (defined $partition) { + $g_dev = "($g_dev,$partition)"; + $self->l_milestone ("GRUB2::UnixDev2GrubDev: Translated UNIX partition -> GRUB2 device: $original to $g_dev"); + } + else { + $g_dev = "($g_dev)"; + $self->l_milestone ("GRUB2::UnixDev2GrubDev: Translated UNIX device -> GRUB2 device: $original to $g_dev"); + } + + return $g_dev; +} + +=item +C<< $obj_ref = Bootloader::Core::GRUB2->new (); >> + +Creates an instance of the Bootloader::Core::GRUB2 class. + +=cut + +sub new { + my $self = shift; + my $old = shift; + + my $loader = $self->SUPER::new ($old); + bless ($loader); + + $loader->l_milestone ("GRUB2::new: Created GRUB2 instance"); + return $loader; +} + +sub IsDisc { + my $self = shift; + my $disc = shift; + my $ret = undef; + foreach my $dev (keys %{$self->{"device_map"}}) { + if ( $self->GetKernelDevice($disc) eq $self->GetKernelDevice($dev) ){ + $ret = 1; + } + } + return $ret; +} + +=item +C<< $files_ref = Bootloader::Core::GRUB2->ListFiles (); >> + +Returns the list of the configuration files of the bootloader +Returns undef on fail + +=cut + +# list<string> ListFiles () +sub ListFiles { + my $self = shift; + + return [ Bootloader::Path::Grub2_devicemap(), + Bootloader::Path::Grub2_installdevice() ]; +} + +=item +C<< $status = Bootloader::Core::GRUB2->ParseLines (\%files, $avoid_reading_device_map); >> + +Parses the contents of all files and stores the settings in the +internal structures. As first argument, it takes a hash reference, where +keys are file names and values are references to lists, each +member is one line of the file. As second argument, it takes a +boolean flag that, if set to a true value, causes it to skip +updating the internal device_map information. Returns undef on +fail, defined nonzero value on success. + +=cut + +# void ParseLines (map<string,list<string>>, boolean) +sub ParseLines { + my $self = shift; + my %files = %{+shift}; + my $avoid_reading_device_map = shift; + + #first set the device map - other parsing uses it + my @device_map = @{$files{Bootloader::Path::Grub2_devicemap()} || []}; + $self->l_milestone ("GRUB2::Parselines: input from device.map :\n'" . + join("'\n' ", @device_map) . "'"); + my %devmap = (); + foreach my $dm_entry (@device_map) + { + if ($dm_entry =~ /^\s*$([^\s#]+)$\s+(\S+)\s*$/) + { + #multipath handling, multipath need real device, because multipath + # device have broken geometry (bnc #448110) + if (defined $self->{"multipath"} && defined $self->{"multipath"}->{$self->GetKernelDevice($2)}){ + $devmap{ $self->{"multipath"}->{$self->GetKernelDevice($2)} } = $1; + } else { + $devmap{$2} = $1; + } + } + }; + $self->l_milestone ("GRUB2::Parselines: avoided_reading device map.") if ($avoid_reading_device_map ); + $self->{"device_map"} = \%devmap if (! $avoid_reading_device_map); + $self->l_milestone ("GRUB2::Parselines: device_map: ".$self->{"device_map"}); + while ((my $unix, my $fw) = each (%{$self->{"device_map"}})) { + $self->l_milestone ("GRUB2::Parselines: device_map: $unix <-> $fw."); + } + + my %glob; + my $glob_ref = \%glob; + + if (not exists $self->{"mountpoints"}{'/'}) + { + $self->l_milestone ("GRUB2::Parselines: Mount points doesn't have '/', skipped parsing grub2 config"); + } else { + # FIXME: Need to figure our a better way to get the + # device, otherwise user may break setup if they + # call install script directly + my @devices = @{$files{Bootloader::Path::Grub2_installdevice()} || []}; + + # FIXME: still incomplete for MD and dmraid devs + # translate device array to the various boot_* flags else set boot_custom + # in glob_ref accordingly + my ($boot_dev,) = $self->SplitDevPath ("/boot"); + my ($root_dev,) = $self->SplitDevPath ("/"); + my $extended_dev = $self->GetExtendedPartition($boot_dev) || ""; + # mbr_dev is the first bios device + my $mbr_dev = $self->GrubDev2UnixDev("(hd0)"); + + foreach my $dev (@devices) { + $self->l_milestone ("GRUB2::Parselines: checking boot device $dev"); + + #Quick fix for activate and generic_mbr regression .. + # TODO: Need figure out better handling of them + if ($dev eq "activate") { + $glob_ref->{"activate"} = "true"; + next; + } + + if ($dev eq "generic_mbr") { + $glob_ref->{"generic_mbr"} = "true"; + next; + } + + if ($dev eq $mbr_dev) { + $glob_ref->{"boot_mbr"} = "true"; + $self->l_milestone ("GRUB2::Parselines: detected boot_mbr"); + if (defined $self->{"md_arrays"} + and ((scalar keys %{$self->{"md_arrays"}}) > 0)){ + if (defined $glob_ref->{"boot_md_mbr"} + and $glob_ref->{"boot_md_mbr"} ne "" ){ + $glob_ref->{"boot_md_mbr"} = $glob_ref->{"boot_md_mbr"}.",".$dev; + } else { + $glob_ref->{"boot_md_mbr"} =$dev; + } + $self->l_milestone ("GRUB2::Parselines: detected boot_md_mbr ".$glob_ref->{"boot_md_mbr"}); + } + } + elsif ($dev eq $root_dev) { + $glob_ref->{"boot_root"} = "true"; + $self->l_milestone ("GRUB2::Parselines: detected boot_root"); + } + elsif ($dev eq $boot_dev) { + $glob_ref->{"boot_boot"} = "true"; + $self->l_milestone ("GRUB2::Parselines: detected boot_boot"); + } + elsif ($dev eq $extended_dev) { + $glob_ref->{"boot_extended"} = "true"; + $self->l_milestone ("GRUB2::Parselines: detected boot_extended"); + } + elsif ($self->IsDisc($dev) + and defined $self->{"md_arrays"} + and ((scalar keys %{$self->{"md_arrays"}}) > 0)){ + if (defined $glob_ref->{"boot_md_mbr"} and $glob_ref->{"boot_md_mbr"} ne "" ){ + $glob_ref->{"boot_md_mbr"} = $glob_ref->{"boot_md_mbr"}.",".$dev; + } else { + $glob_ref->{"boot_md_mbr"} =$dev; + } + $self->l_milestone ("GRUB2::Parselines: detected boot_md_mbr ".$glob_ref->{"boot_md_mbr"}); + } + else { + $glob_ref->{"boot_custom"} = $dev; + $self->l_milestone ("GRUB2::Parselines: set boot_custom"); + } + } + } + + $self->{"global"} = $glob_ref; + return 1; +} + +sub CreateGrubInstalldevLines() { + my $self = shift; + + # process /etc/grub.conf + my %glob = %{$self->{"global"}}; + my @grub2_installdev = (); + my %s1_devices = (); + # md_discs stores grub discs which should be synchronized (needed for correct stage2 location) + my $md_discs = {}; + + { + my $dev; + my $flag; + + # boot_custom => "selectdevice:Custom Boot Partition::" + $dev = delete($glob{"boot_custom"}); + $s1_devices{$dev} = 1 if (defined $dev and $dev ne ""); + + # boot_mbr => "bool:Boot from Master Boot Record:false", + $flag = delete $glob{"boot_mbr"}; + if (defined $flag and $flag eq "true") { + # if /boot mountpoint exists add($disk(/boot) else add disk(/) + # mbr_dev is the first bios device + $dev = $self->GrubDev2UnixDev("(hd0)"); + $s1_devices{$dev} = 1 if defined $dev; + } + + # boot_md_mbr synchronize mbr of disc in md raid + #(it is little tricky as md raid synchronize only partitions) + $flag = delete $glob{"boot_md_mbr"}; + if (defined $flag and $flag ne "") { + my @discs = split(/,/,$flag); + chomp @discs; + foreach my $mbr_disc (@discs){ + $s1_devices{$mbr_disc} = 1; + my $gdev = $self->UnixDev2GrubDev($mbr_disc); + $md_discs->{$gdev} = substr($gdev,1,-1); + $self->l_milestone ("GRUB2::CreateGrubInstalldevLines: md_mbr device: $gdev "); + } + } + + # boot_root => "bool:Boot from Root Partition:true", + $flag = delete $glob{"boot_root"}; + if (defined $flag and $flag eq "true") { + # add partition(/) + ($dev,) = $self->SplitDevPath ("/"); + $s1_devices{$dev} = 1 if defined $dev; + } + + # boot_boot => "bool:Boot from Boot Partition:true", + $flag = delete $glob{"boot_boot"}; + if (defined $flag and $flag eq "true") { + # add partition(/boot) + ($dev,) = $self->SplitDevPath ("/boot"); + $s1_devices{$dev} = 1 if defined $dev; + } + + # boot_extended => "bool:Boot from Extended Partition:true", + $flag = delete $glob{"boot_extended"}; + if (defined $flag and $flag eq "true") { + # add partition(extended) + $dev = $self->GetExtendedPartition($self->SplitDevPath("/boot")); + $s1_devices{$dev} = 1 if defined $dev; + } + + # convert any raid1 device entry into multiple member entries + foreach my $s1dev (keys %s1_devices) + { + if ($s1dev =~ m:/dev/md\d+:) { + delete $s1_devices{$s1dev}; + # Please note all non-mirror raids are silently deleted here + my @members = @{$self->MD2Members($s1dev) || []}; + map { $s1_devices{$_} = 1; } @members; + } + } + + # FIXME: convert all impossible configurations to some viable + # fallback: + # boot from primary xfs -> mbr + # boot from extended -> set generic_mbr + # other options ??? + } + + $self->l_milestone ("GRUB2::CreateGrubInstalldevLines: found s1_devices: " + . join(",",keys %s1_devices)); + + if (scalar (keys (%s1_devices)) > 0) + { + foreach my $new_dev (keys (%s1_devices)) + { + push @grub2_installdev, $new_dev; + } + } + + my $activate = delete $glob{"activate"}; + if (defined $activate and $activate eq "true") { + push @grub2_installdev, "activate"; + } + + my $generic_mbr = delete $glob{"generic_mbr"}; + if (defined $generic_mbr and $generic_mbr eq "true") { + push @grub2_installdev, "generic_mbr"; + } + + return \@grub2_installdev; +} + +=item +C<< $files_ref = Bootloader::Core::GRUB2->CreateLines (); >> + +creates contents of all files from the internal structures. +Returns a hash reference in the same format as argument of +ParseLines on success, or undef on fail. + +=cut + +# map<string,list<string>> CreateLines () +sub CreateLines { + my $self = shift; + + # first create /etc/default/grub_installdevice + my $grub2_installdev = $self->CreateGrubInstalldevLines(); + + # TODO: as we know the grub2-install also create device map + # I skipped creating them by yast .. + + # now process the device map + ## my %glob = %{$self->{"global"}}; + ## my @device_map = (); + ## while ((my $unix, my $fw) = each (%{$self->{"device_map"}})) + ## { + ## my $line = "($fw)\t$unix"; + ## push @device_map, $line; + ## } + return { + Bootloader::Path::Grub2_installdevice() => $grub2_installdev, + ## Bootloader::Path::Grub2_devicemap() => \@device_map, + } +} + +=item +C<< $settings_ref = Bootloader::Core::GRUB2->GetSettings (); >> + +returns the complete settings in a hash. Does not read the settings +from the system, but returns internal structures. + +=cut + +# map<string,any> GetSettings () +sub GetSettings { + my $self = shift; + my $ret = $self->SUPER::GetSettings (); + return $ret; +} + +=item +C<< $status = Bootloader::Core::GRUB2->SetSettings (\%settings); >> + +Stores the settings in the given parameter to the internal +structures. Does not touch the system. +Returns undef on fail, defined nonzero value on success. + +=cut + +# void SetSettings (map<string,any> settings) +sub SetSettings { + my $self = shift; + my %settings = %{+shift}; + return $self->SUPER::SetSettings (\%settings); +} + +=item +C<< $status = Bootloader::Core::GRUB2->UpdateBootloader (); >> + +Updates the settings in the system. Backs original configuration files +up and replaces them with the ones with the '.new' suffix. Also performs +operations needed to make the change effect (run '/sbin/elilo'). +Returns undef on fail, defined nonzero value on success. + +=cut + +# boolean UpdateBootloader () +sub UpdateBootloader { + my $self = shift; + my $avoid_init = shift; + + # backup the config file + # it really did nothing for now + my $ret = $self->SUPER::UpdateBootloader (); + return undef unless defined $ret; + + if (! $avoid_init) + { + return $self->InitializeBootloader (); + } + + return 0 == $self->RunCommand ( + "/usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg", + "/var/log/YaST2/y2log_bootloader" + ); +} + +=item +C<< $status = Bootloader::Core::GRUB2->InitializeBootloader (); >> + +Initializes the firmware to boot the bootloader. +Returns undef on fail, defined nonzero value otherwise + +=cut + +# boolean InitializeBootloader () +sub InitializeBootloader { + my $self = shift; + my $file = Bootloader::Path::Grub2_installdevice(); + my $files_ref = $self->ReadFiles ([$file,]); + + if (! defined ($files_ref)) + { + return undef; + } + + my @devices = @{$files_ref->{$file} || []}; + + # Hmm .. grub2-install must has been run before + # any grub2-mkconfig ... + # TODO: foreach .. looks awkward .. need clearify + foreach my $dev (@devices) { + + if ($dev eq "activate" or $dev eq "generic_mbr") { + next; + } + + my $ret = $self->RunCommand ( + # TODO: Use --force is for installing on BS + # the tradeoff is we can't capture errors + # only patch grub2 package is possible way + # to get around this problem + "/usr/sbin/grub2-install --force $dev", + "/var/log/YaST2/y2log_bootloader" + ); + + return 0 if (0 != $ret); + } + + return 0 == $self->RunCommand ( + "/usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg", + "/var/log/YaST2/y2log_bootloader" + ); +} + +1; + +# +# Local variables: +# mode: perl +# mode: font-lock +# mode: auto-fill +# fill-column: 78 +# End: +# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.22/src/Library.pm new/perl-Bootloader-0.6.0/src/Library.pm --- old/perl-Bootloader-0.5.22/src/Library.pm 2011-10-14 09:32:09.000000000 +0200 +++ new/perl-Bootloader-0.6.0/src/Library.pm 2012-03-05 15:23:55.000000000 +0100 @@ -132,6 +132,11 @@ require Bootloader::Core::GRUB; $loader = Bootloader::Core::GRUB->new ($loader); } + elsif ($bootloader eq "grub2") + { + require Bootloader::Core::GRUB2; + $loader = Bootloader::Core::GRUB2->new ($loader); + } elsif ($bootloader eq "lilo") { require Bootloader::Core::LILO; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.22/src/Path.pm new/perl-Bootloader-0.6.0/src/Path.pm --- old/perl-Bootloader-0.5.22/src/Path.pm 2011-10-14 09:32:09.000000000 +0200 +++ new/perl-Bootloader-0.6.0/src/Path.pm 2012-03-05 15:23:55.000000000 +0100 @@ -49,6 +49,10 @@ C<< $path = Bootloader::Path::Zipl_zipl(); >> +C<< $path = Bootloader::Path::Grub2_devicemap(); >> + +C<< $path = Bootloader::Path::Grub2_installdevice(); >> + =head1 DESCRIPTION =over 2 @@ -242,4 +246,28 @@ return Prefix($value); } +=item +C<< $path = Bootloader::Path::Grub2_devicemap(); >> + +Gets path for grub2 configuration file device.map. + +=cut + +sub Grub2_devicemap { + my $value = "/boot/grub2/device.map"; + return Prefix($value); +} + +=item +C<< $path = Bootloader::Path::Grub2_installdevice(); >> + +Gets path for grub2 configuration file grub_installdevice. + +=cut + +sub Grub2_installdevice { + my $value = "/etc/default/grub_installdevice"; + return Prefix($value); +} + 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.22/update-bootloader new/perl-Bootloader-0.6.0/update-bootloader --- old/perl-Bootloader-0.5.22/update-bootloader 2011-10-14 09:32:09.000000000 +0200 +++ new/perl-Bootloader-0.6.0/update-bootloader 2012-03-05 15:23:55.000000000 +0100 @@ -122,7 +122,7 @@ if ( -f '/usr/bin/zypper' ){ my $zypper_out = qx{zypper --terse tos -l}; if ($zypper_out =~ m/^labelLong\s*(\S.*\S)\s*\nlabelShort\s*(\S.*\S)[\s\n]*$/){ - return $1 if ($1 ne "" && $loader eq "grub"); + return $1 if ($1 ne "" && ($loader eq "grub" || $loader eq "grub2")); return $2 if ($2 ne ""); } } @@ -131,7 +131,7 @@ # Second try: Is there a usable /etc/SuSE-release? # This should really not be used anymore, as the syntax changed # no 'SP1' in the output. - if (open(RELEASE, "</etc/SuSE-release") && $loader eq "grub") { + if (open(RELEASE, "</etc/SuSE-release") && ($loader eq "grub" || $loader eq "grub2")) { # first line is sufficient $namever = <RELEASE>; @@ -212,26 +212,6 @@ exit 0; } -if (Bootloader::Tools::GetBootloader() eq "grub2") -{ - open (LOG, ">>$logname"); - print LOG ("grub2 bootloader, let grub2-mkconfig handle everything\n"); - close LOG; - - if (! -d '/boot/grub2' ) { - open (LOG, ">>$logname"); - print LOG ("grub2: Run grub2-install first!\n"); - close LOG; - - exit 1; - } - - system ("cp /boot/grub2/grub.cfg /boot/grub2/grub.cfg.old"); - system ("/usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg >>$logname 2>&1"); - - exit 0; -} - if ($opt_image and $opt_image !~ m;^/;) { $opt_image = getcwd . '/' . $opt_image } @@ -273,7 +253,7 @@ unless ($opt_name) { if ($opt_xen and $opt_previous) { - if ($loader eq "grub" || $loader eq "lilo") { + if ($loader eq "grub" || $loader eq "lilo" || $loader eq "grub2") { $opt_name = "Previous Xen"; $add_product = 1; } @@ -282,7 +262,7 @@ } } elsif ($opt_xen) { - if ($loader eq "grub" || $loader eq "lilo") { + if ($loader eq "grub" || $loader eq "lilo" || $loader eq "grub2") { $opt_name = "Xen"; $add_product = 1; } @@ -291,7 +271,7 @@ } } elsif ($opt_previous) { - if ($loader eq "grub" || $loader eq "lilo") { + if ($loader eq "grub" || $loader eq "lilo" || $loader eq "grub2") { $opt_name = "Previous Kernel"; $add_product = 1; } @@ -335,7 +315,7 @@ ($opt_name =~ /-bigsmp/) || ($opt_name =~ /-pae/)) { - if ($loader eq "grub") { + if ($loader eq "grub" || $loader eq "grub2") { $opt_name =~ s/-[^-]*$//; $opt_failsafe = "Failsafe -- " . GetProduct() . " - " . $opt_name; $opt_name = GetProduct() . " - " . $opt_name; @@ -347,7 +327,7 @@ } # Naming scheme for all xen kernels, thus xen and xenpae elsif ($opt_xen) { - if ($loader eq "grub") { + if ($loader eq "grub" || $loader eq "grub2") { my $version = $opt_name; $version =~ s/-xen.*$//; @@ -368,7 +348,7 @@ $flavor = ucfirst ($flavor); # Create long labels for grub - if ($loader eq "grub") { + if ($loader eq "grub" || $loader eq "grub2") { my $version = $opt_name; $version =~ s/-[^-]*$//; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.22/version new/perl-Bootloader-0.6.0/version --- old/perl-Bootloader-0.5.22/version 2011-10-14 09:32:09.000000000 +0200 +++ new/perl-Bootloader-0.6.0/version 2012-03-05 15:23:55.000000000 +0100 @@ -1 +1 @@ -0.5.22 +0.6.0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pcc for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package pcc for openSUSE:Factory checked in at 2012-03-06 13:40:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcc (Old) and /work/SRC/openSUSE:Factory/.pcc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pcc", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/pcc/pcc.changes 2012-02-02 17:58:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pcc.new/pcc.changes 2012-03-06 13:40:19.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Feb 26 15:59:53 CET 2012 - dmueller(a)suse.de + +- disable build on platforms not supported + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcc.spec ++++++ --- /var/tmp/diff_new_pack.zfqNLC/_old 2012-03-06 13:40:20.000000000 +0100 +++ /var/tmp/diff_new_pack.zfqNLC/_new 2012-03-06 13:40:20.000000000 +0100 @@ -16,6 +16,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: pcc Version: 1.0.0 Release: 0 @@ -37,8 +38,8 @@ BuildRequires: fdupes BuildRequires: flex # PPC support is broken: http://thread.gmane.org/gmane.comp.compilers.pcc/2391 -ExcludeArch: ppc ppc64 - +# ARM support is broken: armv7l is not (yet) supported by pcc-libs +ExclusiveArch: %ix86 x86_64 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mrtg for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package mrtg for openSUSE:Factory checked in at 2012-03-06 13:40:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mrtg (Old) and /work/SRC/openSUSE:Factory/.mrtg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mrtg", Maintainer is "DLovasko(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mrtg/mrtg.changes 2011-12-08 11:53:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mrtg.new/mrtg.changes 2012-03-06 13:40:06.000000000 +0100 @@ -1,0 +2,37 @@ +Sun Mar 4 11:07:10 UTC 2012 - lars(a)linux-schulserver.de + +- update to 2.17.4: + * some address fixes to contrib + * fixed duplicate install-sh entry in archive + * set oid-mib-cache file for New_SNMP_util as well #106 + * prevent spurious warnings about unknonwn values of inlast outlast in mrtg + * add the process id tmp file extensions, to guard against multiple rateup + instances messing things up for each other. (attempt to fix #115) + * quell warning in CnTWaLK mode #111 + * spelling fixes + * make threshold checking more robust against incomplete information in the + config file #113 + * support ifAlias for Vyatta gear + * CnTWaLK should add the count and not max index + * abort indexmaker if there is no data to be found + * fix for big5 translation + * in cfgmaker use ifdesc=alias only if there is actualy alias info + * fix of a file pointer leak found by coverity scan + * fix for kMG support in rateup + * add support for zyxel ifAlias + * add support for Matrix N7 Diamond + * enable warnings in cfgmaker and fix issues ... + * explicitly import SOCK_DGRAM and AF_UNSPEC to make ipv6 support work + * Updated Net_SNMP_util.pm and SNMP_util.pm to latest versions +- added mrtg-switches.patch to add support for Nortel switches with + MIB 1.3.6.1.4.1.2272.30 and also new Cisco SG-300 switches +- split out doc subpackage +- ran spec-cleaner +- remove unknown --with-rrd configure option +- use macros +- remove outdated call to suse_update_config +- added manpages for mrtg-traffic-sum and rateup +- fixed wrong interpreter lines in example scripts +- install arch dependend files in _libdir + +------------------------------------------------------------------- Old: ---- mrtg-2.17.2-icons.diff mrtg-2.17.2-pod.diff mrtg-2.17.2.tar.bz2 New: ---- mrtg-2.17.4.tar.bz2 mrtg-icons_path.patch mrtg-pod.patch mrtg-switches.patch mrtg-traffic-sum.1 rateup.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mrtg.spec ++++++ --- /var/tmp/diff_new_pack.irCJ7K/_old 2012-03-06 13:40:08.000000000 +0100 +++ /var/tmp/diff_new_pack.irCJ7K/_new 2012-03-06 13:40:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mrtg # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,83 +15,134 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: mrtg +Version: 2.17.4 +Release: 0 +Summary: The Multirouter Traffic Grapher +License: GPL-2.0+ +Group: Productivity/Networking/Diagnostic +Url: http://www.mrtg.org +Source0: %{name}-%{version}.tar.bz2 +Source1: rateup.1 +Source2: mrtg-traffic-sum.1 +# PATCH-FIX-OPENSUSE -- install icons in openSUSE specific directory +Patch0: mrtg-icons_path.patch +# PATCH-FIX-OPENSUSE -- do not install pod files into subdirectory +Patch1: mrtg-pod.patch +# PATCH-FIX-UPSTREAM -- add additional switches to cfgmaker +Patch2: mrtg-switches.patch BuildRequires: automake BuildRequires: dos2unix +%if 0%{?suse_version} > 1020 +BuildRequires: fdupes +%endif BuildRequires: gd-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel -Version: 2.17.2 -Release: 0 Requires: perl = %{perl_version} -Group: Productivity/Networking/Diagnostic -License: GPL-2.0+ -Url: http://www.mrtg.org -Summary: The Multirouter Traffic Grapher -Source: %{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-icons.diff -Patch1: %{name}-%{version}-pod.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +%define iconsdir /srv/www/icons %description -A tool to visualize network traffic via a Web page. +The Multi Router Traffic Grapher is a tool primarily used to monitor the +traffic load on network links (typically by using SNMP). MRTG generates HTML +pages containing PNG images which provide a LIVE visual representation of this +traffic. MRTG typically produces daily, weekly, monthly, and yearly graphs. + +In addition to monitoring via SNMP, MRTG can also generate graphs based on +the output of any application, allowing one to generate graphs of anything +that needs monitoring (for example, CPU and memory usage, email volumes, web +hits, etc). For faster data collection, MRTG can also interface to RRDtool. +The mrtg-doc package contains additional documentation, contributed scripts +and configuration files that used to form part of the mrtg package. -Authors: --------- - Tobias Oetiker <oetiker(a)ee.ethz.ch> - Dave Rand <dlr(a)bungi.com> + +%package doc +Summary: Documentation and contrib files for mrtg +Group: Productivity/Networking/Diagnostic +Requires: %{name} == %{version} + +%description doc +A collection of sample scripts and configuration files for the Multi Router +Traffic Grapher (MRTG). This package contains additional documentation and +contributed files that ship with MRTG. %prep %setup -q -%patch0 -%patch1 +%patch0 -p0 +%patch1 -p0 +%patch2 -p0 rm -rf contrib/mrtgindex.cgi grep -rl "/usr/local/bin/perl" contrib | xargs sed -i -e "s@/usr/local/bin/perl@/usr/bin/perl@" +grep -rl "/usr/tardis/local/gnu/bin/perl5" contrib | xargs sed -i -e "s@/usr/tardis/local/gnu/bin/perl5@/usr/bin/perl@" +grep -rl "/usr/bin/perl5" contrib | xargs sed -i -e "s@/usr/bin/perl5@/usr/bin/perl@" +grep -rl "/usr/sepp/bin/perl" contrib | xargs sed -i -e "s@/usr/sepp/bin/perl@/usr/bin/perl@" +grep -rl "/store/bin/perl" contrib | xargs sed -i -e "s@/store/bin/perl@/usr/bin/perl@" #contrib contains binaries (ie. zipfile) which we cannot convert, #hopefully file utility seems to mark all the text files clearly find contrib -type f | xargs file | grep -i text | cut -d: -f1 | xargs dos2unix +find contrib -type f -name "*.html" | xargs chmod 644 +# disable the line below to get executable examples in the %%doc directory find contrib -type f | xargs chmod 644 %build -%define iconsdir /srv/www/icons -%{suse_update_config} aclocal autoconf -CFLAGS="$RPM_OPT_FLAGS -Wall -pipe" \ -CXXFLAGS="$RPM_OPT_FLAGS -Wall -fmessage-length=0" \ - ./configure \ - --prefix=%{_prefix} \ - --sysconfdir=%{_sysconfdir} \ - --infodir=%{_infodir} \ - --datadir=%{_datadir} \ - --mandir=%{_mandir} \ - --with-rrd \ - --with-gd-inc=/usr/include/gd -make +%configure \ + --with-gd-inc=%{_includedir}/gd +make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT%{iconsdir} -install -m 644 doc/mrtg-[lmr].png $RPM_BUILD_ROOT%{iconsdir} -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/apache2/icons -install -m 644 doc/mrtg-[lmr].png $RPM_BUILD_ROOT%{_datadir}/apache2/icons -rm -rf $RPM_BUILD_ROOT/usr/share/doc -rm -rf $RPM_BUILD_ROOT/usr/share/mrtg2 +%makeinstall +mkdir -p %{buildroot}%{iconsdir} +install -m 644 doc/mrtg-[lmr].png %{buildroot}%{iconsdir} +install -d -m 755 %{buildroot}%{_datadir}/apache2/icons +install -m 644 doc/mrtg-[lmr].png %{buildroot}%{_datadir}/apache2/icons +rm -rf %{buildroot}%{_datadir}/doc +rm -rf %{buildroot}%{_datadir}/mrtg2 +install -Dm0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/rateup.1 +install -m0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/mrtg-traffic-sum.1 +# install and fix documentation +mkdir -p %{buildroot}%{_defaultdocdir}/%{name}/examples +cp -r contrib/* %{buildroot}%{_defaultdocdir}/%{name}/examples/ +cp -r doc/*.{pod,txt,png} %{buildroot}%{_defaultdocdir}/%{name}/ +cp -r CHANGES COPYING COPYRIGHT README THANKS %{buildroot}%{_defaultdocdir}/%{name}/ +pushd %{buildroot}%{_defaultdocdir}/%{name}/ +rm cfgmaker.pod indexmaker.pod mrtglib.pod +ln -s %{_bindir}/cfgmaker cfgmaker.pod +ln -s %{_bindir}/indexmaker indexmaker.pod +ln -s %{_libdir}/mrtg2/MRTG_lib.pm mrtglib.pod +popd +%if 0%{?suse_version} > 1020 +%fdupes %{buildroot}%{_defaultdocdir}/%{name} +%endif %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-, root, root) -%doc CHANGES COPYING COPYRIGHT README THANKS contrib doc/*.{pod,txt,png} +%dir %{_defaultdocdir}/%{name} +%doc %{_defaultdocdir}/%{name}/C* +%doc %{_defaultdocdir}/%{name}/README +%doc %{_defaultdocdir}/%{name}/THANKS %doc %{_mandir}/man?/* %{_bindir}/* %{iconsdir} -%{_prefix}/lib/mrtg2 +%{_libdir}/mrtg2 %{_datadir}/apache2 +%files doc +%defattr(-, root, root) +%dir %{_defaultdocdir}/%{name}/examples +%doc %{_defaultdocdir}/%{name}/examples/* +%doc %{_defaultdocdir}/%{name}/*.pod +%doc %{_defaultdocdir}/%{name}/*.txt +%doc %{_defaultdocdir}/%{name}/*.png + %changelog ++++++ mrtg-2.17.2.tar.bz2 -> mrtg-2.17.4.tar.bz2 ++++++ ++++ 9127 lines of diff (skipped) ++++++ mrtg-icons_path.patch ++++++ Index: bin/indexmaker =================================================================== --- bin/indexmaker.orig +++ bin/indexmaker @@ -294,7 +294,8 @@ sub genindex ($$$$) { #lets make sure there is a trailing path separator $gifPath =~ s|/*$|/|; } else { - $gifPath = "$$cfg{imagehtml}"; + # $gifPath = "$$cfg{imagehtml}"; + $gifPath = "/icons/" } Index: bin/mrtg =================================================================== --- bin/mrtg.orig +++ bin/mrtg @@ -1834,7 +1834,8 @@ print HTML " #lets make sure there is a trailing path separator $gifPath =~ s|/*$|/|; } else { - $gifPath = "$dirrel$$cfg{imagehtml}"; +# $gifPath = "$dirrel$$cfg{imagehtml}"; + $gifPath = "/icons/" } print HTML<<TEXT; ++++++ mrtg-pod.patch ++++++ Index: Makefile.in =================================================================== --- Makefile.in.orig +++ Makefile.in @@ -51,11 +51,9 @@ install: all $(INSTALL) -m 755 $$x $(DESTDIR)$(bindir); done for x in bin/rateup; do \ $(INSTALL) -m 755 $$x $(DESTDIR)$(bindir); done - $(MKINSTALLDIRS) $(DESTDIR)$(libdir)/mrtg2/Pod + $(MKINSTALLDIRS) $(DESTDIR)$(libdir)/mrtg2 for x in $(top_srcdir)/lib/mrtg2/*.pm; do \ $(INSTALL) -m 644 $$x $(DESTDIR)$(libdir)/mrtg2; done - for x in $(top_srcdir)/lib/mrtg2/Pod/*.pm; do \ - $(INSTALL) -m 644 $$x $(DESTDIR)$(libdir)/mrtg2/Pod; done $(MKINSTALLDIRS) $(DESTDIR)$(datadir)/mrtg2/icons for x in $(top_srcdir)/images/*.gif $(top_srcdir)/images/*.png; do \ $(INSTALL) -m 644 $$x $(DESTDIR)$(datadir)/mrtg2/icons; done Index: lib/mrtg2/MRTG_lib.pm =================================================================== --- lib/mrtg2/MRTG_lib.pm.orig +++ lib/mrtg2/MRTG_lib.pm @@ -684,7 +684,7 @@ sub quickcheck ($$$$$$) { } } die "ERROR: CFG Error Unknown Option \"$first\" in file $file on line $line or above.\n". - " Check doc/mrtg-reference.txt for Help\n\n"; + " Check /usr/share/doc/packages/mrtg/mrtg-reference.txt for Help\n\n"; } # complex config checks ++++++ mrtg-switches.patch ++++++ Index: bin/cfgmaker =================================================================== --- bin/cfgmaker +++ bin/cfgmaker @@ -175,7 +175,7 @@ sub InterfaceInfo($$$$$) { push @Variables, ($1 > 11.0 or $1 < 10.0 ) ? "ifAlias" : "CiscolocIfDescr"; if ($1 > 11.2) {push @Variables, "vmVlan";}; if ($1 > 11.3) {push @Variables, "vlanTrunkPortDynamicStatus";}; - } elsif ( $routers->{$router}{deviceinfo}{Vendor} =~ /(?:hp|juniper|dlink|wwp|foundry|dellLan|force10|3com|extremenetworks|openBSD|arista|enterasys|zyxel|vyatta)/i) { + } elsif ( $routers->{$router}{deviceinfo}{Vendor} =~ /(?:cisco:hp|juniper|dlink|wwp|foundry|dellLan|force10|3com|extremenetworks|openBSD|arista|enterasys|zyxel|vyatta)/i) { push @Variables, "ifAlias"; } @@ -993,7 +993,7 @@ sub DeviceInfo ($$$) { '1.3.6.1.4.1.94.' => 'nokiaipsofw', '1.3.6.1.4.1.307.' => 'portmaster', '1.3.6.1.4.1.890.' => 'zyxel', - '1.3.6.1.4.1.2272.30' => 'nortel', + '1.3.6.1.4.1.2272.30' => 'nortel', '1.3.6.1.4.1.30155.' => 'openBSD', '1.3.6.1.4.1.30065.' => 'arista', '1.3.6.1.4.1.5624.' => 'enterasys', ++++++ mrtg-traffic-sum.1 ++++++ .\" Automatically generated by Pod::Man 2.23 (Pod::Simple 3.14) .\" .\" Standard preamble: .\" ======================================================================== .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp .. .de Vb \" Begin verbatim text .ft CW .nf .ne \\$1 .. .de Ve \" End verbatim text .ft R .fi .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left .\" double quote, and \*(R" will give a right double quote. \*(C+ will .\" give a nicer C++. Capital omega is used to do unbreakable dashes and .\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, .\" nothing in troff, for use with C<>. .tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- . ds PI pi . if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch . if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch . ds L" "" . ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ . ds -- \|\(em\| . ds PI \(*p . ds L" `` . ds R" '' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. .ie \n(.g .ds Aq \(aq .el .ds Aq ' .\" .\" If the F register is turned on, we'll generate index entries on stderr for .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. .ie \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} .el \{\ . de IX .. .\} .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ . ds #H 0 . ds #V .8m . ds #F .3m . ds #[ \f1 . ds #] \fP .\} .if t \{\ . ds #H ((1u-(\\\\n(.fu%2u))*.13m) . ds #V .6m . ds #F 0 . ds #[ \& . ds #] \& .\} . \" simple accents for nroff and troff .if n \{\ . ds ' \& . ds ` \& . ds ^ \& . ds , \& . ds ~ ~ . ds / .\} .if t \{\ . ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" . ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' . ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' . ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' . ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' . ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' .\} . \" troff and (daisy-wheel) nroff accents .ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' .ds 8 \h'\*(#H'\(*b\h'-\*(#H' .ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] .ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' .ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' .ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] .ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] .ds ae a\h'-(\w'a'u*4/10)'e .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' .if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ . ds : e . ds 8 ss . ds o a . ds d- d\h'-1'\(ga . ds D- D\h'-1'\(hy . ds th \o'bp' . ds Th \o'LP' . ds ae ae . ds Ae AE .\} .rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "MRTG-TRAFFIC-SUM 1" .TH MRTG-TRAFFIC-SUM 1 "2009-12-28" "perl v5.12.3" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l .nh .SH "NAME" mrtg\-traffic\-sum \- Builds monthly traffic summary from mrtg log files .SH "SYNOPSIS" .IX Header "SYNOPSIS" \&\fBmrtg-traffic-sum\fR [\fIoptions\fR...] \fBconfig-file\fR .PP .Vb 8 \& \-\-man show man\-page and exit \& \-h, \-\-help display this help and exit \& \-\-version output version information and exit \& \-\-catch=regexp filter out things that match this in PageTop \& \-\-email=address email the result \& \-\-min=gigabytes minimal number of gigabites required for report \& \-\-range=<when> Specify "current" for month\-to\-date, "previous" for last complete month \& \-\-units=[GB|MB] Display results in gigabytes (default is MB) .Ve .SH "DESCRIPTION" .IX Header "DESCRIPTION" The mrtg-traffic-sum goes through the mrtg logs for the targets in the the config file specified and builds the traffic total for the last month in Giga Bytes. (Note in communications Giga is 10^9). .PP The result of this analysis can be sent via email to an address of your choice using the \fB\-\-email\fR option. .PP With the \fB\-\-catch\fR option you can specify a regular expression which will be matched against the contents of the PageTop settings. The regular expression should return a value into \f(CW$1\fR and possibly into \&\f(CW$2\fR. This will then be used as description for the appropriate traffic sum. By default the catch is set to: .PP .Vb 1 \& (?:description|port name):</td>\es*<td>\es*([^< ]*?[^<]*?)\es*</td .Ve .PP By default, all traffic which is over one megabyte gets reported. Use the \&\fB\-\-min\fR switch to change this number. .SH "COPYRIGHT" .IX Header "COPYRIGHT" Copyright (c) 2002 by Tobias Oetiker. All rights reserved. .SH "LICENSE" .IX Header "LICENSE" This program is free software; you can redistribute it and/or modify it under the terms of the \s-1GNU\s0 General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. .PP This program is distributed in the hope that it will be useful, but \s-1WITHOUT\s0 \s-1ANY\s0 \s-1WARRANTY\s0; without even the implied warranty of \&\s-1MERCHANTABILITY\s0 or \s-1FITNESS\s0 \s-1FOR\s0 A \s-1PARTICULAR\s0 \s-1PURPOSE\s0. See the \&\s-1GNU\s0 General Public License for more details. .PP You should have received a copy of the \s-1GNU\s0 General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, \s-1MA\s0 02139, \s-1USA\s0. .SH "AUTHOR" .IX Header "AUTHOR" Tobias Oetiker <tobi(a)oetiker.ch>, Keith Dunnett <keith(a)dunnett.name> .SH "HISTORY" .IX Header "HISTORY" .Vb 2 \& 2002\-07\-13 to Initial Version \& 2009\-12\-38 kd New features .Ve ++++++ rateup.1 ++++++ .TH RATEUP 1 .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection .\" other parms are allowed: see man(7), man(1) .SH NAME rateup \- backend tool used by mrtg .SH SYNOPSIS .B rateup .br .SH "DESCRIPTION" This manual page documents briefly the .BR rateup command. This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page. .PP .B rateup is a program called by mrtg to generate new logfile entries and to update the traffic PNG images. .SH "SEE ALSO" cfgmaker(1), indexmaker(1), mrtg(1). .SH AUTHOR This manual page was written by Dermot Bradley <bradley(a)debian.org>, for the Debian GNU/Linux system (but may be used by others). -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mpich for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package mpich for openSUSE:Factory checked in at 2012-03-06 13:39:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mpich (Old) and /work/SRC/openSUSE:Factory/.mpich.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mpich", Maintainer is "MRueckert(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mpich/mpich.changes 2011-11-24 11:36:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mpich.new/mpich.changes 2012-03-06 13:40:01.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Mar 5 07:57:10 UTC 2012 - cfarrell(a)suse.com + +- license update: SUSE-Permissive + Use a license from http://is.gd/CIdCM7 - if there is no corresponding + entry on spdx.org/licenses use the proprietary SUSE- prefix until the + license is accepted upstream + +------------------------------------------------------------------- +Wed Nov 23 15:16:23 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant/unwanted tags/section (cf. specfile guidelines) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mpich.spec ++++++ --- /var/tmp/diff_new_pack.AD7oaV/_old 2012-03-06 13:40:05.000000000 +0100 +++ /var/tmp/diff_new_pack.AD7oaV/_new 2012-03-06 13:40:05.000000000 +0100 @@ -15,15 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: mpich BuildRequires: gcc-c++ gcc-fortran gdb libtool BuildRequires: fdupes -License: PERMISSIVE-OSI-COMPLIANT +License: SUSE-Permissive Group: Development/Libraries/Parallel -Url: http://www-unix.mcs.anl.gov/mpi/mpich/ +URL: http://www-unix.mcs.anl.gov/mpi/mpich/ Version: 1.2.7p1 Release: 222 Summary: A Portable Implementation of MPI @@ -101,18 +100,9 @@ MPICH is a freely available, portable implementation of MPI, the standard for message-passing libraries. - - -Authors: --------- - Bill Gropp <gropp(a)mcs.anl.gov> - Rusty Lusk <lusk(a)mcs.anl.gov> - %package devel -License: PERMISSIVE-OSI-COMPLIANT Summary: A Portable Implementation of MPI Group: Development/Libraries/Parallel -AutoReqProv: on Requires: mpich Provides: mpich-doc Obsoletes: mpich-doc @@ -122,13 +112,6 @@ Standard for message-passing libraries. This package contains manpages, headers and libraries needed for developing MPI applications - - -Authors: --------- - Bill Gropp <gropp(a)mcs.anl.gov> - Rusty Lusk <lusk(a)mcs.anl.gov> - %prep %setup -q %patch @@ -174,8 +157,8 @@ --with-device=$device \ -prefix=/opt/mpich/$INST \ --enable-sharedlib - # make - make + # parallel build fails + make -j1 cd ../ done @@ -226,9 +209,6 @@ find $RPM_BUILD_ROOT/%{_mpich_root}/man -type f -a ! -name "*gz" -print0 | xargs -0 -r gzip -9 %fdupes -s $RPM_BUILD_ROOT -%clean -rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mkvtoolnix for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package mkvtoolnix for openSUSE:Factory checked in at 2012-03-06 13:39:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkvtoolnix (Old) and /work/SRC/openSUSE:Factory/.mkvtoolnix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkvtoolnix", Maintainer is "seife(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mkvtoolnix/mkvtoolnix.changes 2011-10-16 12:56:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mkvtoolnix.new/mkvtoolnix.changes 2012-03-06 13:39:45.000000000 +0100 @@ -1,0 +2,31 @@ +Mon Mar 5 10:53:43 UTC 2012 - reddwarf(a)opensuse.org + +- Update to 5.3.0 + * Fix DTS handling. + * Fix (E)AC3 detection. + * Fix invalid memory access with certain broken files. + * mkvmerge's verbose identification mode has been extended with + a couple more fields. + * mkvmerge can treat several separate input files as if they + were concatenated into a single large file. + +------------------------------------------------------------------- +Mon Feb 13 10:50:23 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Sun Dec 18 19:55:28 UTC 2011 - reddwarf(a)opensuse.org + +- Update to 5.2.0 + - Fixes a lot of smaller issues. + - Performance enhancements. + +------------------------------------------------------------------- +Tue Nov 29 22:27:05 UTC 2011 - reddwarf(a)opensuse.org + +- Update to 5.1.0 + - Lot of small bug fixes. + - Greatly improves support for MPEG transport streams. + +------------------------------------------------------------------- Old: ---- mkvtoolnix-5.0.1.tar.bz2 New: ---- mkvtoolnix-5.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkvtoolnix.spec ++++++ --- /var/tmp/diff_new_pack.PoqnYx/_old 2012-03-06 13:39:47.000000000 +0100 +++ /var/tmp/diff_new_pack.PoqnYx/_new 2012-03-06 13:39:47.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mkvtoolnix # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -18,16 +18,16 @@ Name: mkvtoolnix -Version: 5.0.1 +Version: 5.3.0 Release: 0 -License: GPLv2+ Summary: Tools to Create, Alter, and Inspect Matroska Files -Url: http://www.bunkus.org/videotools/mkvtoolnix/ +License: GPL-2.0+ Group: Productivity/Multimedia/Other +Url: http://www.bunkus.org/videotools/mkvtoolnix/ Source: http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-%{version}.t… -BuildRequires: boost-devel +BuildRequires: boost-devel >= 1.46 BuildRequires: file-devel -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ >= 4.6 # Needed because of scriplets macros and directory ownership check BuildRequires: hicolor-icon-theme BuildRequires: libebml-devel >= 1.2.2 @@ -38,6 +38,7 @@ BuildRequires: update-desktop-files BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(flac) +BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(zlib) @@ -72,8 +73,9 @@ %suse_update_desktop_file mkvmergeGUI %suse_update_desktop_file mkvinfo install -pm 0644 AUTHORS ChangeLog COPYING README %{buildroot}%{_docdir}/%{name} -install -dm 0755 %{buildroot}%{_docdir}/%{name}/examples -install -pm 0644 examples/* %{buildroot}%{_docdir}/%{name}/examples +cp -a examples %{buildroot}%{_docdir}/%{name} +# I guess this is the correct thing to do until bnc#737549 is fixed +rm -rf %{buildroot}%{_mandir}/nl %{buildroot}%{_mandir}/uk %{buildroot}%{_mandir}/zh_CN %find_lang %{name} --with-man --all-name %postun @@ -112,7 +114,5 @@ %{_mandir}/man1/mkvmerge.1%{ext_man} %{_mandir}/man1/mmg.1%{ext_man} %{_mandir}/man1/mkvpropedit.1%{ext_man} -%{_mandir}/nl -%{_mandir}/zh_CN %changelog ++++++ mkvtoolnix-5.0.1.tar.bz2 -> mkvtoolnix-5.3.0.tar.bz2 ++++++ ++++ 216123 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit midori for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package midori for openSUSE:Factory checked in at 2012-03-06 13:39:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/midori (Old) and /work/SRC/openSUSE:Factory/.midori.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "midori", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/midori/midori.changes 2012-01-09 15:19:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.midori.new/midori.changes 2012-03-06 13:39:39.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 5 14:20:27 UTC 2012 - vdziewiecki(a)suse.com + +- add Provides: browser(npapi) FATE#313084 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ midori.spec ++++++ --- /var/tmp/diff_new_pack.GWO1nG/_old 2012-03-06 13:39:40.000000000 +0100 +++ /var/tmp/diff_new_pack.GWO1nG/_new 2012-03-06 13:39:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package midori # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -46,6 +46,7 @@ BuildRequires: vala Recommends: %{name}-lang = %{version} Recommends: xdg-utils +Provides: browser(npapi) %description Midori is a lightweight web browser based on WebKit and GTK+. Its major -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lrcShow-X for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package lrcShow-X for openSUSE:Factory checked in at 2012-03-06 13:39:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lrcShow-X (Old) and /work/SRC/openSUSE:Factory/.lrcShow-X.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lrcShow-X", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.lrcShow-X.new/lrcShow-X.changes 2012-03-06 13:39:29.000000000 +0100 @@ -0,0 +1,25 @@ +------------------------------------------------------------------- +Thu Feb 16 10:06:20 UTC 2012 - saschpe(a)suse.de + +- Fixed severl rpmlint issues + +------------------------------------------------------------------- +Sat Feb 11 14:41:08 UTC+8 2012 - hillwood(a)linuxfans.org + +- remove some problem translation files. + +------------------------------------------------------------------- +Fri Feb 10 20:53:18 UTC+8 2012 - hillwood(a)linuxfans.org + +- degrade to 2.1.1 stable. + +------------------------------------------------------------------- +Mon Feb 6 13:38:52 UTC+8 2012 - hillwood(a)linuxfans.org + +- change BuildArch to noarch and fixed build error in 64bit. + +------------------------------------------------------------------- +Mon Jan 30 11:37:09 UTC 2012 - jzheng(a)suse.com + +- version 2.2.0 from svn revision 301. + New: ---- FSF-address.diff lrcShow-X.changes lrcShow-X.desktop lrcShow-X.spec lrcShow-X_2_1_1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lrcShow-X.spec ++++++ # # spec file for package lrcShow-X # # Copyright (c) 2012 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/ # Name: lrcShow-X Version: 2.1.1 Release: 1 License: GPL-2.0+ Summary: Application for media-players to show and search lyrics Url: https://launchpad.net/lrcshow-x Group: Productivity/Multimedia/Sound/Players Source0: http://launchpad.net/lrcshow-x/2-series/2.1.1/+download/lrcShow-X_2_1_1.tar… Source1: lrcShow-X.desktop Patch0: FSF-address.diff BuildRequires: update-desktop-files Requires: dbus-1-python Requires: python < 3.0 Requires: python >= 2.4 Requires: python-gobject Requires: python-qt4 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %lang_package %description The main goal of lrcShow-X is to add synchronized lyrics visualization functionality to the most used Linux media players, using existing LRC files, embedded lyrics like ID3 Sylt, Uslt, Lyrics3 and ApeTag. It also searches for lyrics using 12 different engines among which we can mention MiniLyrics, EvilLyrics, LrcDB and TTPlayer. lrcShow-X is written entirely in python using pyqt4 and supporting more than ten different players like Amarok2, Qmmp, Audacious and many other Linux Players (normally using a dbus interface). %prep %setup -q -n %{name} %patch0 -p1 # Fix non-executable scripts: sed -i "1d" advancedSearchNet.py ApeTag.py baseGui.py choose*.py define*.py embedLrc.py engines/*.py engines/ui/*.py helpBrowser.py lrc{Parser,Editor}.py mainGui.py players/*.py preference*.py readConfig.py s2t.py searchLocalLrc.py selectItem*.py settingWizard.py trackInfo.py updateConfig.py %build %install install -d %{buildroot}%{_prefix}/lib/lrcShow-X cp -a * %{buildroot}%{_prefix}/lib/lrcShow-X/ install -d %{buildroot}%{_datadir}/applications/ mkdir -p %{buildroot}/%{_datadir}/hicolor/32x32/apps/ install -m 644 icon/%{name}.png %{buildroot}/%{_datadir}/hicolor/32x32/apps/ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/ # remove these problem translation files: rm -rf %{buildroot}%{_prefix}/lib/lrcShow-X/locale/{bs,oc,ms,cy} %suse_update_desktop_file -n %{name} %find_lang %{name} %files %defattr(-,root,root,-) %{_prefix}/lib/lrcShow-X %{_datadir}/applications/lrcShow-X.desktop %dir %{_datadir}/hicolor/ %dir %{_datadir}/hicolor/32x32 %dir %{_datadir}/hicolor/32x32/apps %{_datadir}/hicolor/32x32/apps/lrcShow-X.png %exclude %{_prefix}/lib/lrcShow-X/locale/ %files lang -f %{name}.lang %defattr(-,root,root,-) %dir %{_prefix}/lib/lrcShow-X/locale %dir %{_prefix}/lib/lrcShow-X/locale/* %dir %{_prefix}/lib/lrcShow-X/locale/*/LC_MESSAGES %changelog ++++++ FSF-address.diff ++++++ diff -Nur lrcShow-X/COPYING lrcShow-X-new/COPYING --- lrcShow-X/COPYING 2011-03-30 20:48:07.000000000 +0800 +++ lrcShow-X-new/COPYING 2012-02-10 21:40:13.652858055 +0800 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. ++++++ lrcShow-X.desktop ++++++ [Desktop Entry] Name=lrcShow-X GenericName=lrcShow-X Comment=Listen to music with lyrics Exec=/usr/lib/lrcShow-X/lrcShow-X.py Categories=AudioVideo;Player;GTK; Terminal=false Type=Application Icon=/usr/share/hicolor/32x32/apps/lrcShow-X.png -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lldpad for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package lldpad for openSUSE:Factory checked in at 2012-03-06 13:39:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lldpad (Old) and /work/SRC/openSUSE:Factory/.lldpad.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lldpad", Maintainer is "hare(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/lldpad/lldpad.changes 2012-01-24 12:19:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lldpad.new/lldpad.changes 2012-03-06 13:39:20.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 13 10:49:52 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lldpad.spec ++++++ --- /var/tmp/diff_new_pack.DnrME1/_old 2012-03-06 13:39:21.000000000 +0100 +++ /var/tmp/diff_new_pack.DnrME1/_new 2012-03-06 13:39:21.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package lldpad # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,14 +16,16 @@ # - Name: lldpad Summary: Link Layer Discovery Protocol (LLDP) Agent -Version: 0.9.32 -Release: 1 -License: GPLv2 +License: GPL-2.0 Group: System/Daemons -BuildRequires: bison flex libtool pkgconfig +Version: 0.9.32 +Release: 0 +BuildRequires: bison +BuildRequires: flex +BuildRequires: libtool +BuildRequires: pkgconfig Url: http://www.intel.com/network/connectivity/products/server_adapters.htm Source: http://downloads.sourceforge.net/e1000/%{name}-%{version}.tar.bz2 Source20: mkinitrd-boot.sh @@ -53,7 +55,6 @@ Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 %package devel -License: GPLv2 Summary: Link Layer Discovery Protocol (LLDP) Agent Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lightdm for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package lightdm for openSUSE:Factory checked in at 2012-03-06 13:39:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightdm (Old) and /work/SRC/openSUSE:Factory/.lightdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lightdm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes 2012-01-17 16:11:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2012-03-06 13:39:16.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Mar 2 11:10:07 UTC 2012 - gber(a)opensuse.org + +- update to version 1.0.9 + - stop file descriptors leaking into the session processes + (bnc#745339, lp#927060, CVE-2012-1111) + - fix compilation against gthread + - change session directory once user permissions are set so it + works on NFS filesystems that don't allow root to access files + - fix object cleanup on exit + - fix lightdm --debug not working on newer GLib + - drop privileges when reading ~/.dmrc (CVE-2011-3153) + - fix crash calling lightdm_get_layout +- drop lightdm-CVE-2011-3153.patch which has been included upstream + +------------------------------------------------------------------- Old: ---- lightdm-1.0.6.tar.gz lightdm-CVE-2011-3153.patch New: ---- lightdm-1.0.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm.spec ++++++ --- /var/tmp/diff_new_pack.04u5b3/_old 2012-03-06 13:39:18.000000000 +0100 +++ /var/tmp/diff_new_pack.04u5b3/_new 2012-03-06 13:39:18.000000000 +0100 @@ -23,7 +23,7 @@ %define qt_lib lib%{qt_libname}-0 Name: lightdm -Version: 1.0.6 +Version: 1.0.9 Release: 0 Summary: Lightweight, Cross-desktop Display Manager License: GPL-3.0+ @@ -50,8 +50,6 @@ Patch7: lightdm-lock-screen-before-switch.patch # PATCH-FIX-UPSTREAM lightdm-remove-xauthority-ownership-fix.patch gber(a)opensuse.org -- Remove the code correcting the ownership of .Xauthority files, it is still not secure and the buggy LightDM version writing .Xauthority as root never was in a released openSUSE version anyway Patch8: lightdm-remove-xauthority-ownership-fix.patch -# PATCH-FIX-UPSTREAM lightdm-CVE-2011-3153.patch prusnak(a)opensuse.org -- fix vulnerability when reading .dmrc file -Patch9: lightdm-CVE-2011-3153.patch # PATCH-FIX-UPSTREAM lightdm-call-g_thread_init-conditionally.patch gber(a)opensuse.org -- call g_thread_init() only on glib < 2.31.0 Patch10: lightdm-call-g_thread_init-conditionally.patch BuildRequires: gcc-c++ @@ -180,7 +178,6 @@ %patch5 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 %patch10 -p1 rm -f liblightdm-qt/*_moc.cpp greeters/qt/*_moc.cpp tests/src/*_moc.cpp ++++++ lightdm-1.0.6.tar.gz -> lightdm-1.0.9.tar.gz ++++++ ++++ 8713 lines of diff (skipped) ++++++ lightdm-call-g_thread_init-conditionally.patch ++++++ --- /var/tmp/diff_new_pack.04u5b3/_old 2012-03-06 13:39:18.000000000 +0100 +++ /var/tmp/diff_new_pack.04u5b3/_new 2012-03-06 13:39:18.000000000 +0100 @@ -1,14 +1,14 @@ # HG changeset patch -# Parent e49002acbff3cb2ec011437ff6e402345ad1e78f +# Parent 16d3aef26fd2584bd9bd83c17e898339dfb59b32 call g_thread_init() only on glib < 2.31.0 diff --git a/src/lightdm.c b/src/lightdm.c --- a/src/lightdm.c +++ b/src/lightdm.c -@@ -1045,8 +1045,10 @@ main (int argc, char **argv) +@@ -1040,8 +1040,10 @@ main (int argc, char **argv) }; GError *error = NULL; - + + g_type_init (); +#if !GLIB_CHECK_VERSION (2,31,0) g_thread_init (NULL); ++++++ lightdm-set-gdmflexiserver-envvar.patch ++++++ --- /var/tmp/diff_new_pack.04u5b3/_old 2012-03-06 13:39:18.000000000 +0100 +++ /var/tmp/diff_new_pack.04u5b3/_new 2012-03-06 13:39:18.000000000 +0100 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent ba843deea04ac9f614338045d71e362fd92127bc +# Parent aea22cc6a9e4a9e6becbefa3ae7945b5a74d7802 set the GDMFLEXISERVER environment variable for the gdmflexiserver wrapper diff --git a/src/session.c b/src/session.c @@ -13,7 +13,7 @@ session_set_env (session, "USERNAME", user_get_name (user)); // FIXME: Is this required? -@@ -455,7 +456,7 @@ session_run (Process *process) +@@ -458,7 +459,7 @@ session_run (Process *process) pam_session_setup (session->priv->authentication); set_env_from_authentication (session, session->priv->authentication); set_locale (session); ++++++ lightdm-sysconfig-support.patch ++++++ --- /var/tmp/diff_new_pack.04u5b3/_old 2012-03-06 13:39:18.000000000 +0100 +++ /var/tmp/diff_new_pack.04u5b3/_new 2012-03-06 13:39:18.000000000 +0100 @@ -51,7 +51,7 @@ diff --git a/src/display.c b/src/display.c --- a/src/display.c +++ b/src/display.c -@@ -887,7 +887,10 @@ static void +@@ -881,7 +881,10 @@ static void display_init (Display *display) { display->priv = G_TYPE_INSTANCE_GET_PRIVATE (display, DISPLAY_TYPE, DisplayPrivate); @@ -74,7 +74,7 @@ #include "display-manager.h" #include "xdmcp-server.h" #include "vnc-server.h" -@@ -61,6 +62,117 @@ typedef struct +@@ -60,6 +61,117 @@ typedef struct #define LIGHTDM_BUS_NAME "org.freedesktop.DisplayManager" @@ -190,9 +190,9 @@ +} + static void - log_cb (const gchar *log_domain, GLogLevelFlags log_level, - const gchar *message, gpointer data) -@@ -1139,6 +1251,9 @@ main (int argc, char **argv) + log_cb (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer data) + { +@@ -1134,6 +1246,9 @@ main (int argc, char **argv) g_mkdir_with_parents (dir, S_IRWXU | S_IXGRP | S_IXOTH); g_free (dir); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libzypp-bindings for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package libzypp-bindings for openSUSE:Factory checked in at 2012-03-06 13:39:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp-bindings (Old) and /work/SRC/openSUSE:Factory/.libzypp-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzypp-bindings", Maintainer is "DMacVicar(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp-bindings/libzypp-bindings.changes 2011-10-19 14:07:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp-bindings.new/libzypp-bindings.changes 2012-03-06 13:39:14.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Feb 28 13:16:22 UTC 2012 - jreidinger(a)suse.com + +- fix iteration over pool in ruby (bnc#746439) +- add ability to use PackageProvider via bindings +- predefine class for ZyppException in ruby so it can be used after + require of zypp +- version 0.5.11 + +------------------------------------------------------------------- Old: ---- libzypp-bindings-0.5.10.tar.bz2 New: ---- libzypp-bindings-0.5.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-bindings.spec ++++++ --- /var/tmp/diff_new_pack.Npyu73/_old 2012-03-06 13:39:16.000000000 +0100 +++ /var/tmp/diff_new_pack.Npyu73/_new 2012-03-06 13:39:16.000000000 +0100 @@ -18,9 +18,9 @@ # nodebuginfo Name: libzypp-bindings -Version: 0.5.10 +Version: 0.5.11 Release: 0 -License: GPLv2+ +License: GPL-2.0+ Summary: Bindings for libzypp Group: Development/Sources BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -63,7 +63,7 @@ %{__rm} -rf %{buildroot} %package -n ruby-zypp -License: GPLv2+ +License: GPL-2.0+ Summary: Ruby bindings for libzypp Group: Development/Languages/Ruby @@ -80,7 +80,7 @@ %endif %package -n python-zypp -License: GPLv2+ +License: GPL-2.0+ Summary: Python bindings for libzypp Group: Development/Languages/Python %description -n python-zypp @@ -92,7 +92,7 @@ %{py_sitedir}/zypp.py %package -n perl-zypp -License: GPLv2+ +License: GPL-2.0+ Requires: perl = %{perl_version} Summary: Perl bindings for libzypp Group: Development/Languages/Perl ++++++ libzypp-bindings-0.5.10.tar.bz2 -> libzypp-bindings-0.5.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.10/VERSION.cmake new/libzypp-bindings-0.5.11/VERSION.cmake --- old/libzypp-bindings-0.5.10/VERSION.cmake 2011-10-18 18:35:54.000000000 +0200 +++ new/libzypp-bindings-0.5.11/VERSION.cmake 2012-03-02 11:41:30.000000000 +0100 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "5") -SET(VERSION_PATCH "10") +SET(VERSION_PATCH "11") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.10/examples/ruby/download_rpms.rb new/libzypp-bindings-0.5.11/examples/ruby/download_rpms.rb --- old/libzypp-bindings-0.5.10/examples/ruby/download_rpms.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-bindings-0.5.11/examples/ruby/download_rpms.rb 2012-03-02 11:41:30.000000000 +0100 @@ -0,0 +1,43 @@ +#!/usr/bin/ruby + +require 'tmpdir' +require 'zypp' +include Zypp + +def initialize_repo dir + rm_opts = RepoManagerOptions.new Pathname.new(dir) + repo_manager = RepoManager.new rm_opts + #ignore certificate issues + KeyRing.setDefaultAccept( KeyRing::ACCEPT_UNKNOWNKEY | + KeyRing::ACCEPT_VERIFICATION_FAILED | KeyRing::ACCEPT_UNSIGNED_FILE | + KeyRing::TRUST_KEY_TEMPORARILY ) + repo_info = RepoInfo.new + url = Zypp::Url.new "http://download.opensuse.org/distribution/openSUSE-stable/repo/oss" + repo_info.setBaseUrl(url) + repo_info.setKeepPackages(true) + repo_alias = "repo" + repo_info.setAlias repo_alias + repo_manager.addRepository repo_info + repo_manager.refreshMetadata repo_info + repo_manager.buildCache repo_info + repo_manager.loadFromCache repo_info + return repo_manager +end + +Dir.mktmpdir do |dir| + #do not lock global zypp + ENV["ZYPP_LOCKFILE_ROOT"] = dir + zypp = ZYppFactory.instance.getZYpp + zypp.initializeTarget Pathname.new dir + puts "initialize repository. It can take serious amount of time" + repo_manager = initialize_repo dir + rma = RepoMediaAccess.new + zypp.pool.each_by_name("libzypp") do |pi| + r = pi.resolvable + puts "downloading rpm for #{r.name}-#{r.edition}" + path = PackageProvider.provide(rma,asKindPackage(pi)) + FileUtils.cp path.to_s,dir + end + puts "downloaded files:" + puts `ls -l #{dir}/*.rpm` +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.10/libzypp-bindings.spec.cmake new/libzypp-bindings-0.5.11/libzypp-bindings.spec.cmake --- old/libzypp-bindings-0.5.10/libzypp-bindings.spec.cmake 2011-10-18 18:35:54.000000000 +0200 +++ new/libzypp-bindings-0.5.11/libzypp-bindings.spec.cmake 2012-03-02 11:41:30.000000000 +0100 @@ -20,7 +20,7 @@ Name: @PACKAGE@ Version: @VERSION@ Release: 0 -License: GPLv2+ +License: GPL-2.0+ Summary: Bindings for libzypp Group: Development/Sources BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -63,7 +63,7 @@ %{__rm} -rf %{buildroot} %package -n ruby-zypp -License: GPLv2+ +License: GPL-2.0+ Summary: Ruby bindings for libzypp Group: Development/Languages/Ruby @@ -80,7 +80,7 @@ %endif %package -n python-zypp -License: GPLv2+ +License: GPL-2.0+ Summary: Python bindings for libzypp Group: Development/Languages/Python %description -n python-zypp @@ -92,7 +92,7 @@ %{py_sitedir}/zypp.py %package -n perl-zypp -License: GPLv2+ +License: GPL-2.0+ Requires: perl = %{perl_version} Summary: Perl bindings for libzypp Group: Development/Languages/Perl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.10/package/libzypp-bindings.changes new/libzypp-bindings-0.5.11/package/libzypp-bindings.changes --- old/libzypp-bindings-0.5.10/package/libzypp-bindings.changes 2011-10-18 18:35:54.000000000 +0200 +++ new/libzypp-bindings-0.5.11/package/libzypp-bindings.changes 2012-03-02 11:41:30.000000000 +0100 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Feb 28 13:16:22 UTC 2012 - jreidinger(a)suse.com + +- fix iteration over pool in ruby (bnc#746439) +- add ability to use PackageProvider via bindings +- predefine class for ZyppException in ruby so it can be used after + require of zypp +- version 0.5.11 + +------------------------------------------------------------------- Tue Oct 18 16:54:42 CEST 2011 - ma(a)suse.de - Add arch armv7hl, armv7nhl, armv7thl, armv7tnhl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.10/swig/Callbacks.i new/libzypp-bindings-0.5.11/swig/Callbacks.i --- old/libzypp-bindings-0.5.10/swig/Callbacks.i 2011-10-18 18:35:54.000000000 +0200 +++ new/libzypp-bindings-0.5.11/swig/Callbacks.i 2012-03-02 11:41:30.000000000 +0100 @@ -34,6 +34,8 @@ if (value == Qnil) value = ID2SYM(rb_intern("abort")); return value; +#else + return Target_String("abort"); #endif return 0; // fallback } @@ -45,6 +47,8 @@ if (value == Qnil) value = ID2SYM(rb_intern("retry")); return value; +#else + return Target_String("retry"); #endif return 0; // fallback } @@ -56,6 +60,8 @@ if (value == Qnil) value = ID2SYM(rb_intern("ignore")); return value; +#else + return Target_String("ignore"); #endif return 0; // fallback } @@ -73,8 +79,7 @@ if (value == Qnil) value = ID2SYM(rb_intern("no_error")); return value; -#endif -#if defined(SWIGPYTHON) +#else return Target_String("no_error"); #endif return 0; // fallback @@ -87,8 +92,7 @@ if (value == Qnil) value = ID2SYM(rb_intern("not_found")); return value; -#endif -#if defined(SWIGPYTHON) +#else return Target_String("not_found"); #endif return 0; // fallback @@ -101,8 +105,7 @@ if (value == Qnil) value = ID2SYM(rb_intern("io")); return value; -#endif -#if defined(SWIGPYTHON) +#else return Target_String("io"); #endif return 0; // fallback @@ -115,8 +118,7 @@ if (value == Qnil) value = ID2SYM(rb_intern("invalid")); return value; -#endif -#if defined(SWIGPYTHON) +#else return Target_String("invalid"); #endif return 0; // fallback diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.10/swig/PackageProvider.i new/libzypp-bindings-0.5.11/swig/PackageProvider.i --- old/libzypp-bindings-0.5.10/swig/PackageProvider.i 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-bindings-0.5.11/swig/PackageProvider.i 2012-03-02 11:41:30.000000000 +0100 @@ -0,0 +1,26 @@ +%inline +{ + namespace zypp + { + class WrappedManagedFile + { + public: + WrappedManagedFile(ManagedFile managed_file){ mf = managed_file; } + const std::string & asString(){ return mf->asString();} + private: + ManagedFile mf; + }; + } +} +%include "zypp/repo/PackageProvider.h" +%extend zypp::repo::PackageProvider { + static zypp::WrappedManagedFile* provide( zypp::repo::RepoMediaAccess & rm, const zypp::Package_constPtr pkg ) + { + zypp::Package::constPtr pkg_type(pkg); + zypp::repo::DeltaCandidates dc; + zypp::repo::PackageProvider pp(rm,pkg_type,dc); + zypp::ManagedFile mf = pp.providePackage(); + zypp::WrappedManagedFile* res = new zypp::WrappedManagedFile(mf); + return res; + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.10/swig/ResPool.i new/libzypp-bindings-0.5.11/swig/ResPool.i --- old/libzypp-bindings-0.5.10/swig/ResPool.i 2011-10-18 18:35:54.000000000 +0200 +++ new/libzypp-bindings-0.5.11/swig/ResPool.i 2012-03-02 11:41:30.000000000 +0100 @@ -25,25 +25,25 @@ #ifdef SWIGRUBY -iter3(ResPool, PoolItem*); +iter3(ResPool, zypp::PoolItem*); // %extend ResPool { // void each() // { // ResPool::const_iterator i = self->begin(); // while ( i != self->end() ) { -// rb_yield( SWIG_NewPointerObj( (void *) &*i, SWIGTYPE_p_PoolItem, 0)); +// rb_yield( SWIG_NewPointerObj( (void *) &*i, SWIGTYPE_p_zypp__PoolItem, 0)); // ++i; // } // } // } %extend ResPool { - void each_by_kind( const ResObject::Kind & kind_r ) + void each_by_kind( const ResKind & kind_r ) { ResPool::byKind_iterator i = self->byKindBegin( kind_r ); while ( i != self->byKindEnd( kind_r ) ) { - rb_yield( SWIG_NewPointerObj( (void *) &*i, SWIGTYPE_p_PoolItem, 0)); + rb_yield( SWIG_NewPointerObj( (void *) &*i, SWIGTYPE_p_zypp__PoolItem, 0)); ++i; } } @@ -54,7 +54,7 @@ { ResPool::byName_iterator i = self->byNameBegin( name ); while ( i != self->byNameEnd( name ) ) { - rb_yield( SWIG_NewPointerObj( (void *) &*i, $descriptor(PoolItem), 0)); + rb_yield( SWIG_NewPointerObj( (void *) &*i, SWIGTYPE_p_zypp__PoolItem, 0)); ++i; } } @@ -65,17 +65,29 @@ #ifdef SWIGPYTHON %newobject ResPool::const_iterator(PyObject **PYTHON_SELF); %extend ResPool { +#if SWIG_VERSION > 0x010336 swig::SwigPyIterator* iterator(PyObject **PYTHON_SELF) +#else + swig::PySwigIterator* iterator(PyObject **PYTHON_SELF) +#endif { return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF); } +#if SWIG_VERSION > 0x010336 swig::SwigPyIterator* kinditerator(PyObject **PYTHON_SELF, const ResObject::Kind & kind_r) +#else + swig::PySwigIterator* kinditerator(PyObject **PYTHON_SELF, const ResObject::Kind & kind_r) +#endif { return swig::make_output_iterator(self->byKindBegin( kind_r ), self->byKindBegin( kind_r ), self->byKindEnd( kind_r ), *PYTHON_SELF); } +#if SWIG_VERSION > 0x010336 swig::SwigPyIterator* nameiterator(PyObject **PYTHON_SELF, const std::string &name) +#else + swig::PySwigIterator* nameiterator(PyObject **PYTHON_SELF, const std::string &name) +#endif { return swig::make_output_iterator(self->byNameBegin( name ), self->byNameBegin( name ), self->byNameEnd( name ), *PYTHON_SELF); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.10/swig/Target.i new/libzypp-bindings-0.5.11/swig/Target.i --- old/libzypp-bindings-0.5.10/swig/Target.i 2011-10-18 18:35:54.000000000 +0200 +++ new/libzypp-bindings-0.5.11/swig/Target.i 2012-03-02 11:41:30.000000000 +0100 @@ -1,18 +1,15 @@ %ignore zypp::Target::reset; -#if ZYPP_VERSION > 631 namespace zypp { // Redefine nested class in global scope for SWIG struct DistributionLabel {}; } -#endif %include <zypp/Target.h> namespace zypp { typedef intrusive_ptr<Target> Target_Ptr; %template(Target_Ptr) intrusive_ptr<Target>; } -#if ZYPP_VERSION > 631 %{ namespace zypp { @@ -20,4 +17,3 @@ typedef Target::DistributionLabel DistributionLabel; } %} -#endif \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.10/swig/python/tests/callbacks.py new/libzypp-bindings-0.5.11/swig/python/tests/callbacks.py --- old/libzypp-bindings-0.5.10/swig/python/tests/callbacks.py 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-bindings-0.5.11/swig/python/tests/callbacks.py 2012-03-02 11:41:30.000000000 +0100 @@ -0,0 +1,54 @@ +import os +cwd = os.path.abspath(os.path.dirname(__file__)) + +import sys +sys.path.insert(0, cwd + "/../../../build/swig/python") +import zypp + +class CommitReceiver: + def removal_start(self, resolvable): + print "Starting to remove ", resolvable.name() + + def removal_progress(self, resolvable, percentage): + print "Remove of ", resolvable.name(), " at ", percentage, "%" + return True + + def removal_finish(self, resolvable, error, reason): + print "Remove of ", resolvable.name(), " finished with problem ", error, ": ", reason + + def removal_problem(self, resolvable, error, description): + print "Remove of ", resolvable.name(), " has problem ", error, ": ", description + return "ignore" + +Z = zypp.ZYppFactory_instance().getZYpp() +Z.initializeTarget( zypp.Pathname("/") ) +Z.target().load(); + +commit_callbacks = zypp.CommitCallbacks() +commit_receiver = CommitReceiver() +commit_callbacks.connect(commit_receiver) + +for item in Z.pool(): + if item.resolvable().name() == "gedit": + print "Emitting removal of ", item.resolvable().name() + item.status().setToBeUninstalled(zypp.ResStatus.USER) + resolvable = item.resolvable() + if not Z.resolver().resolvePool(): + print "Problem count: %d" % Z.resolver().problems().size() + policy = zypp.ZYppCommitPolicy() + policy.downloadMode(zypp.DownloadInAdvance) + policy.dryRun( False ) + policy.syncPoolAfterCommit( False ) + print "Committing" + try: + result = Z.commit( policy ) + print "Done:", result + except: + print "Oops" + break + +# raise + +print "disconnecting" +commit_callbacks.disconnect() +print "disconnected" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.10/swig/python/tests/repoinfo.py new/libzypp-bindings-0.5.11/swig/python/tests/repoinfo.py --- old/libzypp-bindings-0.5.10/swig/python/tests/repoinfo.py 2011-10-18 18:35:54.000000000 +0200 +++ new/libzypp-bindings-0.5.11/swig/python/tests/repoinfo.py 2012-03-02 11:41:30.000000000 +0100 @@ -56,7 +56,7 @@ def testDump(self): out = self.info.dump() - assert len(out) == 396, 'Invalid output length %d' % len(out) + assert len(out) > 300, 'Invalid output length %d' % len(out) def testDumpIni(self): out = self.info.dumpAsIni() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.10/swig/ruby/ruby.i new/libzypp-bindings-0.5.11/swig/ruby/ruby.i --- old/libzypp-bindings-0.5.10/swig/ruby/ruby.i 2011-10-18 18:35:54.000000000 +0200 +++ new/libzypp-bindings-0.5.11/swig/ruby/ruby.i 2012-03-02 11:41:30.000000000 +0100 @@ -111,13 +111,16 @@ } \ } +%wrapper { + static VALUE zyppexception = rb_define_class("ZYppException", rb_eStandardError); +} + %exception { try { $action } catch (const Exception& e) { - static VALUE zyppexception = rb_define_class("ZYppException", rb_eStandardError); std::string tmp = e.historyAsString() + e.asUserString(); rb_raise(zyppexception, tmp.c_str()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.10/swig/ruby/tests/target.rb new/libzypp-bindings-0.5.11/swig/ruby/tests/target.rb --- old/libzypp-bindings-0.5.10/swig/ruby/tests/target.rb 2011-10-18 18:35:54.000000000 +0200 +++ new/libzypp-bindings-0.5.11/swig/ruby/tests/target.rb 2012-03-02 11:41:30.000000000 +0100 @@ -33,10 +33,30 @@ p.each do | pi | i = i + 1 break if i > 10 - puts pi # PoolItems have status and a resolvable -# r = pi.resolvable -# puts "#{r.name}-#{r.edition}" + r = pi.resolvable + assert pi.is_a? PoolItem + end + #try iterate with kind + i = 0 + p.each_by_kind(ResKind.package) do |pi| + + i = i + 1 + break if i > 10 + assert pi.is_a? PoolItem + r = pi.resolvable + assert isKindPackage(pi) + end + + i = 0 + puts "search for libzypp ..." + p.each_by_name("libzypp") do |pi| + i = i + 1 + break if i > 10 + assert pi.is_a? PoolItem + r = pi.resolvable + # broken in current SWIG assert_equal "libzypp",r.name + #try to download it end assert true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-bindings-0.5.10/swig/zypp.i new/libzypp-bindings-0.5.11/swig/zypp.i --- old/libzypp-bindings-0.5.10/swig/zypp.i 2011-10-18 18:35:54.000000000 +0200 +++ new/libzypp-bindings-0.5.11/swig/zypp.i 2012-03-02 11:41:30.000000000 +0100 @@ -127,6 +127,7 @@ #include "zypp/ServiceInfo.h" #include "zypp/RepoManager.h" #include "zypp/repo/RepoType.h" +#include "zypp/repo/PackageProvider.h" #include "zypp/TmpPath.h" #include "zypp/Resolver.h" #include "zypp/pool/GetResolvablesToInsDel.h" @@ -230,6 +231,7 @@ %include "ResStatus.i" %include "ResObject.i" %include "Package.i" +%include "PackageProvider.i" %include "Patch.i" %include "Pattern.i" %include "Product.i" @@ -249,6 +251,10 @@ %include "Resolver.i" %include "ZConfig.i" +//just simple files, where we need default ctor +%include <zypp/repo/RepoProvideFile.h> +%include <zypp/repo/DeltaCandidates.h> + %ignore zypp::ZYpp::setTextLocale; %ignore zypp::ZYpp::getTextLocale; %ignore zypp::ZYpp::setRequestedLocales; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libvmime for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package libvmime for openSUSE:Factory checked in at 2012-03-06 13:38:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvmime (Old) and /work/SRC/openSUSE:Factory/.libvmime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvmime", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.libvmime.new/libvmime.changes 2012-03-06 13:38:51.000000000 +0100 @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Thu Jun 30 14:59:15 UTC 2011 - jengelh(a)medozas.de + +- Initial package for build.opensuse.org New: ---- libvmime-0.9.1+.tar.bz2 libvmime-libgnutls28.diff libvmime-nodatetime.diff libvmime-sotag.diff libvmime.changes libvmime.spec spice_source.sh vmime-0.8.1-charset-catch.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvmime.spec ++++++ # # spec file for package libvmime # # Copyright (c) 2011 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/ # Name: libvmime %define lname libvmime-0_9_2-0 Summary: Library for working with MIME messages and IMAP/POP/SMTP Version: 0.9.2 Release: 0 Group: Development/Libraries/C and C++ URL: http://vmime.sf.net/ License: GPL-3.0+ #Source: http://downloads.sf.net/vmime/%name-%version.tar.bz2 Source: %name-0.9.1+.tar.bz2 Source2: spice_source.sh #Svn-Clone: https://vmime.svn.sourceforge.net/svnroot/vmime Patch1: libvmime-nodatetime.diff # PATCH-WORKAROUND-UPSTREAM libvmime-sotag.diff Patch2: libvmime-sotag.diff # PATCH-FEATURE-UPSTREAM vmime-0.8.1-charset-catch.diff x -- ZCP team will deal with this in time Patch3: vmime-0.8.1-charset-catch.diff # PATCH-FIX-UPSTREAM libvmime-libgnutls28.diff Patch4: libvmime-libgnutls28.diff BuildRoot: %_tmppath/%name-%version-build BuildRequires: autoconf, automake, gcc-c++, libgsasl-devel, libtool BuildRequires: libgcrypt-devel, pkgconfig, postfix, scons, xz %if 0%{?suse_version} >= 1100 BuildRequires: gettext-tools, libgnutls-devel, libselinux-devel %else %if 0%{?suse_version} > 0 BuildRequires: gnutls-devel %endif %endif %if 0%{?fedora_version} > 0 BuildRequires: gettext, gnutls-devel %endif %description VMime is a powerful C++ class library for working with MIME messages and Internet messaging services like IMAP, POP or SMTP. With VMime you can parse, generate and modify messages, and also connect to store and transport services to receive or send messages over the Internet. The library offers all the features to build a complete mail client. %package -n %lname Summary: Library for working with MIME messages and IMAP/POP/SMTP Group: System/Libraries %description -n %lname VMime is a powerful C++ class library for working with MIME messages and Internet messaging services like IMAP, POP or SMTP. With VMime you can parse, generate and modify messages, and also connect to store and transport services to receive or send messages over the Internet. The library offers all the features to build a complete mail client. %package devel Summary: Library for working with MIME messages and IMAP/POP/SMTP Group: Development/Libraries/C and C++ Requires: %lname = %version %description devel VMime is a powerful C++ class library for working with MIME messages and Internet messaging services like IMAP, POP or SMTP. With VMime you can parse, generate and modify messages, and also connect to store and transport services to receive or send messages over the Internet. The library offers all the features to build a complete mail client. %prep %setup -qn vmime %patch -P 1 -P 2 -P 3 -P 4 -p1 %build # sendmail's awesome location. export PATH="$PATH:/usr/sbin"; %if 0%{?suse_version} >= 1100 scons autotools; # SL10: Rely on scons already having been run before the tarball was made. %endif %configure --disable-static make %{?_smp_mflags}; %install b="%buildroot"; make install DESTDIR="$b" docdir="%_docdir/%name"; find "$b" -type f -name "*.la" -delete; %check make check; %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files -n %lname %defattr(-,root,root) %_libdir/%{name}*.so.* %files devel %defattr(-,root,root) %doc %_docdir/%name %_includedir/* %_libdir/%{name}*.so %_libdir/pkgconfig/*.pc %changelog ++++++ libvmime-libgnutls28.diff ++++++ From: Jan Engelhardt <jengelh(a)medozas.de> Date: 2011-10-07 00:06:10.890341952 +0200 Upstream: tbd build: resolve build error with libgnutls-3.x The gnutls/extra.h include is gone in libgnutls 3.x, and it does not seem like we need it for libgnutls 2.x anyway, so just remove it. GNUTLS_E_LZO_INIT_FAILED was removed too.. can probably live without in gnutls2. --- src/net/tls/TLSSession.cpp | 2 -- 1 file changed, 2 deletions(-) Index: vmime/src/net/tls/TLSSession.cpp =================================================================== --- vmime.orig/src/net/tls/TLSSession.cpp +++ vmime/src/net/tls/TLSSession.cpp @@ -22,7 +22,6 @@ // #include <gnutls/gnutls.h> -#include <gnutls/extra.h> #include "vmime/config.hpp" @@ -318,7 +317,6 @@ void TLSSession::throwTLSException(const ERROR(GNUTLS_E_INIT_LIBEXTRA) ERROR(GNUTLS_E_LIBRARY_VERSION_MISMATCH) ERROR(GNUTLS_E_NO_TEMPORARY_RSA_PARAMS) - ERROR(GNUTLS_E_LZO_INIT_FAILED) ERROR(GNUTLS_E_NO_COMPRESSION_ALGORITHMS) ERROR(GNUTLS_E_NO_CIPHER_SUITES) ERROR(GNUTLS_E_OPENPGP_GETKEY_FAILED) ++++++ libvmime-nodatetime.diff ++++++ --- src/base.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: libvmime-0.9.1/src/base.cpp =================================================================== --- libvmime-0.9.1.orig/src/base.cpp +++ libvmime-0.9.1/src/base.cpp @@ -74,7 +74,7 @@ const string libname() { return (VMIME_P * * @return library version */ -const string libversion() { return (VMIME_VERSION " (" __DATE__ " " __TIME__ ")"); } +const string libversion() { return (VMIME_VERSION " (_""_DATE_""_ causes unnecessary rebuilds - avoid)"); } /** Return the library API version (eg: "6:1:6"). * ++++++ libvmime-sotag.diff ++++++ From: Jan Engelhardt <jengelh(a)medozas.de> Date: 2011-06-25 23:04 +0200 AFAICS, VMIME broke its API between 0.4.x and 0.8.x without updating soversions, hence no trust that it's right now. Add -release suffix unconditionally. --- SConstruct | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) Index: vmime/SConstruct =================================================================== --- vmime.orig/SConstruct +++ vmime/SConstruct @@ -1017,7 +1017,7 @@ vmime_pc.write("Name: " + packageRealNam vmime_pc.write("Description: " + packageDescription + "\n") vmime_pc.write("Version: " + packageVersion + "\n") vmime_pc.write("Requires: " + vmime_pc_requires + "\n") -vmime_pc.write("Libs: -L${libdir} -l" + packageVersionedGenericName + " " + vmime_pc_libs + "\n") +vmime_pc.write("Libs: -L${libdir} -l" + packageVersionedGenericName + "-" + str(packageVersion) + " " + vmime_pc_libs + "\n") #vmime_pc.write("Cflags: -I${includedir}/" + packageVersionedGenericName + "\n") vmime_pc.write("Cflags: -I${includedir}/" + "\n") @@ -1090,7 +1090,7 @@ def generateAutotools(target, source, en vmime_pc_in.write("Description: " + packageDescription + "\n") vmime_pc_in.write("Version: @VERSION@\n") vmime_pc_in.write("Requires: @GSASL_REQUIRED@\n") - vmime_pc_in.write("Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@\n") + vmime_pc_in.write("Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@-@PACKAGE_VERSION@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@\n") #vmime_pc_in.write("Cflags: -I${includedir}/@GENERIC_VERSIONED_LIBRARY_NAME@\n") vmime_pc_in.write("Cflags: -I${includedir}/ @LIBGNUTLS_CFLAGS@\n") vmime_pc_in.close() @@ -1162,8 +1162,7 @@ INCLUDES = -I$(prefix)/include -I$(top_s Makefile_am.write('lib_LTLIBRARIES = ' + packageVersionedName + '.la\n') Makefile_am.write(packageVersionedName + '_la_LDFLAGS = -export-dynamic -version-info ' -# + '@LIBRARY_VERSION@ -release @LIBRARY_RELEASE@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@\n') - + '@LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@\n') + + '@LIBRARY_VERSION@ -release @PACKAGE_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@\n') sourceFiles = [] # for conversion: subpath/file.cpp --> subpath_file.cpp # used to avoid collision when two files have the same name if different dirs ++++++ spice_source.sh ++++++ #!/bin/sh -ex # Take an SVN snapshot and produce necessary files to ease # compilation on irresponsibly old systems. pushd vmime/; scons autotools; rm -Rf autom4te.cache; popd; find vmime -print0 | sort -z | \ tar -T- --null --no-rec --owner=root --group=root \ -cjf libvmime-0.9.1+.tar.bz2; ++++++ vmime-0.8.1-charset-catch.diff ++++++ diff -Nurb libvmime-0.8.1.orig/src/word.cpp libvmime-0.8.1.patched/src/word.cpp --- libvmime-0.8.1.orig/src/word.cpp 2006-10-02 15:44:00.000000000 +0200 +++ libvmime-0.8.1.patched/src/word.cpp 2007-12-12 20:26:55.267497149 +0100 @@ -616,7 +616,13 @@ { string out; + try { charset::convert(m_buffer, out, m_charset, dest); + } + catch (vmime::exception &e) { + // copy 'word' as text + out = m_buffer; + } return (out); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libstfl for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package libstfl for openSUSE:Factory checked in at 2012-03-06 13:38:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstfl (Old) and /work/SRC/openSUSE:Factory/.libstfl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstfl", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libstfl/libstfl.changes 2011-09-23 02:10:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libstfl.new/libstfl.changes 2012-03-06 13:38:43.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Mar 2 13:27:51 UTC 2012 - cfarrell(a)suse.com + +- license update: LGPL-3.0+ + No indication of LGPL-3.0 (only) files. See README also + +------------------------------------------------------------------- +Tue Jan 31 10:33:30 UTC 2012 - jengelh(a)medozas.de + +- Remove redundant tags/sections per specfile guideline suggestions +- Parallel building using %_smp_mflags + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstfl.spec ++++++ --- /var/tmp/diff_new_pack.Y4iGR1/_old 2012-03-06 13:38:44.000000000 +0100 +++ /var/tmp/diff_new_pack.Y4iGR1/_new 2012-03-06 13:38:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libstfl # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -20,19 +20,22 @@ Name: libstfl Version: 0.21 -Release: 1 +Release: 0 Summary: Structured Terminal Forms Library +License: LGPL-3.0+ +Group: System/Libraries Source: http://www.clifford.at/stfl/stfl-%{version}.tar.gz Source99: libstfl-rpmlintrc Patch1: stfl-optflags.patch Patch2: stfl-ncurses.patch Url: http://www.clifford.at/stfl/ -Group: System/Libraries -License: GNU Lesser General Public License version 3 (LGPL v3) BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildRequires: swig perl python python-devel ruby ruby-devel -BuildRequires: ncurses-devel pkgconfig -BuildRequires: gcc glibc-devel make +BuildRequires: gcc +BuildRequires: glibc-devel +BuildRequires: make +BuildRequires: ncurses-devel +BuildRequires: pkgconfig %description ............................................................................. @@ -54,7 +57,7 @@ GUI and can concentrate on the more interesting programming tasks. %package -n libstfl-devel -License: GNU Lesser General Public License version 3 (LGPL v3) + Summary: Structured Terminal Forms Library Group: Development/Libraries/C and C++ Requires: ncurses-devel @@ -77,8 +80,7 @@ %patch2 %build -# -j breaks build -%__make %{?jobs:-j%{jobs}} \ +make %{?_smp_mflags} \ prefix="%{_prefix}" \ libdir="%{_lib}" \ CC="%__cc" \ @@ -109,9 +111,6 @@ %postun -n libstfl%{soname} -p /sbin/ldconfig -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} - %files -n libstfl%{soname} %defattr(-,root,root) %doc COPYING README -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libmms for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package libmms for openSUSE:Factory checked in at 2012-03-06 13:38:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmms (Old) and /work/SRC/openSUSE:Factory/.libmms.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmms", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libmms/libmms.changes 2011-09-23 02:08:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libmms.new/libmms.changes 2012-03-06 13:38:37.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 5 14:00:05 UTC 2012 - toddrme2178(a)gmail.com + +- Added 32bit-compatibility package, needed by + gstreamer-0_10-plugins-bad-32bit + +------------------------------------------------------------------- New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmms.spec ++++++ --- /var/tmp/diff_new_pack.Fy7qNI/_old 2012-03-06 13:38:38.000000000 +0100 +++ /var/tmp/diff_new_pack.Fy7qNI/_new 2012-03-06 13:38:38.000000000 +0100 @@ -33,6 +33,7 @@ Source0: %{name}-%{version}.tar.bz2 Source1: libmms-relicensing-1.txt Source2: libmms-relicensing-2.txt +Source3: baselibs.conf BuildRequires: pkg-config BuildRequires: pkgconfig(glib-2.0) ++++++ baselibs.conf ++++++ libmms0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libmal1 for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package libmal1 for openSUSE:Factory checked in at 2012-03-06 13:38:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmal1 (Old) and /work/SRC/openSUSE:Factory/.libmal1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmal1", Maintainer is "WStephenson(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libmal1/libmal1.changes 2011-11-21 15:46:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libmal1.new/libmal1.changes 2012-03-06 13:38:32.000000000 +0100 @@ -1,0 +2,16 @@ +Thu Mar 1 15:38:49 UTC 2012 - cfarrell(a)suse.com + +- license update: MPL-1.0 + See COPYING + +------------------------------------------------------------------- +Tue Jan 31 16:29:13 UTC 2012 - jengelh(a)medozas.de + +- Parallel building using %_smp_mflags + +------------------------------------------------------------------- +Sun Nov 20 20:33:06 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant/unwanted tags/section (cf. specfile guidelines) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmal1.spec ++++++ --- /var/tmp/diff_new_pack.QbYlzI/_old 2012-03-06 13:38:33.000000000 +0100 +++ /var/tmp/diff_new_pack.QbYlzI/_new 2012-03-06 13:38:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libmal1 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,16 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: libmal1 -BuildRequires: libtool pilot-link-devel -License: MOZILLA PUBLIC LICENSE (MPL/NPL) -Group: Development/Libraries/C and C++ +BuildRequires: libtool +BuildRequires: pilot-link-devel Summary: Palm Sync Library +License: MPL-1.0 +Group: Development/Libraries/C and C++ Version: 0.44 -Release: 147 +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://jasonday.home.att.net/code/libmal/ Source: libmal-%{version}.tar.bz2 @@ -36,33 +35,18 @@ Whittaker's malsync distribution. It also includes a few wrapper functions. - - -Authors: --------- - Jason Day, jasonday(a)worldnet.att.net - malsync code by Tom Whittaker, tom(a)tomw.org - %package devel -License: MOZILLA PUBLIC LICENSE (MPL/NPL) Summary: Palm Sync Library +Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: pilot-link-devel Conflicts: libmal-devel -Group: Development/Libraries/C and C++ %description devel libmal is a convenient library made up of the object files contained in Tom Whittaker's malsync distribution. libmaal also contains a few wrapper functions. - - -Authors: --------- - Jason Day, jasonday(a)worldnet.att.net - malsync code by Tom Whittaker, tom(a)tomw.org - %prep %setup -q -n libmal-%{version} %patch @@ -73,15 +57,12 @@ autoreconf --install --force export CFLAGS="$RPM_OPT_FLAGS" %configure --disable-static -make %{?jobs:-j %jobs} +make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT/usr/bin/malsync -%clean -rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libkate for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package libkate for openSUSE:Factory checked in at 2012-03-06 13:38:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkate (Old) and /work/SRC/openSUSE:Factory/.libkate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkate", Maintainer is "StShaw(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libkate/libkate.changes 2011-09-26 10:35:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkate.new/libkate.changes 2012-03-06 13:38:24.000000000 +0100 @@ -1,0 +2,10 @@ +Sun Mar 4 14:39:57 UTC 2012 - davejplater(a)gmail.com + +- Renamed kate-tools to libkate-tools. + +------------------------------------------------------------------- +Mon Feb 13 10:48:48 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- Old: ---- _service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkate.spec ++++++ --- /var/tmp/diff_new_pack.zIpDee/_old 2012-03-06 13:38:27.000000000 +0100 +++ /var/tmp/diff_new_pack.zIpDee/_new 2012-03-06 13:38:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libkate # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE Dominique Leuenberger, Amsterdam, Netherlands # # All modifications and additions to the file contributed by third parties @@ -20,14 +20,14 @@ Name: libkate Version: 0.4.1 -Release: 11 +Release: 0 # "Other uncritical OpenSource License" is no longer allowed in the License field. -License: BSD3c Summary: A karaoke and text codec for embedding in Ogg -Url: http://libkate.googlecode.com +License: BSD-3-Clause Group: Productivity/Multimedia/Other +Url: http://libkate.googlecode.com Source: http://libkate.googlecode.com/files/%{name}-%{version}.tar.gz BuildRequires: doxygen BuildRequires: fdupes @@ -51,7 +51,6 @@ %package -n %{name}1 -License: BSD3c Summary: A karaoke and text codec for embedding in Ogg Group: System/Libraries @@ -69,9 +68,10 @@ %package -n liboggkate1 -License: BSD3c Summary: A karaoke and text codec for embedding in Ogg Group: System/Libraries +Provides: %{_libdir}/liboggkate.so.1 +Obsoletes: libkate1 < 0.4.1 %description -n liboggkate1 Kate is a codec for karaoke and text encapsulation for Ogg. Most of the @@ -86,7 +86,6 @@ color, etc, so scrolling or fading text can be defined. %package devel -License: BSD3c Summary: A karaoke and text codec for embedding in Ogg - Development Files Group: Development/Libraries/C and C++ Requires: %{name}1 = %{version} @@ -108,14 +107,11 @@ This package contains files for developers. -%package -n kate-tools -License: BSD3c +%package tools Summary: A karaoke and text codec for embedding in Ogg Group: Productivity/Multimedia/Other -Provides: libkate-tools = 0.4.1 -Obsoletes: libkate-tools < 0.4 -%description -n kate-tools +%description tools Kate is a codec for karaoke and text encapsulation for Ogg. Most of the time, this would be multiplexed with audio/video to carry subtitles, song lyrics (with or without karaoke data), etc, but doesn't have to be. @@ -128,12 +124,11 @@ color, etc, so scrolling or fading text can be defined. %package -n python-katedj -License: BSD3c Summary: Editor and remixer for Kate streams in Ogg Group: Productivity/Multimedia/Other Provides: katedj = 0.4.1 Obsoletes: katedj < 0.4.1 -Requires: kate-tools = %{version} +Requires: %{name}-tools = %{version} Requires: python-wxWidgets Requires: %{_bindir}/oggz-merge Requires: %{_bindir}/oggz-rip @@ -192,7 +187,7 @@ %{_libdir}/pkgconfig/kate.pc %{_libdir}/pkgconfig/oggkate.pc -%files -n kate-tools +%files tools %defattr(-, root, root) %{_bindir}/katedec %{_bindir}/kateenc -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2012-03-06 13:38:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi", Maintainer is "ms(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2012-02-25 07:30:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-03-06 13:38:14.000000000 +0100 @@ -1,0 +2,126 @@ +Mon Mar 5 15:21:08 CET 2012 - ms(a)suse.de + +- v5.02.17 released + +------------------------------------------------------------------- +Mon Mar 5 13:01:13 CET 2012 - ms(a)suse.de + +- follow up fix for handling of console in kiwi initrd (bnc #749900) + * don't start blogd in kiwi initrd, doesn't make much sense + * fixed console output, stdout was wrongly redirected + * make sure utimer also works in the preinit code + +------------------------------------------------------------------- +Mon Mar 5 10:38:34 CET 2012 - ms(a)suse.de + +- v5.02.16 released + +------------------------------------------------------------------- +Mon Mar 5 10:23:55 CET 2012 - ms(a)suse.de + +- arm: fixed installation of MLO loader, wrong path + +------------------------------------------------------------------- +Sun Mar 4 22:03:07 CET 2012 - ms(a)suse.de + +- arm: added following boot fixes: + * To avoid any issues when parted leaves x86 boot code we + zero out the first 440 bytes (MBR without ptable). The + mandatory master boot id to identify the device is written + afterwards + * make sure MLO is installed after repart again in + installBootLoaderUBoot. Also make sure the same MBR cleanup + code is applied in the kiwi boot code + +------------------------------------------------------------------- +Fri Mar 2 16:26:01 CET 2012 - ms(a)suse.de + +- v5.02.15 released + +------------------------------------------------------------------- +Fri Mar 2 15:32:47 CET 2012 - ms(a)suse.de + +- fixed handling of console in kiwi initrd (bnc #749900) + * removed use of klogconsole, we want kernel messages at that stage + * don't use tty devices, use /dev/console and remove kiwistderr + * allow debug shell only if tty device for it exists + * don't use extra terminal to show error information. all that + is stored in /var/log/boot kiwi + +------------------------------------------------------------------- +Fri Mar 2 11:20:49 CET 2012 - ms(a)suse.de + +- added ec2region setup to ec2 example image descriptions + +------------------------------------------------------------------- +Fri Mar 2 11:15:19 CET 2012 - ms(a)suse.de + +- DB: rebuild documentation + +------------------------------------------------------------------- +Thu Mar 1 16:40:11 CET 2012 - ms(a)suse.de + +- fixed default fstab setup to know about /run for udev + +------------------------------------------------------------------- +Thu Mar 1 16:33:46 CET 2012 - rjschwei(a)suse.de + +- update EC2 chapter + Include information about EC2 tools handling of regions, us-east-1 is the + default if not otherwise specified via EC2_URL, --url, or --region + +------------------------------------------------------------------- +Thu Mar 1 15:02:10 CET 2012 - ms(a)suse.de + +- fixed initrd module list for ec2 format code + +------------------------------------------------------------------- +Wed Feb 29 16:01:14 CET 2012 - ms(a)suse.de + +- further cleanup of ec2 examples + +------------------------------------------------------------------- +Wed Feb 29 15:43:10 CET 2012 - ms(a)suse.de + +- cleanup ec2 examples + +------------------------------------------------------------------- +Tue Feb 28 18:03:04 CET 2012 - ms(a)suse.de + +- netboot: fixed setup of root device for local boot + +------------------------------------------------------------------- +Tue Feb 28 13:39:50 CET 2012 - ms(a)suse.de + +- added -base kernel packages for ec2 and xenk boot profiles + +------------------------------------------------------------------- +Tue Feb 28 13:27:30 CET 2012 - ms(a)suse.de + +- fixed mkinitrd call in ec2 format code: + * don't use -A also make sure the exit code of mkinitrd is evaluated + * make sure all required filesystem modules are added to + /etc/sysconfig/kernel before calling mkinitrd + +------------------------------------------------------------------- +Tue Feb 28 07:56:46 CET 2012 - ms(a)suse.de + +- respect size setup by user and don't add extra space for + a possible boot partition + +------------------------------------------------------------------- +Mon Feb 27 11:58:12 CET 2012 - ms(a)suse.de + +- because the input stream from XML is utf-8 encoded it's required + to set binmode correctly to utf-8 too when writing the data out. + This is at least required for the profile file inside the initrd + because it contains data from the XML like the oem boot title + +------------------------------------------------------------------- +Sun Feb 26 14:52:29 CET 2012 - ms(a)suse.de + +- changed partition alignment to align start and size of + partitions to 4096 bytes. The value can be changed with + the option --disk-alignment + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.0aGZ4A/_old 2012-03-06 13:38:16.000000000 +0100 +++ /var/tmp/diff_new_pack.0aGZ4A/_new 2012-03-06 13:38:16.000000000 +0100 @@ -22,7 +22,7 @@ Summary: OpenSuSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.02.14 +Version: 5.02.17 Release: 0 # requirements to build packages BuildRequires: gcc-c++ ++++++ kiwi-docu.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2 /work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/.revision 2012-03-02 16:26:37.000000000 +0100 @@ -1 +1 @@ -d61db24c4c3aee961d2554636398e48fda1043f1 +de229f456ecadd7dfbcc408253808b79b48f4d08 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/kiwi.pl 2012-03-02 16:26:37.000000000 +0100 @@ -50,6 +50,11 @@ use KIWIGlobals; #============================================ +# UTF-8 for output to stdout +#-------------------------------------------- +binmode(STDOUT, ":utf8"); + +#============================================ # Globals (debugging) #-------------------------------------------- our $TT = "Trace Level "; @@ -664,9 +669,8 @@ my $DiskStartSector; # location of start sector (default is 32) my $EditBootConfig; # allow to run script before bootloader install my $PackageManager; # package manager to use + my $DiskAlignment; # partition alignment, default is 4096 my $DiskBIOSSectorSize; # sector size default is 512 bytes - my $DiskBIOSHeads; # BIOS head number, overwrites kernel value - my $DiskBIOSSectors; # BIOS sector number, overwrites kernel value my $Version; # version information #========================================== # create logger and cmdline object @@ -756,10 +760,9 @@ "upgrade|u=s" => \$Upgrade, "test-image=s" => \$TestImage, "test-case=s" => \$TestCase, - "start-sector=i" => \$DiskStartSector, - "bios-sector-size=i" => \$DiskBIOSSectorSize, - "bios-heads=i" => \$DiskBIOSHeads, - "bios-sectors=i" => \$DiskBIOSSectors, + "disk-start-sector=i" => \$DiskStartSector, + "disk-alignment=i" => \$DiskAlignment, + "disk-sector-size=i" => \$DiskBIOSSectorSize, "v|verbose=i" => \$Verbosity, "version" => \$Version, "yes|y" => \$defaultAnswer, @@ -783,6 +786,12 @@ $DiskBIOSSectorSize ); #======================================== + # set partition alignment + #---------------------------------------- + $cmdL -> setDiskAlignment ( + $DiskAlignment + ); + #======================================== # set list of filesystem options #---------------------------------------- $cmdL -> setFilesystemOptions ( @@ -796,18 +805,6 @@ \@Exclude,\@Skip,$MigrateNoFiles,$MigrateNoTemplate ); #======================================== - # set BIOS heads for alignment - #---------------------------------------- - if (defined $DiskBIOSHeads) { - $cmdL -> setDiskBIOSHeads ($DiskBIOSHeads); - } - #======================================== - # set BIOS sectors for alignment - #---------------------------------------- - if (defined $DiskBIOSSectors) { - $cmdL -> setDiskBIOSSectors ($DiskBIOSSectors); - } - #======================================== # check if edit-bootconfig option is set #---------------------------------------- if (defined $EditBootConfig) { @@ -1420,23 +1417,19 @@ print " used architecture for the image-packages in zypp.conf.\n"; print " When used with smart this option doesn't have any effect.\n"; print "\n"; - print " [ --start-sector <number> ]\n"; + print " [ --disk-start-sector <number> ]\n"; print " The start sector value for virtual disk based images.\n"; print " The default is 2048. For newer disks including SSD\n"; print " this is a reasonable default. In order to use the old\n"; print " style disk layout the value can be set to 32\n"; print "\n"; - print " [ --bios-sector-size <number> ]\n"; + print " [ --disk-sector-size <number> ]\n"; print " Overwrite the default 512 byte sector size value.\n"; print " This will influence the partition alignment\n"; print "\n"; - print " [ --bios-heads <number> ]\n"; - print " Overwrite what the kernel thinks about the number of heads.\n"; - print " This will influence the partition alignment\n"; - print "\n"; - print " [ --bios-sectors <number> ]\n"; - print " Overwrite what the kernel thinks about the number of\n"; - print " sectors. This will influence the partition alignment\n"; + print " [ --disk-alignment <number> ]\n"; + print " Align the start of each partition to the specified\n"; + print " value. By default 4096 bytes are used\n"; print "\n"; print " [ --debug ]\n"; print " Prints a stack trace in case of internal errors\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2012-02-24 14:24:19.000000000 +0100 +++ new/kiwi/modules/KIWIBoot.pm 2012-03-05 10:39:10.000000000 +0100 @@ -1825,7 +1825,7 @@ #========================================== # Update raw disk size if boot part is used #------------------------------------------ - if (($needBootP) && ($imgtype ne "split")) { + if ((! $this->{sizeSetByUser}) && ($needBootP) && ($imgtype ne "split")) { $this -> __updateDiskSize ($bootsize); } #========================================== @@ -4557,9 +4557,9 @@ #========================================== # install MLO as raw #------------------------------------------ - if (-e "/mnt/MLO") { + if (-e "$tmpdir/boot/MLO") { $kiwi -> info ("Installing MLO on device: $diskname"); - my $MLO = "/mnt/MLO"; + my $MLO = "$tmpdir/boot/MLO"; my $opt = "count=1 seek=1 conv=notrunc"; $status = qxx ( "dd if=$MLO of=$diskname bs=128k $opt 2>&1" @@ -4573,6 +4573,20 @@ $this -> cleanLoop (); return; } + # To avoid any issues when parted leaves x86 boot code + # in the MBR we better clear that part of the image + $status = qxx ( + "dd if=/dev/zero of=$diskname bs=440 count=1 conv=notrunc 2>&1" + ); + $result = $? >> 8; + if ($result != 0) { + $kiwi -> failed (); + $kiwi -> error ("Couldn't clear MBR on $diskname: $status"); + $kiwi -> failed (); + qxx ("umount /mnt 2>&1"); + $this -> cleanLoop (); + return; + } } qxx ("umount /mnt 2>&1"); } @@ -4704,14 +4718,6 @@ my $kiwi = $this->{kiwi}; my $cmdL = $this->{cmdL}; my $secsz = $cmdL -> getDiskBIOSSectorSize(); - my $BIOS_geo_head = $cmdL -> getDiskBIOSHeads(); - my $BIOS_geo_sector = $cmdL -> getDiskBIOSSectors(); - # ... - # add +1 to the BIOS values to stay compatible with what - # fdisk does. Important for the disk layout on arm - # --- - $BIOS_geo_head++; - $BIOS_geo_sector++; my $status; my $result; my $parted; @@ -4729,23 +4735,6 @@ $kiwi -> loginfo ($status); return 0; } - if ((! $BIOS_geo_head) || (! $BIOS_geo_sector)) { - $parted = "$parted_exec $disk unit cyl print"; - $status = qxx ("$parted | grep ^BIOS 2>&1"); - $result = $? >> 8; - if ($result != 0) { - $kiwi -> loginfo ($status); - return 0; - } - chomp $status; - if ($status =~ /geometry:.*,(\d+),(\d+)\./) { - $BIOS_geo_head = $1; - $BIOS_geo_sector = $2; - } else { - $kiwi -> loginfo ("Failed to read BIOS cyl,head,sector geometry\n"); - return 0; - } - } $parted = "$parted_exec -m $disk unit s print"; $status = qxx ( "$parted | head -n 3 | tail -n 1 | cut -f2 -d:" @@ -4759,14 +4748,9 @@ $status =~ s/s//; $status --; $this->{pDiskSectors} = $status; - $this->{pDiskCylSize} = $BIOS_geo_head * $BIOS_geo_sector * $secsz; $kiwi -> loginfo ( "Disk Sector count is: $this->{pDiskSectors}\n" ); - my $eq = $BIOS_geo_head.' * '.$BIOS_geo_sector.' * '.$secsz; - $kiwi -> loginfo ( - "Disk Cylinder size is: ($eq) $this->{pDiskCylSize} Bytes\n" - ); return $status; } @@ -4776,14 +4760,15 @@ sub getSector { # ... # turn the given size in MB to the number of - # required sectors aligned to the cylinder - # boundary + # required sectors aligned to the value of + # getDiskAlignment (default 4MB) # ---- my $this = shift; my $size = shift; + my $cmdL = $this->{cmdL}; my $count = $this->{pDiskSectors}; - my $cylsz = $this->{pDiskCylSize}; - my $secsz = $this->{gdata}->{DiskSectorSize}; + my $secsz = $cmdL->getDiskBIOSSectorSize(); + my $align = $cmdL->getDiskAlignment(); my $sectors; if ($size =~ /\+(.*)M$/) { # turn value into bytes @@ -4792,11 +4777,11 @@ # use entire rest space $size = $count * $secsz; } - if ($size < $cylsz) { - $size = $cylsz; + if ($size < $align) { + $size = $align; } - $size = int ($size / $cylsz); - $size *= $cylsz; + $size = int ($size / $align); + $size *= $align; $sectors = sprintf ("%.0f",$size / $secsz); $sectors-= 1; return $sectors; @@ -4826,8 +4811,8 @@ # value from the global space or to the value specified on # the commandline. On any subsequent call the start sector is # calculated from the end sector of the previos partition - # and the new value gets aligned to be modulo 8 clean. The - # function returns the number of sectors which represents + # and the new value gets aligned to the value of getDiskAlignment + # The function returns the number of sectors which represents # the given size # --- my $this = shift; @@ -4835,6 +4820,9 @@ my $size = shift; my $kiwi = $this->{kiwi}; my $cmdL = $this->{cmdL}; + my $align = $cmdL->getDiskAlignment(); + my $secsz = $cmdL->getDiskBIOSSectorSize(); + my $align_sectors = int ($align / $secsz); my $locator= new KIWILocator($kiwi); if (! defined $this->{pStart}) { $this->{pStart} = $cmdL->getDiskStartSector(); @@ -4846,9 +4834,11 @@ "$parted | grep :$this->{pStart} | cut -f3 -d:" ); $status=~ s/s//; - $status = int ($status / 8); - $status*= 8; - $status+= 8; + if ($status >= $align_sectors) { + $status = int ($status / $align_sectors); + $status*= $align_sectors; + $status+= $align_sectors; + } $this->{pStart} = $status; } my $sector = $this -> getSector ($size); @@ -5695,6 +5685,7 @@ #=========================================== # turn optional size from cmdline into bytes #------------------------------------------- + $this->{sizeSetByUser} = 0; if ($cmdlsize =~ /^(\d+)([MG])$/i) { my $value= $1; my $unit = $2; @@ -5716,6 +5707,7 @@ $kiwi -> oops(); } $minBytes = $cmdlBytes; + $this->{sizeSetByUser} = 1; } elsif ($XMLBytes > 0) { if ($XMLBytes < $minBytes) { $kiwi -> warning ( @@ -5723,6 +5715,7 @@ ); $kiwi -> oops(); } + $this->{sizeSetByUser} = 1; $minBytes = $XMLBytes; } #========================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWICommandLine.pm new/kiwi/modules/KIWICommandLine.pm --- old/kiwi/modules/KIWICommandLine.pm 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/modules/KIWICommandLine.pm 2012-03-02 16:26:37.000000000 +0100 @@ -1335,39 +1335,24 @@ } #========================================== -# setDiskBIOSHeads +# setDiskAlignment #------------------------------------------ -sub setDiskBIOSHeads { +sub setDiskAlignment { my $this = shift; my $value = shift; - $this->{BIOSHeads} = $value; + if (! defined $value) { + $value = $this->{gdata}->{DiskAlignment}; + } + $this->{PTableAlignment} = $value; return 1; } #========================================== -# getDiskBIOSHeads +# getDiskAlignment #------------------------------------------ -sub getDiskBIOSHeads { +sub getDiskAlignment { my $this = shift; - return $this->{BIOSHeads}; -} - -#========================================== -# setDiskBIOSSectors -#------------------------------------------ -sub setDiskBIOSSectors { - my $this = shift; - my $value = shift; - $this->{BIOSSectors} = $value; - return 1; -} - -#========================================== -# getDiskBIOSSectors -#------------------------------------------ -sub getDiskBIOSSectors { - my $this = shift; - return $this->{BIOSSectors}; + return $this->{PTableAlignment}; } #========================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2012-02-24 14:24:19.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2012-03-05 15:21:28.000000000 +0100 @@ -42,7 +42,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.02.14"; + $data{Version} = "5.02.17"; $data{Publisher} = "SUSE LINUX Products GmbH"; $data{Preparer} = "KIWI - http://kiwi.berlios.de"; $data{ConfigName} = "config.xml"; @@ -51,6 +51,7 @@ $data{FSInodeSize} = 256; $data{DiskStartSector} = 2048; $data{DiskSectorSize} = 512; + $data{DiskAlignment} = 4096; $data{SnapshotChunk} = 4096; $data{SnapshotCount} = "5G"; $data{OverlayRootTree} = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImageFormat.pm new/kiwi/modules/KIWIImageFormat.pm --- old/kiwi/modules/KIWIImageFormat.pm 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/modules/KIWIImageFormat.pm 2012-03-02 16:26:42.000000000 +0100 @@ -370,6 +370,9 @@ my $source = $this->{image}; my $format = $this->{format}; my $target = $source; + my $mods = "ext3 jbd xenblk"; + my $kmod = "INITRD_MODULES"; + my $sysk = "/etc/sysconfig/kernel"; my $aminame= basename $source; my $destdir= dirname $source; my $status; @@ -492,8 +495,15 @@ print $FD 'export rootdev=/dev/sda1'."\n"; print $FD 'export rootfstype='.$type{type}."\n"; print $FD 'mknod /dev/sda1 b 8 1'."\n"; - print $FD 'mkinitrd -B -A'."\n"; print $FD 'touch /boot/.rebuild-initrd'."\n"; + print $FD 'sed -i -e \'s@^'; + print $FD $kmod; + print $FD '="$.*$"@'.$kmod.'="\1 '; + print $FD $mods; + print $FD '"@\' '; + print $FD $sysk; + print $FD "\n"; + print $FD 'mkinitrd -B'."\n"; close $FD; qxx ("chmod u+x $tmpdir/create_initrd.sh"); $status = qxx ("chroot $tmpdir bash -c ./create_initrd.sh 2>&1"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2012-03-05 15:21:28.000000000 +0100 @@ -30,31 +30,17 @@ export bootLoaderOK=0 #====================================== -# Exports (arch specific) +# Exports (console) #-------------------------------------- -arch=`uname -m` -if [ "$arch" = "ppc64" ];then - test -z "$loader" && export loader=yaboot - test -z "$ELOG_BOOTSHELL" && export ELOG_BOOTSHELL=/dev/hvc0 - test -z "$ELOG_CONSOLE" && export ELOG_CONSOLE=/dev/hvc0 -elif [[ $arch =~ arm ]];then - test -z "$loader" && export loader=uboot - test -z "$ELOG_CONSOLE" && export ELOG_CONSOLE=/dev/tty3 - test -z "$ELOG_BOOTSHELL" && export ELOG_BOOTSHELL=/dev/tty2 -else - test -z "$loader" && export loader=grub - test -z "$ELOG_CONSOLE" && export ELOG_CONSOLE=/dev/tty3 - test -z "$ELOG_BOOTSHELL" && export ELOG_BOOTSHELL=/dev/tty2 -fi +test -z $ELOG_BOOTSHELL && export ELOG_BOOTSHELL=/dev/tty2 +test -z $ELOG_EXCEPTION && export ELOG_EXCEPTION=/dev/console #====================================== # Exports (General) #-------------------------------------- +test -z "$arch" && export arch=$(uname -m) test -z "$haveDASD" && export haveDASD=0 test -z "$haveZFCP" && export haveZFCP=0 -test -z "$ELOG_EXCEPTION" && export ELOG_EXCEPTION=/dev/tty1 -test -z "$KLOG_CONSOLE" && export KLOG_CONSOLE=4 -test -z "$KLOG_DEFAULT" && export KLOG_DEFAULT=1 test -z "$ELOG_STOPPED" && export ELOG_STOPPED=0 test -z "$PARTITIONER" && export PARTITIONER=parted test -z "$DEFAULT_VGA" && export DEFAULT_VGA=0x314 @@ -67,10 +53,6 @@ test -z "$PARTED_HAVE_ALIGN" && export PARTED_HAVE_ALIGN=0 test -z "$PARTED_HAVE_MACHINE"&& export PARTED_HAVE_MACHINE=0 test -z "$DHCPCD_HAVE_PERSIST"&& export DHCPCD_HAVE_PERSIST=1 -if [ -x /sbin/blogd ];then - test -z "$CONSOLE" && export CONSOLE=/dev/console - test -z "$REDIRECT" && export REDIRECT=/dev/tty1 -fi if which parted &>/dev/null;then if parted -h | grep -q '\-\-align';then export PARTED_HAVE_ALIGN=1 @@ -174,50 +156,6 @@ fi } #====================================== -# closeKernelConsole -#-------------------------------------- -function closeKernelConsole { - # /.../ - # close the kernel console, set level to 1 - # ---- - if [ -x /usr/sbin/klogconsole ];then - klogconsole -l 1 - fi -} -#====================================== -# openKernelConsole -#-------------------------------------- -function openKernelConsole { - # /.../ - # move the kernel console to terminal 3 as you can't see the messages - # now directly it looks like the kernel console is switched off - # but it isn't really. If DEBUG is set the logging remains on - # the first console - # ---- - if [ ! -x /usr/sbin/klogconsole ];then - return - fi - if test "$DEBUG" = 0;then - Echo "Kernel logging enabled on: /dev/tty$KLOG_CONSOLE" - setctsid /dev/tty$KLOG_CONSOLE \ - klogconsole -l 7 -r$KLOG_CONSOLE - fi -} -#====================================== -# reopenKernelConsole -#-------------------------------------- -function reopenKernelConsole { - # /.../ - # reopen kernel console to be able to see kernel messages - # while the system is booting - # ---- - if [ ! -x /usr/sbin/klogconsole ];then - return - fi - Echo "Kernel logging enabled on: /dev/tty$KLOG_DEFAULT" - klogconsole -l 7 -r$KLOG_DEFAULT -} -#====================================== # importFile #-------------------------------------- function importFile { @@ -541,8 +479,8 @@ #-------------------------------------- function errorLogStart { # /.../ - # Log all errors up to now to the terminal specified - # by ELOG_CONSOLE + # Log all errors and the bas debug information to the + # file set in ELOG_FILE. # ---- if [ ! -f $ELOG_FILE ];then #====================================== @@ -555,22 +493,22 @@ #-------------------------------------- startUtimer echo "KIWI PreInit Log" >> $ELOG_FILE - cat /iprocs | grep -v TAIL_PID > /iprocs fi - echo "Boot-Logging enabled on $ELOG_CONSOLE" - setctsid -f $ELOG_CONSOLE tail -f $ELOG_FILE & - exec 2>>$ELOG_FILE + #====================================== + # Contents of .profile environment + #-------------------------------------- if [ -f .profile ];then - echo "KIWI .profile contents:" 1>&2 - cat .profile 1>&2 - fi - set -x 1>&2 - local DTYPE=`stat -f -c "%T" /proc 2>/dev/null` - if test "$DTYPE" != "proc" ; then - mount -t proc proc /proc + echo "KIWI .profile contents:" >> $ELOG_FILE + cat .profile >> $ELOG_FILE fi - TAIL_PID=$(fuser $ELOG_CONSOLE | tr -d " ") - echo TAIL_PID=$TAIL_PID >> /iprocs + #====================================== + # Redirect stderr to ELOG_FILE + #-------------------------------------- + exec 2>>$ELOG_FILE + #====================================== + # Enable shell debugging and redirect + #-------------------------------------- + set -x } #====================================== # udevPending @@ -700,40 +638,6 @@ fi } #====================================== -# startBlogD -#-------------------------------------- -function startBlogD { - if test -n "$REDIRECT" ; then - mkdir -p /var/log - > /dev/shm/initrd.msg - ln -sf /dev/shm/initrd.msg /var/log/boot.msg - mkdir -p /var/run - startproc /sbin/blogd $REDIRECT - BLOGD_PID=$(pidof /sbin/blogd) - echo BLOGD_PID=$BLOGD_PID >> /iprocs - fi -} -#====================================== -# killBlogD -#-------------------------------------- -function killBlogD { - # /.../ - # kill blogd on /dev/console - # ---- - if test -n "$REDIRECT" ; then - local umountProc=0 - if [ ! -e /proc/mounts ];then - mount -t proc proc /proc - umountProc=1 - fi - Echo "Stopping boot logging" - . /iprocs ; kill $BLOGD_PID - if [ $umountProc -eq 1 ];then - umount /proc - fi - fi -} -#====================================== # installBootLoader #-------------------------------------- function installBootLoader { @@ -801,11 +705,33 @@ #-------------------------------------- function installBootLoaderUBoot { if [ -x /usr/bin/mkimage ];then + #====================================== + # create u-boot script and image + #-------------------------------------- mkimage -A arm -O linux -a 0 -e 0 -T script -C none \ -n 'Boot-Script' -d /boot/boot.script /boot/boot.scr if [ ! $? = 0 ];then Echo "Failed to create boot script image" fi + #====================================== + # install MLO + #-------------------------------------- + if [ -e /boot/MLO ];then + dd if=/boot/MLO of=$imageDiskDevice bs=128k count=1 seek=1 1>&2 + if [ ! $? = 0 ];then + Echo "Failed to install MLO" + fi + else + Echo "No MLO loader present in system image" + Echo "Install of MLO skipped" + fi + #====================================== + # avoid x86 boot code in the MBR + #-------------------------------------- + dd if=/dev/zero of=$imageDiskDevice bs=440 count=1 1>&2 + if [ ! $? = 0 ];then + Echo "Failed to clear MBR" + fi else Echo "Image doesn't have u-boot-tools installed" Echo "Can't create boot script image" @@ -2496,6 +2422,7 @@ echo "sysfs /sys sysfs noauto 0 0" >> $nfstab echo "debugfs /sys/kernel/debug debugfs noauto 0 0" >> $nfstab echo "usbfs /proc/bus/usb usbfs noauto 0 0" >> $nfstab + echo "tmpfs /run tmpfs noauto 0 0" >> $nfstab } #====================================== # updateRootDeviceFstab @@ -4420,10 +4347,6 @@ if [ ! -z "$kiwibrokenmodule" ];then kiwibrokenmodule=`echo $kiwibrokenmodule | tr , " "` fi - if [ ! -z "$kiwistderr" ];then - export ELOG_CONSOLE=$kiwistderr - export ELOG_EXCEPTION=$kiwistderr - fi if [ ! -z "$ramdisk_size" ];then local modfile=/etc/modprobe.d/99-local.conf if [ ! -f $modfile ];then @@ -5185,7 +5108,11 @@ # /.../ # start a debugging shell on ELOG_BOOTSHELL # ---- - if [ -z "$kiwistderr" ] && [ ! -z $kiwidebug ];then + if [ ! -z $kiwidebug ];then + if [ ! -e $ELOG_BOOTSHELL ];then + Echo "No terminal $ELOG_BOOTSHELL available for debug shell" + return + fi Echo "Starting boot shell on $ELOG_BOOTSHELL" setctsid -f $ELOG_BOOTSHELL /bin/bash -i ELOGSHELL_PID=$(fuser $ELOG_BOOTSHELL | tr -d " ") @@ -5781,8 +5708,9 @@ # move device nodes #-------------------------------------- Echo "Activating Image: [$name]" - reopenKernelConsole udevPending + mkdir -p /mnt/run + mkdir -p /mnt/dev mount --move /dev /mnt/dev mount --move /run /mnt/run udevKill @@ -5790,6 +5718,9 @@ # run preinit stage #-------------------------------------- Echo "Preparing preinit phase..." + if ! cp /usr/bin/utimer /mnt;then + systemException "Failed to copy utimer code" "reboot" + fi if ! cp /iprocs /mnt;then systemException "Failed to copy iprocs code" "reboot" fi @@ -5822,7 +5753,6 @@ #-------------------------------------- . /iprocs kill $UTIMER_PID &>/dev/null - kill $TAIL_PID &>/dev/null #====================================== # remove preinit code from system image #-------------------------------------- @@ -5936,7 +5866,6 @@ #-------------------------------------- . /iprocs kill $UTIMER_PID &>/dev/null - kill $TAIL_PID &>/dev/null #====================================== # copy boot log file into system image #-------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIRoot.pm new/kiwi/modules/KIWIRoot.pm --- old/kiwi/modules/KIWIRoot.pm 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/modules/KIWIRoot.pm 2012-03-02 16:26:37.000000000 +0100 @@ -1050,6 +1050,7 @@ } $kiwi -> done(); my %config = $xml -> getImageConfig(); + binmode($FD, ":utf8"); foreach my $key (keys %config) { $kiwi -> loginfo ("[PROFILE]: $key=\"$config{$key}\"\n"); print $FD "$key=\"$config{$key}\"\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-linuxrc new/kiwi/system/boot/armv7l/oemboot/suse-linuxrc --- old/kiwi/system/boot/armv7l/oemboot/suse-linuxrc 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/armv7l/oemboot/suse-linuxrc 2012-03-05 15:21:28.000000000 +0100 @@ -155,7 +155,6 @@ if [ ! -z "$OEM_SILENTBOOT" ];then test -e /proc/splash && echo verbose > /proc/splash fi -closeKernelConsole #====================================== # 2) Prepare module load support @@ -188,10 +187,8 @@ #====================================== # 5) start boot shell #-------------------------------------- -startBlogD startShell errorLogStart -openKernelConsole #====================================== # 6) Including required kernel modules @@ -641,7 +638,6 @@ # 25) kill boot shell #-------------------------------------- killShell -killBlogD #====================================== # 26) Activate new root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc new/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc --- old/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/armv7l/vmxboot/suse-linuxrc 2012-03-05 15:21:28.000000000 +0100 @@ -78,7 +78,6 @@ # 1) Mounting local file systems #-------------------------------------- mountSystemFilesystems &>/dev/null -closeKernelConsole #====================================== # 2) Prepare module load support @@ -107,10 +106,8 @@ #====================================== # 5) start boot shell #-------------------------------------- -startBlogD startShell errorLogStart -openKernelConsole #====================================== # 6) Including required kernel modules @@ -273,7 +270,6 @@ # 21) kill boot shell #-------------------------------------- killShell -killBlogD #====================================== # 22) Activate new root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/rhel-linuxrc new/kiwi/system/boot/ix86/isoboot/rhel-linuxrc --- old/kiwi/system/boot/ix86/isoboot/rhel-linuxrc 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/rhel-linuxrc 2012-03-05 15:21:28.000000000 +0100 @@ -53,7 +53,6 @@ # 1) Mounting local file systems #-------------------------------------- mountSystemFilesystems &>/dev/null -closeKernelConsole #====================================== # 2) probe for livecd_config in cmdline @@ -77,10 +76,8 @@ #====================================== # 5) start boot shell and logging #-------------------------------------- -startBlogD startShell errorLogStart -openKernelConsole #====================================== # 6) Including required kernel modules @@ -298,7 +295,6 @@ # 19) kill boot shell #-------------------------------------- killShell -killBlogD #====================================== # 20) Activate new root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-linuxrc new/kiwi/system/boot/ix86/isoboot/suse-linuxrc --- old/kiwi/system/boot/ix86/isoboot/suse-linuxrc 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-linuxrc 2012-03-05 15:21:28.000000000 +0100 @@ -53,7 +53,6 @@ # 1) Mounting local file systems #-------------------------------------- mountSystemFilesystems &>/dev/null -closeKernelConsole #====================================== # 2) probe for livecd_config in cmdline @@ -77,10 +76,8 @@ #====================================== # 5) start boot shell and logging #-------------------------------------- -startBlogD startShell errorLogStart -openKernelConsole #====================================== # 6) Including required kernel modules @@ -296,7 +293,6 @@ # 19) kill boot shell #-------------------------------------- killShell -killBlogD #====================================== # 20) Activate new root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-linuxrc new/kiwi/system/boot/ix86/netboot/suse-linuxrc --- old/kiwi/system/boot/ix86/netboot/suse-linuxrc 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2012-03-05 15:21:28.000000000 +0100 @@ -75,7 +75,6 @@ # 1) Mounting local file systems #-------------------------------------- mountSystemFilesystems &>/dev/null -closeKernelConsole #====================================== # 2) Prepare module load support @@ -105,10 +104,8 @@ #====================================== # 5) start boot shell #-------------------------------------- -startBlogD startShell errorLogStart -openKernelConsole #====================================== # 6) probe/load network module @@ -587,9 +584,7 @@ # 15.2) Check for local boot #-------------------------------------- if [ $LOCAL_BOOT = "yes" ];then - imageDisk=$(dn $root) - imageDevice=$(ddn $imageDisk 2) - imageRootDevice=$imageDevice + imageRootDevice=$root imageRootName="Local-System" if [ ! -z "$UNIONFS_CONFIG" ];then unionFST=$UNIONFS_CONFIG @@ -1045,7 +1040,6 @@ # 30) kill boot shell #-------------------------------------- killShell -killBlogD #====================================== # 31) Activate new root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-linuxrc new/kiwi/system/boot/ix86/oemboot/rhel-linuxrc --- old/kiwi/system/boot/ix86/oemboot/rhel-linuxrc 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/rhel-linuxrc 2012-03-05 15:21:28.000000000 +0100 @@ -155,7 +155,6 @@ if [ ! -z "$OEM_SILENTBOOT" ];then test -e /proc/splash && echo verbose > /proc/splash fi -closeKernelConsole #====================================== # 2) Prepare module load support @@ -188,10 +187,8 @@ #====================================== # 5) start boot shell #-------------------------------------- -startBlogD startShell errorLogStart -openKernelConsole #====================================== # 6) Including required kernel modules @@ -641,7 +638,6 @@ # 25) kill boot shell #-------------------------------------- killShell -killBlogD #====================================== # 26) Activate new root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml new/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml 2012-03-02 16:26:37.000000000 +0100 @@ -93,10 +93,12 @@ </packages> <packages type="image" profiles="xenk"> <package name="kernel-xen"/> + <package name="kernel-xen-base"/> <package name="xen"/> </packages> <packages type="image" profiles="ec2"> <package name="kernel-ec2"/> + <package name="kernel-ec2-base"/> </packages> <packages type="image" profiles="rt"> <package name="kernel-rt"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml new/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml 2012-03-02 16:26:37.000000000 +0100 @@ -94,11 +94,15 @@ </packages> <packages type="image" profiles="xenk"> <package name="kernel-xen"/> + <package name="kernel-xen-base"/>  <package name="xen" arch="x86_64"/> </packages> <packages type="image" profiles="ec2"> <package name="kernel-ec2"/> + <package name="kernel-ec2-base"/> + + <package name="xen" arch="x86_64"/> </packages> <packages type="image" profiles="rt"> <package name="kernel-rt"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-linuxrc new/kiwi/system/boot/ix86/oemboot/suse-linuxrc --- old/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2012-03-05 15:21:28.000000000 +0100 @@ -155,7 +155,6 @@ if [ ! -z "$OEM_SILENTBOOT" ];then test -e /proc/splash && echo verbose > /proc/splash fi -closeKernelConsole #====================================== # 2) Prepare module load support @@ -188,10 +187,8 @@ #====================================== # 5) start boot shell #-------------------------------------- -startBlogD startShell errorLogStart -openKernelConsole #====================================== # 6) Including required kernel modules @@ -641,7 +638,6 @@ # 25) kill boot shell #-------------------------------------- killShell -killBlogD #====================================== # 26) Activate new root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc new/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc --- old/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc 2012-03-05 15:21:28.000000000 +0100 @@ -78,7 +78,6 @@ # 1) Mounting local file systems #-------------------------------------- mountSystemFilesystems &>/dev/null -closeKernelConsole #====================================== # 2) Prepare module load support @@ -107,10 +106,8 @@ #====================================== # 5) start boot shell #-------------------------------------- -startBlogD startShell errorLogStart -openKernelConsole #====================================== # 6) Including required kernel modules @@ -273,7 +270,6 @@ # 21) kill boot shell #-------------------------------------- killShell -killBlogD #====================================== # 22) Activate new root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-11.4/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-11.4/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-11.4/config.xml 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-11.4/config.xml 2012-03-02 16:26:37.000000000 +0100 @@ -81,10 +81,12 @@ </packages> <packages type="image" profiles="xenk"> <package name="kernel-xen"/> + <package name="kernel-xen-base"/> <package name="xen"/> </packages> <packages type="image" profiles="ec2"> <package name="kernel-ec2"/> + <package name="kernel-ec2-base"/> </packages> <packages type="image" profiles="desktop"> <package name="kernel-desktop"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-12.1/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-12.1/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-12.1/config.xml 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-12.1/config.xml 2012-03-02 16:26:37.000000000 +0100 @@ -82,11 +82,15 @@ </packages> <packages type="image" profiles="xenk"> <package name="kernel-xen"/> + <package name="kernel-xen-base"/>  <package name="xen" arch="x86_64"/> </packages> <packages type="image" profiles="ec2"> <package name="kernel-ec2"/> + <package name="kernel-ec2-base"/> + + <package name="xen" arch="x86_64"/> </packages> <packages type="image" profiles="desktop"> <package name="kernel-desktop"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-linuxrc new/kiwi/system/boot/ix86/vmxboot/suse-linuxrc --- old/kiwi/system/boot/ix86/vmxboot/suse-linuxrc 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-linuxrc 2012-03-05 15:21:28.000000000 +0100 @@ -78,7 +78,6 @@ # 1) Mounting local file systems #-------------------------------------- mountSystemFilesystems &>/dev/null -closeKernelConsole #====================================== # 2) Prepare module load support @@ -107,10 +106,8 @@ #====================================== # 5) start boot shell #-------------------------------------- -startBlogD startShell errorLogStart -openKernelConsole #====================================== # 6) Including required kernel modules @@ -273,7 +270,6 @@ # 21) kill boot shell #-------------------------------------- killShell -killBlogD #====================================== # 22) Activate new root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-linuxrc new/kiwi/system/boot/ppc/netboot/suse-linuxrc --- old/kiwi/system/boot/ppc/netboot/suse-linuxrc 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/ppc/netboot/suse-linuxrc 2012-03-05 15:21:28.000000000 +0100 @@ -75,7 +75,6 @@ # 1) Mounting local file systems #-------------------------------------- mountSystemFilesystems &>/dev/null -closeKernelConsole #====================================== # 2) Prepare module load support @@ -105,10 +104,8 @@ #====================================== # 5) start boot shell #-------------------------------------- -startBlogD startShell errorLogStart -openKernelConsole #====================================== # 6) probe/load network module @@ -587,9 +584,7 @@ # 15.2) Check for local boot #-------------------------------------- if [ $LOCAL_BOOT = "yes" ];then - imageDisk=$(dn $root) - imageDevice=$(ddn $imageDisk 2) - imageRootDevice=$imageDevice + imageRootDevice=$root imageRootName="Local-System" if [ ! -z "$UNIONFS_CONFIG" ];then unionFST=$UNIONFS_CONFIG @@ -1045,7 +1040,6 @@ # 30) kill boot shell #-------------------------------------- killShell -killBlogD #====================================== # 31) Activate new root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-linuxrc new/kiwi/system/boot/ppc/oemboot/suse-linuxrc --- old/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2012-03-05 15:21:28.000000000 +0100 @@ -155,7 +155,6 @@ if [ ! -z "$OEM_SILENTBOOT" ];then test -e /proc/splash && echo verbose > /proc/splash fi -closeKernelConsole #====================================== # 2) Prepare module load support @@ -188,10 +187,8 @@ #====================================== # 5) start boot shell #-------------------------------------- -startBlogD startShell errorLogStart -openKernelConsole #====================================== # 6) Including required kernel modules @@ -641,7 +638,6 @@ # 25) kill boot shell #-------------------------------------- killShell -killBlogD #====================================== # 26) Activate new root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-linuxrc new/kiwi/system/boot/ppc/vmxboot/suse-linuxrc --- old/kiwi/system/boot/ppc/vmxboot/suse-linuxrc 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/ppc/vmxboot/suse-linuxrc 2012-03-05 15:21:28.000000000 +0100 @@ -78,7 +78,6 @@ # 1) Mounting local file systems #-------------------------------------- mountSystemFilesystems &>/dev/null -closeKernelConsole #====================================== # 2) Prepare module load support @@ -107,10 +106,8 @@ #====================================== # 5) start boot shell #-------------------------------------- -startBlogD startShell errorLogStart -openKernelConsole #====================================== # 6) Including required kernel modules @@ -274,7 +271,6 @@ # 21) kill boot shell #-------------------------------------- killShell -killBlogD #====================================== # 22) Activate new root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-linuxrc new/kiwi/system/boot/s390/netboot/suse-linuxrc --- old/kiwi/system/boot/s390/netboot/suse-linuxrc 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/s390/netboot/suse-linuxrc 2012-03-05 15:21:29.000000000 +0100 @@ -87,7 +87,6 @@ # 1) Mounting local file systems #-------------------------------------- mountSystemFilesystems &>/dev/null -closeKernelConsole #====================================== # 2) Prepare module load support @@ -117,10 +116,8 @@ #====================================== # 5) start boot shell #-------------------------------------- -startBlogD startShell errorLogStart -openKernelConsole #====================================== # 6) probe/load network module @@ -603,9 +600,7 @@ # 15.2) Check for local boot #-------------------------------------- if [ $LOCAL_BOOT = "yes" ];then - imageDisk=$(dn $root) - imageDevice=$(ddn $imageDisk 2) - imageRootDevice=$imageDevice + imageRootDevice=$root imageRootName="Local-System" if [ ! -z "$UNIONFS_CONFIG" ];then unionFST=$UNIONFS_CONFIG @@ -1053,7 +1048,6 @@ # 29) kill boot shell #-------------------------------------- killShell -killBlogD #====================================== # 30) Activate new root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-linuxrc new/kiwi/system/boot/s390/oemboot/suse-linuxrc --- old/kiwi/system/boot/s390/oemboot/suse-linuxrc 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/s390/oemboot/suse-linuxrc 2012-03-05 15:21:29.000000000 +0100 @@ -155,7 +155,6 @@ if [ ! -z "$OEM_SILENTBOOT" ];then test -e /proc/splash && echo verbose > /proc/splash fi -closeKernelConsole #====================================== # 2) Prepare module load support @@ -188,10 +187,8 @@ #====================================== # 5) start boot shell #-------------------------------------- -startBlogD startShell errorLogStart -openKernelConsole #====================================== # 6) Including required kernel modules @@ -645,7 +642,6 @@ # 25) kill boot shell #-------------------------------------- killShell -killBlogD #====================================== # 26) Activate new root diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-linuxrc new/kiwi/system/boot/s390/vmxboot/suse-linuxrc --- old/kiwi/system/boot/s390/vmxboot/suse-linuxrc 2012-02-23 16:23:38.000000000 +0100 +++ new/kiwi/system/boot/s390/vmxboot/suse-linuxrc 2012-03-05 15:21:29.000000000 +0100 @@ -78,7 +78,6 @@ # 1) Mounting local file systems #-------------------------------------- mountSystemFilesystems &>/dev/null -closeKernelConsole #====================================== # 2) Prepare module load support @@ -107,10 +106,8 @@ #====================================== # 5) start boot shell #-------------------------------------- -startBlogD startShell errorLogStart -openKernelConsole #====================================== # 6) Including required kernel modules @@ -277,7 +274,6 @@ # 21) kill boot shell #-------------------------------------- killShell -killBlogD #====================================== # 22) Activate new root -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit irssi for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package irssi for openSUSE:Factory checked in at 2012-03-06 13:38:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/irssi (Old) and /work/SRC/openSUSE:Factory/.irssi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "irssi", Maintainer is "MRueckert(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/irssi/irssi.changes 2011-09-23 02:03:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.irssi.new/irssi.changes 2012-03-06 13:38:05.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 13 10:47:57 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ irssi.spec ++++++ --- /var/tmp/diff_new_pack.OStwBo/_old 2012-03-06 13:38:07.000000000 +0100 +++ /var/tmp/diff_new_pack.OStwBo/_new 2012-03-06 13:38:07.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package irssi (Version 0.8.15) +# spec file for package irssi # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,19 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: irssi Version: 0.8.15 -Release: 1 +Release: 0 %define pkg_name irssi # -License: GPLv2+ -Group: Productivity/Networking/IRC # BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: glib2-devel ncurses-devel openssl-devel pkgconfig +BuildRequires: glib2-devel +BuildRequires: ncurses-devel +BuildRequires: openssl-devel +BuildRequires: pkgconfig %if 0%{?suse_version} BuildRequires: update-desktop-files %endif @@ -45,6 +44,8 @@ Patch: irssi-0.8.15_ssl_proxy.patch # Summary: Modular, Secure, and Well Designed IRC Client +License: GPL-2.0+ +Group: Productivity/Networking/IRC %if 0%{?suse_version} > 1130 %{perl_requires} %else @@ -69,11 +70,10 @@ Timo Sirainen <cras(a)irssi.org> %package devel -License: GPLv2+ -Group: Development/Languages/C and C++ Requires: %{pkg_name} = %{version} # Summary: Development package for irssi +Group: Development/Languages/C and C++ %description devel This package contains the development files for irssi. It allows to -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit icedtea-web for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package icedtea-web for openSUSE:Factory checked in at 2012-03-06 13:37:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icedtea-web (Old) and /work/SRC/openSUSE:Factory/.icedtea-web.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icedtea-web", Maintainer is "bnc-team-java(a)forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/icedtea-web/icedtea-web.changes 2011-11-14 13:59:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.icedtea-web.new/icedtea-web.changes 2012-03-06 13:38:00.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 5 13:24:29 UTC 2012 - mvyskocil(a)suse.cz + +- enable make check in respective section + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icedtea-web.spec ++++++ --- /var/tmp/diff_new_pack.BfkmLg/_old 2012-03-06 13:38:01.000000000 +0100 +++ /var/tmp/diff_new_pack.BfkmLg/_new 2012-03-06 13:38:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package icedtea-web # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -54,10 +54,10 @@ Name: icedtea-web Version: 1.1.4 -Release: 1 +Release: 0 Summary: Java Web Start and plugin implementation -Group: Development/Languages/Java License: GPL-2.0-with-classpath-exception +Group: Development/Languages/Java Url: http://icedtea.classpath.org Source0: http://icedtea.classpath.org/download/source/%{name}-%{version}.tar.gz Patch0: icedtea-web-1.0.2-no-return-in-nonvoid-function.patch @@ -85,8 +85,8 @@ %endif %if %defined suse_version BuildRequires: fdupes -BuildRequires: procps BuildRequires: gcc-c++ +BuildRequires: procps BuildRequires: update-desktop-files BuildRequires: zip %endif @@ -161,6 +161,9 @@ %clean rm -rf %{buildroot} +%check +%{__make} check + %posttrans # java-1_6_0-openjdk-plugin -> icedtea-web is remove of the first package # which causes a javaplugin removal, so let's move it here -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit conky for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package conky for openSUSE:Factory checked in at 2012-03-06 13:37:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/conky (Old) and /work/SRC/openSUSE:Factory/.conky.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "conky", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/conky/conky.changes 2011-10-11 18:24:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2012-03-06 13:37:46.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Feb 29 08:55:12 UTC 2012 - cfarrell(a)suse.com + +- license update: GPL-3.0+ + See the COPYING file + +------------------------------------------------------------------- +Mon Jan 30 08:47:15 UTC 2012 - coolo(a)suse.com + +- use lua51 on factory + +------------------------------------------------------------------- +Thu Jan 12 11:30:32 UTC 2012 - coolo(a)suse.com + +- change license to be in spdx.org format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ conky.spec ++++++ --- /var/tmp/diff_new_pack.vRyiGl/_old 2012-03-06 13:37:47.000000000 +0100 +++ /var/tmp/diff_new_pack.vRyiGl/_new 2012-03-06 13:37:47.000000000 +0100 @@ -1,5 +1,21 @@ # vim: set sw=4 ts=4 et: - +# +# spec file for package conky +# +# Copyright (c) 2012 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/ +# +# %if 0%{?suse_version} >= 1100 %define with_lua_extra 1 %else @@ -10,6 +26,8 @@ Version: 1.8.1 Release: 0 Summary: Lightweight System Monitor +License: GPL-3.0+ +Group: System/Monitoring Source: http://prdownloads.sourceforge.net/conky/conky-%{version}.tar.bz2 Source1: conky.desktop # PATCH-FIX-UPSTREAM - conky-fix-curl-FTBFS.patch - remove deprecated curl/types.h to fix FTBFS in newer versions of curl, http://tinyurl.com/4x76bbx @@ -19,22 +37,27 @@ # PATCH-FIX - add -lm when linking against -liw Patch1: conky-libiw_with_libm.patch Source99: conky-rpmlintrc -URL: http://conky.sourceforge.net -Group: System/Monitoring -License: BSD license (revised) -BuildRoot: %{_tmppath}/build-%{name}-%{version} -BuildRequires: make gcc fontconfig-devel freetype2-devel +Url: http://conky.sourceforge.net +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: fontconfig-devel +BuildRequires: freetype2-devel +BuildRequires: gcc +BuildRequires: make BuildRequires: xorg-x11-devel %if 0%{?suse_version} >= 1120 BuildRequires: libiw-devel %else BuildRequires: wireless-tools %endif -BuildRequires: libpng-devel zlib-devel glib2-devel +BuildRequires: glib2-devel +BuildRequires: libpng-devel +BuildRequires: zlib-devel BuildRequires: xorg-x11-devel BuildRequires: cairo-devel BuildRequires: update-desktop-files -BuildRequires: autoconf automake libtool +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: docbook2x BuildRequires: alsa-devel %if %with_lua_extra @@ -48,8 +71,12 @@ BuildRequires: ncurses-devel %if 0%{?suse_version} >= 1020 %define with_lua 1 +%if 0%{?suse_version} >= 1220 +BuildRequires: lua51-devel +%else BuildRequires: lua-devel %endif +%endif %if 0%{?suse_version} >= 1020 || 0%{?fedora_version} > 0 %if 0%{?sles_version} < 11 BuildRequires: vim-enhanced @@ -111,8 +138,8 @@ %package vim Summary: Conky Configuration File Support for Vim -Requires: vim-base Group: Productivity/Editors/Vi +Requires: vim-base %description vim Conky is an advanced, highly configurable system monitor for X. @@ -122,8 +149,8 @@ %package nano Summary: Conky Configuration File Support for nano -Requires: nano Group: Productivity/Editors/Other +Requires: nano %description nano Conky is an advanced, highly configurable system monitor for X. @@ -310,3 +337,4 @@ %doc README.feature-nvidia %endif +%changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit calibre for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package calibre for openSUSE:Factory checked in at 2012-03-06 13:37:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calibre (Old) and /work/SRC/openSUSE:Factory/.calibre.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "calibre", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/calibre/calibre.changes 2012-02-16 12:18:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.calibre.new/calibre.changes 2012-03-06 13:37:41.000000000 +0100 @@ -1,0 +2,55 @@ +Sun Mar 4 20:40:26 UTC 2012 - Sascha.Manns(a)open-slx.de + +- update to 0.8.41 +- New Features + + * Driver for Sony Experia Play 4G Closes tickets: 938831 [External link] + * News download system: Allow use of __future__ in recipes, and do +not change line numbers of code in the recipe when compiling it + * Use the My Documents folder as the default location for the +Calibre Library folder on first start in windows Closes tickets: 934840 [External link] + * Add a tweak to Preferences->Tweaks to control the order in which +categories appear in the Tag Browser + * Tag Browser: Add an entry to the right click menu to quickly +delete tags Closes tickets: 934509 [External link] + * Amazon metadata download: Try to scrape series information from +the amazon details page. Note that currently very few books have +series info available. Often the page for hardcover will have series, +but the Kindle edition will not. In such cases calibre may or may not +find the series, depending on which page it ends up using. + * Content server: Add favicon to OPDS feeds. Closes tickets: 934731 [External link] + +- Bug Fixes + + * RTF Input: Fix some WMF images embedded in RTF files being +distorted on conversion. Closes tickets: 934167 [External link] + * Fix long standing bug preventing calibre from working on east +asian windows installs when the user name in windows has non-ascii +characters Closes tickets: 937389 [External link] + * Get Books: Fix Baen Webscription and O'Reilly stores. Fix price +detection for Google Books + * MOBI Output: When the same anchor is present more than once in the +input document, use the first occurrence rather than the last one. Closes tickets: 934031 [External link] + * Use the 'default cover font' tweak when generating default +masthead images as well Closes tickets: 939256 [External link] + * Fix content server does not correctly display custom field of type +'rating' Closes tickets: 938303 [External link] + * Fix welcome wizard does not save send-from email info unless +send-to field is filled Closes tickets: 937087 [External link] + * When reading metadata from odt files, use initial-creator in +preference to creator for setting the author field Closes tickets: 934564 [External link] + * Fix conversion erroring out when the input document has very long +and thin images Closes tickets: 935234 [External link] + +- New news sources + + * La pausa caffe by faber1971 + * Various Polish news sources by fenuks + +- Improved news sources + + * The Sun + * Various Polish news sources + * Mediapart + +------------------------------------------------------------------- Old: ---- calibre-0.8.39-nofonts.tar.bz2 New: ---- calibre-0.8.41-nofonts.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calibre.spec ++++++ --- /var/tmp/diff_new_pack.jRF64K/_old 2012-03-06 13:37:44.000000000 +0100 +++ /var/tmp/diff_new_pack.jRF64K/_new 2012-03-06 13:37:44.000000000 +0100 @@ -21,7 +21,7 @@ Group: Productivity/Other Name: calibre -Version: 0.8.39 +Version: 0.8.41 Release: 0 Url: http://calibre-ebook.com # Getting and modifying the sources ++++++ calibre-0.8.39-nofonts.tar.bz2 -> calibre-0.8.41-nofonts.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/calibre/calibre-0.8.39-nofonts.tar.bz2 /work/SRC/openSUSE:Factory/.calibre.new/calibre-0.8.41-nofonts.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aspell-dictionaries for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package aspell-dictionaries for openSUSE:Factory checked in at 2012-03-06 13:37:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aspell-dictionaries (Old) and /work/SRC/openSUSE:Factory/.aspell-dictionaries.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aspell-dictionaries", Maintainer is "PGajdos(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/aspell-dictionaries/aspell-dictionaries.changes 2011-09-23 01:52:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aspell-dictionaries.new/aspell-dictionaries.changes 2012-03-06 13:37:35.000000000 +0100 @@ -1,0 +2,27 @@ +Tue Feb 7 08:00:45 UTC 2012 - pgajdos(a)suse.com + +- fixed licenses [bnc#745038] + +------------------------------------------------------------------- +Thu Feb 2 19:25:05 UTC 2012 - asterios.dramis(a)gmail.com + +- Changed version of aspell-el to 0.50.3+0.08 to fix package upgrades. Removed + the Obsoletes: entry which doesn't work. + +------------------------------------------------------------------- +Wed Jan 25 20:20:23 UTC 2012 - asterios.dramis(a)gmail.com + +- Updated aspell-el to version 0.08. +- Spec file updates: + * Changes based on spec-cleaner run. + * Unified summaries and descriptions for all subpackages. + * The version numbering for aspell-el was changed so an Obsoletes: entry was + added for the old version. + * Added a Conflict between aspell-hi and aspell-mr subpackages since they + both provide u-deva.cmap and u-deva.cset files. + * Fixed the following rpmlint warnings for some subpackages: + - wrong-file-end-of-line-encoding + - zero-length + - install-file-in-docs + +------------------------------------------------------------------- Old: ---- aspell-el-0.50-3.tar.bz2 New: ---- aspell6-el-0.08-0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aspell-dictionaries.spec ++++++ ++++ 2283 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/aspell-dictionaries/aspell-dictionaries.spec ++++ and /work/SRC/openSUSE:Factory/.aspell-dictionaries.new/aspell-dictionaries.spec ++++++ aspell-el-0.50-3.tar.bz2 -> aspell6-el-0.08-0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell-el-0.50-3/COPYING new/aspell6-el-0.08-0/COPYING --- old/aspell-el-0.50-3/COPYING 2002-10-12 20:54:56.000000000 +0200 +++ new/aspell6-el-0.08-0/COPYING 2009-02-27 23:35:22.000000000 +0100 @@ -1,8 +1,8 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -15,7 +15,7 @@ General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,7 +55,7 @@ The precise terms and conditions for copying, distribution and modification follow. - + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -110,7 +110,7 @@ License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -278,7 +278,7 @@ POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest @@ -303,10 +303,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + 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. Also add information on how to contact you by electronic and paper mail. @@ -336,5 +335,5 @@ This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell-el-0.50-3/Copyright new/aspell6-el-0.08-0/Copyright --- old/aspell-el-0.50-3/Copyright 2002-03-16 14:02:47.000000000 +0100 +++ new/aspell6-el-0.08-0/Copyright 2008-09-30 01:27:11.000000000 +0200 @@ -1,20 +1,2 @@ -greek: Evripidis Papakostas Dictionary for Spell Checking -Copyright � 2000, 2001, 2002 Evripidis Papakostas -<email:evris@source.gr> <url:http://ispell.source.gr> - -Dictionary v.003 - - - This dictionary is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This dictionary is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this dictionary; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Copyright (c) 2003 - 2008 by Steve Stavropoulos <steve(a)math.upatras.gr> under the GPL. +Copyright (c) 2000, 2001, 2002 by Evripidis Papakostas <evris(a)source.gr> under the GPL. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell-el-0.50-3/Makefile.pre new/aspell6-el-0.08-0/Makefile.pre --- old/aspell-el-0.50-3/Makefile.pre 2002-10-12 20:54:56.000000000 +0200 +++ new/aspell6-el-0.08-0/Makefile.pre 2009-02-27 23:35:22.000000000 +0100 @@ -1,17 +1,16 @@ -# Generated with Aspell Dicts "proc" script version 0.50.2 +# Generated with Aspell Dicts "proc" script version 0.60.4 lang = el -version = 0.50-3 +version = 0.08-0 cwl_files = el.cwl -data_files = el.dat el_phonet.dat +data_files = el.dat el_phonet.dat el.kbd doc_files = README COPYING Copyright extra_files = configure info Makefile.pre -multi_files = el.multi greek.alias +multi_files = el.multi gr.alias greek.alias rws_files = el.rws - -distdir=aspell-${lang}-${version} +distdir=aspell6-${lang}-${version} all: ${rws_files} ${data_files} @@ -26,21 +25,29 @@ clean: rm -f ${rws_files} +distclean: clean + rm -f Makefile + +maintainer-clean: distclean + rm -f ${multi_files} configure Makefile.pre + uninstall: -cd ${DESTDIR}${dictdir}/ && rm ${rws_files} ${multi_files} ${link_files} -cd ${DESTDIR}${datadir}/ && rm ${data_files} -dist: +dist: ${cwl_files} perl proc ./configure @make dist-nogen dist-nogen: - -rm -r ${distdir} + -rm -r ${distdir}.tar.bz2 ${distdir} mkdir ${distdir} cp -p ${extra_files} ${cwl_files} ${multi_files} ${doc_files} ${data_files} ${distdir}/ - -cp -pr doc/ ${distdir}/ - gtar cfj ${distdir}.tar.bz2 ${distdir}/ + -test -e doc && mkdir ${distdir}/doc && chmod 755 ${distdir}/doc && cp -pr doc/* ${distdir}/doc/ + -test -e misc && mkdir ${distdir}/misc && chmod 755 ${distdir}/misc && cp -pr misc/* ${distdir}/misc/ + tar cf ${distdir}.tar ${distdir}/ + bzip2 -9 ${distdir}.tar rm -r ${distdir}/ distcheck: @@ -54,8 +61,14 @@ el.rws: el.cwl -.SUFFIXES: .cwl .rws +.SUFFIXES: .cwl .rws .wl .cwl.rws: - ${WORD_LIST_COMPRESS} d < $< | ${ASPELL} ${ASPELL_FLAGS} --lang=el create master ./$@ + ${PREZIP} -d < $< | ${ASPELL} ${ASPELL_FLAGS} --lang=el create master ./$@ + +.wl.cwl: + cat $< | LC_COLLATE=C sort -u | ${PREZIP} -z > $@ + +.pz: + ${PREZIP} -d < $< > $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell-el-0.50-3/README new/aspell6-el-0.08-0/README --- old/aspell-el-0.50-3/README 2002-10-12 20:54:56.000000000 +0200 +++ new/aspell6-el-0.08-0/README 2009-02-27 23:35:22.000000000 +0100 @@ -1,17 +1,19 @@ -GNU Aspell Greek Word List Package -Version 0.50-3 -2002-09-12 -by Kevin Atkinson (kevina(a)gnu.org) -Word List by: - Evripidis Papakostas (evris at source gr) -Copyright Terms: GPL -see the file Copyright for the exact copyright. -Source Verson: 0.03 -Source URL: http://ispell.source.gr/index_aspell.html +GNU Aspell 0.60 Greek (Ελληνικά) Dictionary Package +Version 0.08-0 +2009-02-28 +Maintained By: + Steve Stavropoulos (Σταύρος Σταυρόπουλος) <steve at math upatras gr>> +Original Word List Also By: + Evripidis Papakostas <evris at source gr> +Copyright Terms: GPLv2 (see the file Copyright for the exact terms) +Wordlist URL: http://elspell.math.upatras.gr/ +Source Verson: 0.08 +This word list is considered both complete and accurate. -This is the Aspell word list for Greek. +This is the Greek dictionary for Aspell. It requires Aspell +version 0.60 or better. -If Aspell is installed and aspell and word-list-compress are all +If Aspell is installed and aspell and prezip-bin are all in the path first do a: ./configure @@ -29,7 +31,7 @@ make install If any of the above mentioned programs are not in your path than the -variables, ASPELL and/or WORD_LIST_COMPRESS need to be set to the +variables, ASPELL and/or PREZIP need to be set to the commands (with path) to run the utilities. These variables may be set in the environment before configure is run or specified at the command line using the following syntax @@ -42,20 +44,29 @@ To uninstall the files: make uninstall -After the word lists are installed you can use the main one (el) by +After the dictionaries are installed you can use the main one (el) by setting the LANG environmental variable to el or running Aspell -with --lang=el. You may also chose the dictionary directly -with the -d or --master option of Aspell. You can chose from any of +with "--lang=el". You may also chose the dictionary directly +with the "-d" or "--master" option of Aspell. You can chose from any of the following dictionaries: - el (greek) + el (gr greek) Whereas the names in parentheses are alternate names for the dictionary preceding the parentheses. +The individual word lists have an extension of ".cwl" and are +compressed to save space. To uncompress a word list use +"preunzip BASE.cwl" which will uncompress it and rename the file +to "BASE.wl". To dump a compressed word list to standard output use +"precat BASE.cwl". To uncompress all word lists in the current +directory use "preunzip *.cwl". For more help on "preunzip" use +"preunzip --help". + If you have any problem with installing or using the word lists please -let me (Kevin Atkinson) know. +let the Aspell maintainer, Kevin Atkinson, know at kevina(a)gnu.org. If you have problems with the actual word lists please contact one of -the Word lists authors as I do not maintain the actual Word Lists. +the Word lists authors as the Aspell maintainer does not maintain the +actual Word Lists. Any additional documentation that came with the original word list can be found in the doc/ directory. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell-el-0.50-3/configure new/aspell6-el-0.08-0/configure --- old/aspell-el-0.50-3/configure 2002-08-26 06:55:53.000000000 +0200 +++ new/aspell6-el-0.08-0/configure 2009-02-27 23:35:22.000000000 +0100 @@ -41,10 +41,12 @@ fi # Taken from autoconf 2.50 envvar=`expr "x$option" : 'x$[^=]*$='` + optarg=`expr "x$option" : 'x[^=]*=$.*$'` # Reject names that are not valid shell variable names. expr "x$envvar" : ".*[^_$cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $envvar" >&2 { (exit 1); exit 1; }; } + #echo $envvar $optarg optarg=`echo "$optarg" | sed "s/'/'\\\\\\\\''/g"` eval "$envvar='$optarg'" export $envvar @@ -52,7 +54,7 @@ --help) echo "Usage: ./configure [--help | --vars VAR1=VAL1 ...]" echo " Note: Variables may also be set in the environment brefore running config" - echo " Useful vars: ASPELL ASPELL_PARMS WORD_LIST_COMPRESS DESTDIR" + echo " Useful vars: ASPELL ASPELL_PARMS PREZIP DESTDIR" exit 0 ;; *) @@ -62,10 +64,12 @@ esac done +#echo $ASPELL if test x = "x$ASPELL" then ASPELL=aspell; fi -if test x = "x$WORD_LIST_COMPRESS" - then WORD_LIST_COMPRESS=word-list-compress; fi +if test x = "x$PREZIP" + then PREZIP=prezip-bin; fi +#echo $ASPELL echo $ECHO_N "Finding Dictionary file location ... $ECHO_C" dictdir=`$ASPELL dump config dict-dir` @@ -75,9 +79,9 @@ datadir=`$ASPELL dump config data-dir` echo $datadir -echo "ASPELL = $ASPELL" > Makefile +echo "ASPELL = `which $ASPELL`" > Makefile echo "ASPELL_FLAGS = $ASPELL_FLAGS" >> Makefile -echo "WORD_LIST_COMPRESS = $WORD_LIST_COMPRESS" >> Makefile +echo "PREZIP = `which $PREZIP`" >> Makefile echo "DESTDIR = $DESTDIR" >> Makefile echo "dictdir = $dictdir" >> Makefile echo "datadir = $datadir" >> Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell-el-0.50-3/doc/Contributors new/aspell6-el-0.08-0/doc/Contributors --- old/aspell-el-0.50-3/doc/Contributors 2002-03-14 04:32:21.000000000 +0100 +++ new/aspell6-el-0.08-0/doc/Contributors 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -Evripidis Papakostas -Voula Sanida -Panayiotis Pakos -Panayiotis Vryonis -Panayiotis Louridas -Panayiotis Tsakiris -Mixalis Kabrianis -George Eftsathiou -Prokopis Prokopidis -Nikos Seraskeris -Giannis Mitalas -Diomidis Spinelis -Vaggelis Papadogiannakis (and Wise.gr for the hosting) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell-el-0.50-3/doc/README new/aspell6-el-0.08-0/doc/README --- old/aspell-el-0.50-3/doc/README 2002-10-11 21:21:25.000000000 +0200 +++ new/aspell6-el-0.08-0/doc/README 2008-12-14 14:31:09.000000000 +0100 @@ -1,21 +1,58 @@ - Evripidis Papakostas Greek Dictionary (v0.03) +name : el_GR 0.8 version of the greek dictionary +dd/mm/yyyy: 14/12/2008 +License : MPL 1.1/GPL 2.0/LGPL 2.1 +contact : Steve Stavropoulos +URL : http://elspell.math.upatras.gr + + This release added 13596 new correct words to the 0.7 release. Thanks +go to Alexios Zavras and Nick Demou. + The dictionary is triple licenced now and it is based on earlier work +done by Evripidis Papakostas. [mentioned below] + The new licence is also mentioned below. + + Steve Stavropoulos + +================== + +name : el_GR (v.003) Enhanced Version +dd/mm/yyyy: 08/02/2002 +License : GNU GPL +contact : evris(a)source.gr +URL : ispell.source.gr +----------------------------------------------- +This dictionary is based on greek wordlist and affixes used by ispell +(which based on older work of Mitalas and Seraskeris). Many thanks to +Voula Sanida (voulariba(a)source.gr) and Panayotis Vryonis (vrypan(a)yassou.net) +for their help in converting the affix rules and to all the people that +contributed words to the vocabulary. +Evripidis Papakostas (evris(a)source.gr) + +================== + +The new Licence: + +Version: MPL 1.1/GPL 2.0/LGPL 2.1 + +The contents of this file are subject to the Mozilla Public License Version +1.1 (the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at +http://www.mozilla.org/MPL/ + +Software distributed under the License is distributed on an "AS IS" basis, +WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +for the specific language governing rights and limitations under the +License. + +Alternatively, the contents of this file may be used under the terms of +either the GNU General Public License Version 2 or later (the "GPL"), or +the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +in which case the provisions of the GPL or the LGPL are applicable instead +of those above. If you wish to allow use of your version of this file only +under the terms of either the GPL or the LGPL, and not to allow others to +use your version of this file under the terms of the MPL, indicate your +decision by deleting the provisions above and replace them with the notice +and other provisions required by the GPL or the LGPL. If you do not delete +the provisions above, a recipient may use your version of this file under +the terms of any one of the MPL, the GPL or the LGPL. -These words have been verified as correct from at least two reviewers as -well as some commercial spellchecker progs. Despite that, it is a fact -that every time a new reviewer scans the list, wrong words are found. - -You can read more about the project or download new ispell, aspell, -openoffice myspell etc versions at: - - http://ispell.source.gr - -For any suggestions, corrections, ideas : - evris(a)source.gr or - ep(a)rocketmail.com - evris(a)gourmet.gr ----------------------------------------------------------------------------- - -You install the aspell wordlist with the commands: - - $ make all ; make install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell-el-0.50-3/doc/el.kbd new/aspell6-el-0.08-0/doc/el.kbd --- old/aspell-el-0.50-3/doc/el.kbd 2002-03-27 00:07:22.000000000 +0100 +++ new/aspell6-el-0.08-0/doc/el.kbd 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -;� -�� -�� -�� -�� -�� -�� -�� -�� -�� -�� -�� -�� -�� -�� -�� -�� -�� -�� -�� -�� -�� -�� - Files old/aspell-el-0.50-3/el.cwl and new/aspell6-el-0.08-0/el.cwl differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell-el-0.50-3/el.dat new/aspell6-el-0.08-0/el.dat --- old/aspell-el-0.50-3/el.dat 2002-10-12 20:54:56.000000000 +0200 +++ new/aspell6-el-0.08-0/el.dat 2009-02-27 23:32:03.000000000 +0100 @@ -1,5 +1,6 @@ -# Generated with Aspell Dicts "proc" script version 0.50.2 name el -charset iso8859-7 -special ' -** - -** . -** +charset iso-8859-7 +#special ' -** - -** . -** soundslike el +keyboard el +#data-encoding utf-8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell-el-0.50-3/el.kbd new/aspell6-el-0.08-0/el.kbd --- old/aspell-el-0.50-3/el.kbd 1970-01-01 01:00:00.000000000 +0100 +++ new/aspell6-el-0.08-0/el.kbd 2008-12-14 14:20:21.000000000 +0100 @@ -0,0 +1,26 @@ +# Greek keyboard data file + +;ς +ςε +ερ +ρτ +τυ +υθ +θι +ιο +οπ +ασ +σδ +δφ +φγ +γη +ηξ +ξκ +κλ +ζχ +χψ +ψω +ωβ +βν +νμ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell-el-0.50-3/el.multi new/aspell6-el-0.08-0/el.multi --- old/aspell-el-0.50-3/el.multi 2002-10-12 20:54:56.000000000 +0200 +++ new/aspell6-el-0.08-0/el.multi 2009-02-27 23:35:22.000000000 +0100 @@ -1,2 +1,2 @@ -# Generated with Aspell Dicts "proc" script version 0.50.2 +# Generated with Aspell Dicts "proc" script version 0.60.4 add el.rws diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell-el-0.50-3/gr.alias new/aspell6-el-0.08-0/gr.alias --- old/aspell-el-0.50-3/gr.alias 1970-01-01 01:00:00.000000000 +0100 +++ new/aspell6-el-0.08-0/gr.alias 2009-02-27 23:35:22.000000000 +0100 @@ -0,0 +1,2 @@ +# Generated with Aspell Dicts "proc" script version 0.60.4 +add el.multi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell-el-0.50-3/greek.alias new/aspell6-el-0.08-0/greek.alias --- old/aspell-el-0.50-3/greek.alias 2002-10-12 20:54:56.000000000 +0200 +++ new/aspell6-el-0.08-0/greek.alias 2009-02-27 23:35:22.000000000 +0100 @@ -1,2 +1,2 @@ -# Generated with Aspell Dicts "proc" script version 0.50.2 +# Generated with Aspell Dicts "proc" script version 0.60.4 add el.multi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell-el-0.50-3/info new/aspell6-el-0.08-0/info --- old/aspell-el-0.50-3/info 2002-10-12 20:01:55.000000000 +0200 +++ new/aspell6-el-0.08-0/info 2008-12-14 14:18:36.000000000 +0100 @@ -1,16 +1,23 @@ name_english Greek +name_native Ελληνικά lang el author: + name Steve Stavropoulos + name-native Σταύρος Σταυρόπουλος + email steve at math upatras gr> + maintainer true +author: name Evripidis Papakostas email evris at source gr -copyright GPL -version 0.50-3 -charset iso8859-7 -special ' -** - -** . -** -soundslike phonet -source-version 0.03 -url http://ispell.source.gr/index_aspell.html -alias el greek +copyright GPLv2 +url http://elspell.math.upatras.gr/ +version 0.08-0 +source-version 0.08 +data_file el_phonet.dat +data_file el.kbd +accurate true +complete true +alias el greek gr dict: name el add el -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit arpwatch-ethercodes for openSUSE:Factory
by root＠hilbert.suse.de 06 Mar '12

06 Mar '12

Hello community, here is the log from the commit of package arpwatch-ethercodes for openSUSE:Factory checked in at 2012-03-06 13:37:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arpwatch-ethercodes (Old) and /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "arpwatch-ethercodes", Maintainer is "draht(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/arpwatch-ethercodes/arpwatch-ethercodes.changes 2012-03-05 17:58:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new/arpwatch-ethercodes.changes 2012-03-06 13:37:29.000000000 +0100 @@ -2 +2 @@ -Sat Mar 3 07:40:25 CET 2012 - autobuild(a)suse.de +Tue Mar 6 08:40:12 CET 2012 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2012-03-03 +- automated update on 2012-03-06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch-ethercodes.spec ++++++ --- /var/tmp/diff_new_pack.X7AGCn/_old 2012-03-06 13:37:33.000000000 +0100 +++ /var/tmp/diff_new_pack.X7AGCn/_new 2012-03-06 13:37:33.000000000 +0100 @@ -23,7 +23,7 @@ License: BSD-3-Clause Group: Productivity/Networking/Diagnostic Summary: Ethercodes Data for arpwatch -Version: 2012.3.3 +Version: 2012.3.6 Release: 1 Source0: http://standards.ieee.org/regauth/oui/oui.txt BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ oui.txt ++++++ --- /var/tmp/diff_new_pack.X7AGCn/_old 2012-03-06 13:37:33.000000000 +0100 +++ /var/tmp/diff_new_pack.X7AGCn/_new 2012-03-06 13:37:33.000000000 +0100 @@ -15528,10 +15528,11 @@ Kronach Bavaria 96317 GERMANY -00-09-83 (hex) Gvision Incorporated -000983 (base 16) Gvision Incorporated - 11F, No.166, Chien-I Road - Chung Ho City, Taipei Hsien 235 +00-09-83 (hex) GlobalTop Technology, Inc. +000983 (base 16) GlobalTop Technology, Inc. + #16 Nan-Ke 9th Road + Science-Based Industrial Park + Tainan 741 TAIWAN, REPUBLIC OF CHINA 00-09-84 (hex) MyCasa Network Inc. @@ -41494,10 +41495,10 @@ Beijing 100089 CHINA -00-19-92 (hex) Bluesocket, Inc -001992 (base 16) Bluesocket, Inc - 10 North Ave - Burlington MA 01803 +00-19-92 (hex) ADTRAN INC. +001992 (base 16) ADTRAN INC. + 901 Explorer Blvd. + Huntsville AL 35806-2807 UNITED STATES 00-19-93 (hex) Changshu Switchgear MFG. Co.,Ltd. (Former Changshu Switchgea @@ -63443,6 +63444,12 @@ San Jose CA 95134 UNITED STATES +00-2A-AF (hex) LARsys-Automation GmbH +002AAF (base 16) LARsys-Automation GmbH + Sinzinger Str. 3 + Hochburg-Ach 5122 + AUSTRIA + 00-2D-76 (hex) TITECH GmbH 002D76 (base 16) TITECH GmbH Otto-Hahn-Str. 6 @@ -81889,6 +81896,13 @@ Houston Texas 77070 UNITED STATES +08-37-9C (hex) Topaz Co. LTD. +08379C (base 16) Topaz Co. LTD. + B305-22, Acrotower, 1591 Gwanyang-dong + Dongan-gu + Anyang-si Gyeonggi-Do 431-060 + KOREA, REPUBLIC OF + 08-38-A5 (hex) Funkwerk plettac electronic GmbH 0838A5 (base 16) Funkwerk plettac electronic GmbH Wuerzburger Str. 150 @@ -82264,6 +82278,13 @@ Hangzhou ZheJiang 310012 CHINA +0C-AF-5A (hex) GENUS POWER INFRASTRUCTURE LIMITED +0CAF5A (base 16) GENUS POWER INFRASTRUCTURE LIMITED + SPL-3 RIICO INDUSTRIAL AREA + SITAPURA + JAIPUR RAJASTHAN 302022 + INDIA + 0C-BF-15 (hex) Genetec 0CBF15 (base 16) Genetec 2280 boul Alfred-Nobel @@ -82271,6 +82292,13 @@ St. Laurent Quebec H4S 2A4 CANADA +0C-C0-C0 (hex) MAGNETI MARELLI SISTEMAS ELECTRONICOS MEXICO +0CC0C0 (base 16) MAGNETI MARELLI SISTEMAS ELECTRONICOS MEXICO + AV. INDUSTRIA 20/21 + EL TREBOL + TEPOTZOTLAN MEXICO 54600 + MEXICO + 0C-C3-A7 (hex) Meritec 0CC3A7 (base 16) Meritec P.O. Box 8003 @@ -83492,6 +83520,12 @@ Taipei 23585 TAIWAN, REPUBLIC OF CHINA +1C-6B-CA (hex) Mitsunami Co., Ltd. +1C6BCA (base 16) Mitsunami Co., Ltd. + 2-30-11, Nishi-gotanda, Shinagawa-ku + Tokyo 141-0031 + JAPAN + 1C-6F-65 (hex) GIGA-BYTE TECHNOLOGY CO.,LTD. 1C6F65 (base 16) GIGA-BYTE TECHNOLOGY CO.,LTD. Pin-Jen City, @@ -83634,6 +83668,12 @@ San Jose CA 95134 UNITED STATES +1C-E1-65 (hex) Marshal Corporation +1CE165 (base 16) Marshal Corporation + Field Three Sotokanda Bldg. + 5-3-6, Sotokanda, Chiyoda-ku Tokyo 101-0021 + JAPAN + 1C-E1-92 (hex) Qisda Corporation 1CE192 (base 16) Qisda Corporation 157 Shan-Ying Road @@ -84586,6 +84626,12 @@ Sofia 1784 BULGARIA +28-F6-06 (hex) Syes srl +28F606 (base 16) Syes srl + Via Zanella 21 + Lissone (MB) Monza Brianza 20851 + ITALY + 28-FB-D3 (hex) Shanghai RagenTek Communication Technology Co.,Ltd. 28FBD3 (base 16) Shanghai RagenTek Communication Technology Co.,Ltd. 4th Floor,No.111 EShan Road PuDong District @@ -86655,6 +86701,12 @@ Hang Zhou Zhe Jiang 310030 CHINA +44-6D-57 (hex) Liteon Technology Corporation +446D57 (base 16) Liteon Technology Corporation + 4F,90,Chien 1 Road,ChungHo + Taipei TaiWan 23585 + TAIWAN, REPUBLIC OF CHINA + 44-7C-7F (hex) Innolight Technology Corporation 447C7F (base 16) Innolight Technology Corporation 3 Results Way @@ -87323,6 +87375,12 @@ Vimercate MB 20059 ITALY +4C-AA-16 (hex) AzureWave Technologies (Shanghai) Inc. +4CAA16 (base 16) AzureWave Technologies (Shanghai) Inc. + No.8 Lane 66, Chenbao Road, Malu Town Jiading District + Shanghai 201801 + CHINA + 4C-AC-0A (hex) ZTE Corporation 4CAC0A (base 16) ZTE Corporation 12/F,ZTE R&D Building,Kejinan Road, @@ -88898,6 +88956,12 @@ cupertino cA 95014 UNITED STATES +64-24-00 (hex) Xorcom Ltd. +642400 (base 16) Xorcom Ltd. + Teradyon Industrial Park + D.N Misgav 20179 + ISRAEL + 64-27-37 (hex) Hon Hai Precision Ind. Co.,Ltd. 642737 (base 16) Hon Hai Precision Ind. Co.,Ltd. NO.1925,Nanle Road ,Songjiang Export Processing Zone @@ -93798,6 +93862,13 @@ Karlsbad Baden-W�rttemberg 76307 GERMANY +9C-E1-0E (hex) NCTech Ltd +9CE10E (base 16) NCTech Ltd + 20-22 Braid Road + Morningside + Edinburgh EH10 6AD + UNITED KINGDOM + 9C-EB-E8 (hex) BizLink (Kunshan) Co.,Ltd 9CEBE8 (base 16) BizLink (Kunshan) Co.,Ltd No.168,Nanhe Road,Economic & Technological Development Zone, @@ -94109,6 +94180,12 @@ Shanghai 201204 CHINA +A0-B3-CC (hex) Hewlett Packard +A0B3CC (base 16) Hewlett Packard + 11445 Compaq Center Drive + Houston Texa 77070 + UNITED STATES + A0-B5-DA (hex) HongKong THTF Co., Ltd A0B5DA (base 16) HongKong THTF Co., Ltd 2F,Sector C of Tsinghua University Academy, @@ -94916,6 +94993,12 @@ Takasaki-shi Gunma 370-8522 JAPAN +AC-40-EA (hex) C&T Solution Inc. +AC40EA (base 16) C&T Solution Inc. + 12F-1, No.700, Zhongzheng Rd., Zhonghe Dist. + New Taipei City Taiwan 235 + TAIWAN, REPUBLIC OF CHINA + AC-44-F2 (hex) Revolabs Inc AC44F2 (base 16) Revolabs Inc 63 Great Rd @@ -96365,6 +96448,12 @@ Shenzhen GuangDong 518057 CHINA +BC-85-1F (hex) Samsung Electronics +BC851F (base 16) Samsung Electronics + #94-1, Imsoo-Dong + Gumi Gyeongbuk 730-350 + KOREA, REPUBLIC OF + BC-8B-55 (hex) NPP ELIKS America Inc. DBA T&M Atlantic BC8B55 (base 16) NPP ELIKS America Inc. DBA T&M Atlantic 175 SW 7th St Suite 1812 @@ -97839,6 +97928,12 @@ Ventura CA 93003-7787 UNITED STATES +CC-FE-3C (hex) Samsung Electronics +CCFE3C (base 16) Samsung Electronics + #94-1, Imsoo-Dong + Gumi Gyeongbuk 730-350 + KOREA, REPUBLIC OF + D0-07-90 (hex) Texas Instruments D00790 (base 16) Texas Instruments 12500 TI Boulevard @@ -98539,6 +98634,12 @@ Hsinchu City 300 TAIWAN, REPUBLIC OF CHINA +D8-0D-E3 (hex) FXI TECHNOLOGIES AS +D80DE3 (base 16) FXI TECHNOLOGIES AS + Postboks 609 + TRONDHEIM Norge 7406 + NORWAY + D8-1B-FE (hex) TWINLINX CORPORATION D81BFE (base 16) TWINLINX CORPORATION ESPACE DESCARTES BAT B @@ -99867,6 +99968,13 @@ Waterloo Ontario N2L 3W8 CANADA +E8-3E-FB (hex) GEODESIC LTD. +E83EFB (base 16) GEODESIC LTD. + 18,10TH CROSS, MAYURA STREET + PAPANNA LAYOUT, OUTER RING ROAD + BANGALORE KARNATAKA 560094 + INDIA + E8-40-40 (hex) Cisco Systems E84040 (base 16) Cisco Systems 80 West Tasman Dr. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xtables-addons for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package xtables-addons for openSUSE:Factory checked in at 2012-03-05 18:02:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xtables-addons (Old) and /work/SRC/openSUSE:Factory/.xtables-addons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xtables-addons", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xtables-addons/xtables-addons.changes 2012-01-09 11:17:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xtables-addons.new/xtables-addons.changes 2012-03-05 18:02:58.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 13 10:58:00 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xtables-addons.spec ++++++ --- /var/tmp/diff_new_pack.qP67bR/_old 2012-03-05 18:03:00.000000000 +0100 +++ /var/tmp/diff_new_pack.qP67bR/_new 2012-03-05 18:03:00.000000000 +0100 @@ -16,13 +16,12 @@ # - Name: xtables-addons Version: 1.41 Release: 0 -Group: Productivity/Networking/Security Summary: IP Packet Filter Administration Extensions -License: GPL-2.0; GPL-2.0+ +License: GPL-2.0 ; GPL-2.0+ +Group: Productivity/Networking/Security Url: http://xtables-addons.sf.net/ #Git-Clone: git://xtables-addons.git.sf.net/gitroot/xtables-addons/xtables-addons @@ -34,9 +33,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %git_snapshot -BuildRequires: autoconf automake >= 1.10b libtool +BuildRequires: autoconf +BuildRequires: automake >= 1.10b +BuildRequires: libtool %endif -BuildRequires: pkgconfig >= 0.23 pkgconfig(xtables) >= 1.4.5 xz +BuildRequires: pkgconfig >= 0.23 +BuildRequires: pkgconfig(xtables) >= 1.4.5 +BuildRequires: xz %if 0%{?suse_version} BuildRequires: %kernel_module_package_buildreqs Recommends: %name-kmp @@ -58,8 +61,8 @@ main kernel/iptables packages. %package KMP -Group: System/Kernel Summary: IP Packet Filter Administration Extensions +Group: System/Kernel %description KMP Xtables is used to set up, maintain, and inspect the tables of IP -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-video for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at 2012-03-05 18:02:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-driver-video (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-driver-video.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-driver-video", Maintainer is "sndirsch(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-driver-video/xorg-x11-driver-video.changes 2012-02-27 18:38:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-driver-video.new/xorg-x11-driver-video.changes 2012-03-05 18:02:55.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 27 16:31:56 CET 2012 - meissner(a)suse.de + +- disable building the Intel driver on non-intel x86* platforms. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.zOXUWh/_old 2012-03-05 18:02:57.000000000 +0100 +++ /var/tmp/diff_new_pack.zOXUWh/_new 2012-03-05 18:02:57.000000000 +0100 @@ -15,12 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define broken_kms_blacklist 0 Name: xorg-x11-driver-video -BuildRequires: Mesa-devel libdrm-devel libtool pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk +BuildRequires: Mesa-devel +BuildRequires: libdrm-devel +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: xorg-x11-proto-devel +BuildRequires: xorg-x11-server-sdk BuildRequires: pkgconfig(xvmc) %if %suse_version > 1210 BuildRequires: xcb-util-devel @@ -29,18 +33,24 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.6 -Release: 77 -License: MIT +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Group: System/X11/Servers/XF86_4 -Provides: xorg-x11-driver-video-nvidia 855resolution 915resolution -Provides: intel-i810-xorg-x11 xorg-x11-driver-video-intel +Provides: 855resolution +Provides: 915resolution +Provides: intel-i810-xorg-x11 +Provides: xorg-x11-driver-video-intel +Provides: xorg-x11-driver-video-nvidia Requires: VIDEO_ABI_VERSION = 10 Requires: libdrm >= 2.4.21 -Obsoletes: xorg-x11-driver-video-nvidia 855resolution 915resolution -Obsoletes: intel-i810-xorg-x11 xorg-x11-driver-video-intel +Obsoletes: 855resolution +Obsoletes: 915resolution +Obsoletes: intel-i810-xorg-x11 +Obsoletes: xorg-x11-driver-video-intel +Obsoletes: xorg-x11-driver-video-nvidia Supplements: xorg-x11-server Summary: X.Org video drivers +License: MIT +Group: System/X11/Servers/XF86_4 ExcludeArch: s390 s390x Source0: xf86-video-apm-1.2.3.tar.bz2 Source1: xf86-video-ark-0.7.3.tar.bz2 @@ -150,6 +160,12 @@ ### disabled for now (bnc #687802) #%patch155 -p1 popd + +# only available on Intel 32 and 64bit I think. +%ifnarch %ix86 x86_64 +rm -rf xf86-video-intel-* +%endif + pushd xf86-video-nv-* %patch132 -p1 popd @@ -212,7 +228,9 @@ /etc/modprobe.d/99-kms.conf %endif /usr/bin/intel_* +%ifarch %ix86 x86_64 %{_libdir}/lib* +%endif %{_libdir}/xorg/modules/ %{_mandir}/man1/* %{_mandir}/man4/* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xemacs for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package xemacs for openSUSE:Factory checked in at 2012-03-05 18:02:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xemacs (Old) and /work/SRC/openSUSE:Factory/.xemacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xemacs", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xemacs/xemacs.changes 2012-02-10 17:20:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xemacs.new/xemacs.changes 2012-03-05 18:02:52.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Mar 2 16:34:50 UTC 2012 - werner(a)suse.de + +- Update to beta version XEmacs 21.5.31 "ginger" + * this includes 138 fixes including 9 crashes + * this includes 110 improvments + * also include some of our own patches + +------------------------------------------------------------------- Old: ---- bnc558764_avoid-xft-if-absent.patch bugzilla-294746-set-language-unicode-precedence-list-at-startup.patch build-fix-ccl-load-problem.patch changeset-dec62ca5a899.patch gnomebug.patch ndbm.patch suppress-warning-about-undefined-unicode-key-mappings.patch unitialized-variables.patch xemacs-21.4.13-ppc.patch xemacs-21.4.4-font-menu.patch xemacs-beta-b604d235f028.tar.bz2 xemacs-ia64.dif New: ---- xemacs-21.5.31.tar.gz xemacs-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xemacs.spec ++++++ --- /var/tmp/diff_new_pack.JpDxn6/_old 2012-03-05 18:02:54.000000000 +0100 +++ /var/tmp/diff_new_pack.JpDxn6/_new 2012-03-05 18:02:54.000000000 +0100 @@ -16,6 +16,7 @@ # + Name: xemacs BuildRequires: autoconf BuildRequires: canna-devel @@ -52,7 +53,7 @@ PreReq: permissions Requires: xemacs-info xemacs-packages ctags Conflicts: gnuserv -Version: 21.5.29.b604d235f028 +Version: 21.5.31 Release: 0 Summary: XEmacs License: GPL-2.0+ @@ -64,7 +65,7 @@ # # delete the .hg directory before creating the tarball in order # not to make the source rpm huge. -Source0: ftp://ftp.xemacs.org/xemacs-21.5/xemacs-%{_hg}.tar.bz2 +Source0: http://ftp.freenet.de/pub/ftp.xemacs.org/tux/xemacs/xemacs-21.5/xemacs-21.5… Source1: xe-list.el Source2: fix-load-history.el Source3: xemacs.desktop @@ -75,33 +76,20 @@ Patch0: xemacs.patch # keep in sync with the similar patch to the app-defaults in the main xemacs-packages package: Patch3: xemacs-app-defaults.patch -Patch5: xemacs-21.4.4-font-menu.patch -Patch13: xemacs-ia64.dif -Patch14: ndbm.patch Patch18: xemacs-21.4.8-xevent.patch -Patch19: xemacs-21.4.13-ppc.patch Patch20: xemacs-21.4.13-ppc64.patch Patch22: destdir.patch Patch23: xemacs-ptmx.dif -Patch25: gnomebug.patch Patch27: xemacs-level3.patch Patch28: xemacs-21.5.18-movemail.patch Patch32: do-not-create-backups-in-temp-directories.patch Patch33: set-locale-to-c-when-not-supported-by-x.patch -Patch34: suppress-warning-about-undefined-unicode-key-mappings.patch -Patch38: unitialized-variables.patch Patch39: xemacs-tinfo.dif -Patch41: bugzilla-294746-set-language-unicode-precedence-list-at-startup.patch -Patch42: build-fix-ccl-load-problem.patch Patch43: set-language-unicode-precedence-list.patch Patch45: fix-defface-custom-modified-face.patch Patch50: menus-always-utf8.patch Patch51: bnc502716-fontmenu.patch Patch52: bnc502716-xft.patch -Patch54: bnc558764_avoid-xft-if-absent.patch -Patch55: changeset-dec62ca5a899.patch -# PATCH-FIX-UPSTREAM pngtoico-libpng15.patch -- pgajdos(a)suse.com; build with libpng15; didn't sent to upstream -# build against libpng14 should not be affected, otherwise please let me know Patch56: xemacs-libpng15.patch Patch292811: bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch @@ -160,29 +148,17 @@ %else echo Use xfs, that is XFontSet support for internationalized menubar. %endif -%setup -q -n xemacs-%{_hg} +%setup -q %patch3 -p1 -#%patch5 -p1 -b .fontmenu # appears to be not needed anymore -#%patch13 -p1 -%patch14 -p1 %patch18 -p0 -b .xevent -%patch19 -p1 -b .ppc %patch20 -p1 -%patch22 -p1 +%patch22 -p0 %patch23 -p1 -#%patch24 -p1 -#triggers #103040 -#%patch25 -p1 %patch27 -p1 -b .lvl3 %patch28 -p1 -b .movemail %patch32 -p1 %patch33 -p1 -#%patch34 -p1 -%patch38 -p1 %patch39 -p0 -#%patch40 -p1 -#%patch41 -p1 -#%patch42 -p1 %patch43 -p1 %patch45 -p0 %patch50 -p1 @@ -190,8 +166,6 @@ %patch51 -p0 %patch52 -p0 %endif -%patch54 -p0 -%patch55 -p0 %patch56 -p1 %patch292811 -p1 %patch301352 -p1 @@ -308,7 +282,7 @@ # when using "--rel-alloc, XEmacs 21.5.18 crashes often when using # 'compile-goto-error'. # --rel-alloc \ -SPECIAL="--enable-database=berkdb,gdbm \ +SPECIAL="--with-database=berkdb,gdbm \ --with-ncurses \ --with-canna \ --with-tty=yes \ @@ -600,8 +574,6 @@ /usr/lib/xemacs/%{version}/*-suse-linux/rcs2log /usr/lib/xemacs/%{version}/*-suse-linux/sorted-doc /usr/lib/xemacs/%{version}/*-suse-linux/vcdiff -/usr/lib/xemacs/%{version}/*-suse-linux/wakeup -/usr/lib/xemacs/%{version}/*-suse-linux/yow %dir /usr/lib/xemacs/site-modules/ %dir %{_docdir}/xemacs/ %doc %{_docdir}/xemacs/README.SuSE ++++++ destdir.patch ++++++ --- /var/tmp/diff_new_pack.JpDxn6/_old 2012-03-05 18:02:54.000000000 +0100 +++ /var/tmp/diff_new_pack.JpDxn6/_new 2012-03-05 18:02:54.000000000 +0100 @@ -1,8 +1,6 @@ -Index: xemacs-21.5.29/Makefile.in.in -=================================================================== ---- xemacs-21.5.29.orig/Makefile.in.in -+++ xemacs-21.5.29/Makefile.in.in -@@ -61,6 +61,8 @@ RECURSIVE_MAKE_ARGS= +--- Makefile.in.in ++++ Makefile.in.in 2012-03-02 00:00:00.000000000 +0000 +@@ -59,6 +59,8 @@ RECURSIVE_MAKE_ARGS= RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@ #endif @@ -11,7 +9,7 @@ SHELL = /bin/sh LANG = C LC_ALL = C -@@ -394,18 +396,18 @@ install-arch-dep: mkdir +@@ -398,18 +400,18 @@ install-arch-dep: mkdir (cd ./$${subdir} && $(MAKE) $(RECURSIVE_MAKE_ARGS) install prefix=${prefix} \ exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \ archlibdir=${archlibdir}) ; done @@ -35,7 +33,7 @@ #endif #ifdef WIN32_NATIVE ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME} -@@ -417,10 +417,10 @@ install-arch-dep: mkdir +@@ -421,20 +423,20 @@ install-arch-dep: mkdir cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME} cd ${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${SHEBANG_PROGNAME} # else @@ -50,10 +48,6 @@ # endif /* CYGWIN */ #endif /* WIN32_NATIVE */ #ifdef HAVE_SHLIB -@@ -435,13 +437,13 @@ install-arch-dep: mkdir - done; \ - fi - #ifdef HAVE_SHLIB - $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(moduledir) + $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(DESTDIR)$(moduledir) #endif @@ -66,7 +60,7 @@ "`(cd $${dir} && $(pwd))`"; then \ : do nothing - echo "rm -rf $$1" ; \ fi ; \ -@@ -449,35 +451,35 @@ install-arch-indep: mkdir info +@@ -442,35 +444,35 @@ install-arch-indep: mkdir info done -set ${COPYDESTS} ; \ for dir in ${COPYDESTS} ; do \ @@ -114,7 +108,7 @@ done @echo "If you would like to save approximately 4M of disk space, do" @echo "make gzip-el" -@@ -487,19 +489,23 @@ install-arch-indep: mkdir info +@@ -480,19 +482,23 @@ install-arch-indep: mkdir info @echo "${lispdir}" gzip-el: @@ -143,21 +137,20 @@ ## Install bundled packages, if present. -Index: xemacs-21.5.29/etc/tests/external-widget/Makefile -=================================================================== ---- xemacs-21.5.29.orig/etc/tests/external-widget/Makefile -+++ xemacs-21.5.29/etc/tests/external-widget/Makefile -@@ -1,3 +1,5 @@ +--- etc/tests/external-widget/Makefile ++++ etc/tests/external-widget/Makefile 2012-03-02 00:00:00.000000000 +0000 +@@ -16,6 +16,8 @@ + ## You should have received a copy of the GNU General Public License + ## along with XEmacs. If not, see <http://www.gnu.org/licenses/>. + +DESTDIR= + CFLAGS += -Xc -g -DTOOLTALK EMACSHOME = ../../.. EMACSLIBDIR = $(EMACSHOME)/editor/src -Index: xemacs-21.5.29/lib-src/Makefile.in.in -=================================================================== ---- xemacs-21.5.29.orig/lib-src/Makefile.in.in -+++ xemacs-21.5.29/lib-src/Makefile.in.in -@@ -24,6 +24,8 @@ +--- lib-src/Makefile.in.in ++++ lib-src/Makefile.in.in 2012-03-02 00:00:00.000000000 +0000 +@@ -22,6 +22,8 @@ ## above a certain point in this file are in shell format instead of ## in C format. How the hell is this supposed to work? */ @@ -166,7 +159,7 @@ ## For performance and consistency, no built-in rules .SUFFIXES: .SUFFIXES: .c .h .o -@@ -246,26 +248,26 @@ do-blessmail: $(blessmail) +@@ -242,26 +244,26 @@ do-blessmail: $(blessmail) ## just run them directly from lib-src. ${archlibdir}: all @echo; echo "Installing utilities run internally by XEmacs." @@ -198,37 +191,31 @@ done uninstall: -Index: xemacs-21.5.29/lwlib/Makefile.in.in -=================================================================== ---- xemacs-21.5.29.orig/lwlib/Makefile.in.in -+++ xemacs-21.5.29/lwlib/Makefile.in.in -@@ -22,6 +22,8 @@ - ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - ## Boston, MA 02111-1307, USA. +--- lwlib/Makefile.in.in ++++ lwlib/Makefile.in.in 2012-03-02 00:00:00.000000000 +0000 +@@ -21,6 +21,8 @@ + ## along with the Lucid Widget Library. If not, see + ## <http://www.gnu.org/licenses/>. +DESTDIR= + ## For performance and consistency, no built-in rules .SUFFIXES: .SUFFIXES: .c .h .o .i .s -Index: xemacs-21.5.29/man/Makefile -=================================================================== ---- xemacs-21.5.29.orig/man/Makefile -+++ xemacs-21.5.29/man/Makefile -@@ -20,6 +20,8 @@ - # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. +--- man/Makefile ++++ man/Makefile 2012-03-02 00:00:00.000000000 +0000 +@@ -18,6 +18,8 @@ + # You should have received a copy of the GNU General Public License + # along with XEmacs. If not, see <http://www.gnu.org/licenses/>. +DESTDIR= + SHELL = /bin/sh MAKEINFO = makeinfo TEXI2DVI = texi2dvi -Index: xemacs-21.5.29/modules/base64/Makefile -=================================================================== ---- xemacs-21.5.29.orig/modules/base64/Makefile -+++ xemacs-21.5.29/modules/base64/Makefile -@@ -7,6 +7,8 @@ +--- modules/base64/Makefile ++++ modules/base64/Makefile 2012-03-02 00:00:00.000000000 +0000 +@@ -25,6 +25,8 @@ # 'installed'. # @@ -237,11 +224,9 @@ SHELL=/bin/sh RM=rm -f CC=../../lib-src/ellcc -Index: xemacs-21.5.29/modules/common/Makefile.common -=================================================================== ---- xemacs-21.5.29.orig/modules/common/Makefile.common -+++ xemacs-21.5.29/modules/common/Makefile.common -@@ -31,6 +31,8 @@ +--- modules/common/Makefile.common ++++ modules/common/Makefile.common 2012-03-02 00:00:00.000000000 +0000 +@@ -29,6 +29,8 @@ #define NOT_C_CODE #include "../../src/config.h" @@ -250,7 +235,7 @@ SHELL=/bin/sh RM=rm -f PROGNAME=@PROGNAME@ -@@ -98,7 +100,7 @@ extraclean: realclean +@@ -96,7 +98,7 @@ extraclean: realclean -$(RM) *~ \#* install: $(OBJECT_TO_BUILD) @@ -259,11 +244,9 @@ ## ## Local Variables: -Index: xemacs-21.5.29/modules/zlib/Makefile -=================================================================== ---- xemacs-21.5.29.orig/modules/zlib/Makefile -+++ xemacs-21.5.29/modules/zlib/Makefile -@@ -8,6 +8,8 @@ +--- modules/zlib/Makefile ++++ modules/zlib/Makefile 2012-03-02 00:00:00.000000000 +0000 +@@ -26,6 +26,8 @@ # 'installed'. # @@ -272,33 +255,9 @@ SHELL=/bin/sh RM=rm -f CC=../../lib-src/ellcc -Index: xemacs-21.5.29/netinstall/Makefile.in.in -=================================================================== ---- xemacs-21.5.29.orig/netinstall/Makefile.in.in -+++ xemacs-21.5.29/netinstall/Makefile.in.in -@@ -14,6 +14,8 @@ - ## - ## Makefile for Cygwin installer - -+DESTDIR= -+ - ## For performance and consistency, no built-in rules - .SUFFIXES: - .SUFFIXES: .c .cc .h .o -@@ -173,7 +175,7 @@ setup-bin.ini: - install: - @echo; echo "Installing net setup." - for file in ${INSTALLABLES} ; do \ -- (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} ${bindir}/$${file}) ; \ -+ (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} $(DESTDIR)${bindir}/$${file}) ; \ - done - - version.c : $(srcdir)/ChangeLog Makefile -Index: xemacs-21.5.29/src/Makefile.in.in -=================================================================== ---- xemacs-21.5.29.orig/src/Makefile.in.in -+++ xemacs-21.5.29/src/Makefile.in.in -@@ -39,6 +39,8 @@ RECURSIVE_MAKE_ARGS= +--- src/Makefile.in.in ++++ src/Makefile.in.in 2012-03-02 00:00:00.000000000 +0000 +@@ -37,6 +37,8 @@ RECURSIVE_MAKE_ARGS= RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@ #endif @@ -307,7 +266,7 @@ PROGNAME=@PROGNAME@ prefix=@prefix@ SRC=@srcdir@ -@@ -1065,7 +1067,7 @@ relock: +@@ -1019,7 +1021,7 @@ relock: #ifdef HAVE_SHLIB MAKEPATH=../lib-src/make-path install: $(PROGNAME) @@ -316,7 +275,7 @@ -@echo "Copying include files for ellcc..." -@hdir=`pwd`; \ cd $(SRC); hdrdir2=`pwd`; cd $$hdir; \ -@@ -1079,12 +1081,12 @@ install: $(PROGNAME) +@@ -1033,12 +1035,12 @@ install: $(PROGNAME) test -d s && hdrtars="$$hdrtars s/*"; \ test -d m && hdrtars="$$hdrtars m/*"; \ test -n "$$hdrtars" && (tar cf - $$hdrtars) | \ @@ -335,11 +294,9 @@ done) #endif -Index: xemacs-21.5.29/tests/tooltalk/Makefile -=================================================================== ---- xemacs-21.5.29.orig/tests/tooltalk/Makefile -+++ xemacs-21.5.29/tests/tooltalk/Makefile -@@ -12,6 +12,8 @@ +--- tests/tooltalk/Makefile ++++ tests/tooltalk/Makefile 2012-03-02 00:00:00.000000000 +0000 +@@ -27,6 +27,8 @@ ### Code: ++++++ menus-always-utf8.patch ++++++ --- /var/tmp/diff_new_pack.JpDxn6/_old 2012-03-05 18:02:54.000000000 +0100 +++ /var/tmp/diff_new_pack.JpDxn6/_new 2012-03-05 18:02:54.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xemacs-21.5.29/lwlib/xlwmenu.c +Index: xemacs-21.5.31/lwlib/xlwmenu.c =================================================================== ---- xemacs-21.5.29.orig/lwlib/xlwmenu.c -+++ xemacs-21.5.29/lwlib/xlwmenu.c -@@ -344,12 +344,12 @@ string_width (XlwMenuWidget mw, +--- xemacs-21.5.31.orig/lwlib/xlwmenu.c ++++ xemacs-21.5.31/lwlib/xlwmenu.c +@@ -343,12 +343,12 @@ string_width (XlwMenuWidget mw, #else # ifdef USE_XFONTSET XRectangle ri, rl; @@ -10,14 +10,14 @@ + Xutf8TextExtents (mw->menu.font_set, s, strlen (s), &ri, &rl); return rl.width; # else - #ifdef USE_XFT_MENUBARS + #ifdef HAVE_XFT_MENUBARS XGlyphInfo glyphinfo; - XftTextExtents8 (XtDisplay (mw), mw->menu.renderFont, (FcChar8 *) s, + XftTextExtentsUtf8 (XtDisplay (mw), mw->menu.renderFont, (FcChar8 *) s, strlen (s), &glyphinfo); return glyphinfo.xOff; #else -@@ -436,11 +436,11 @@ string_width_u (XlwMenuWidget mw, +@@ -435,11 +435,11 @@ string_width_u (XlwMenuWidget mw, return width; #else # ifdef USE_XFONTSET @@ -25,13 +25,13 @@ + Xutf8TextExtents (mw->menu.font_set, newchars, j, &ri, &rl); return rl.width; # else /* ! USE_XFONTSET */ - #ifdef USE_XFT_MENUBARS + #ifdef HAVE_XFT_MENUBARS - XftTextExtents8 (XtDisplay (mw), mw->menu.renderFont, (FcChar8 *) newchars, + XftTextExtentsUtf8 (XtDisplay (mw), mw->menu.renderFont, (FcChar8 *) newchars, j, &glyphinfo); return glyphinfo.xOff; #else -@@ -770,7 +770,7 @@ x_xft_text_width (Display *dpy, XftFont +@@ -769,7 +769,7 @@ x_xft_text_width (Display *dpy, XftFont { static XGlyphInfo glyphinfo; @@ -40,7 +40,7 @@ xft_font, (FcChar8 *) run, len, &glyphinfo); return glyphinfo.xOff; -@@ -817,12 +817,12 @@ string_draw (XlwMenuWidget mw, +@@ -816,12 +816,12 @@ string_draw (XlwMenuWidget mw, x_xft_text_width (display, renderFont, string, strlen (string)), renderFont->ascent + renderFont->descent); /* XXX */ /* draw text */ @@ -55,7 +55,7 @@ x, y + mw->menu.font_ascent, string, strlen (string)); # else XDrawString (XtDisplay (mw), window, gc, -@@ -878,10 +878,10 @@ string_draw_range ( +@@ -877,10 +877,10 @@ string_draw_range ( if (end <= start) return 0; @@ -68,7 +68,7 @@ mw->menu.font_set, &string[start], end - start, &ri, &rl); return rl.width; # else -@@ -904,12 +904,12 @@ string_draw_range ( +@@ -903,12 +903,12 @@ string_draw_range ( renderFont, &string[start], end - start), renderFont->ascent + renderFont->descent); /* XXX */ /* draw text */ ++++++ xemacs-libpng15.patch ++++++ --- /var/tmp/diff_new_pack.JpDxn6/_old 2012-03-05 18:02:54.000000000 +0100 +++ /var/tmp/diff_new_pack.JpDxn6/_new 2012-03-05 18:02:54.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xemacs-beta-b604d235f028/src/glyphs-eimage.c +Index: xemacs-21.5.31/glyphs-eimage.c =================================================================== ---- xemacs-beta-b604d235f028.orig/src/glyphs-eimage.c -+++ xemacs-beta-b604d235f028/src/glyphs-eimage.c -@@ -887,7 +887,8 @@ png_instantiate (Lisp_Object image_insta +--- xemacs-21.5.31/src/glyphs-eimage.c ++++ xemacs-21.5.31/src/glyphs-eimage.c +@@ -911,7 +911,8 @@ png_instantiate (Lisp_Object image_insta Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); struct png_unwind_data unwind; int speccount = specpdl_depth (); @@ -12,78 +12,3 @@ struct png_memory_storage tbr; /* Data to be read */ /* PNG variables */ -@@ -955,8 +956,7 @@ png_instantiate (Lisp_Object image_insta - int y, padding; - Binbyte **row_pointers; - UINT_64_BIT pixels_sq; -- height = info_ptr->height; -- width = info_ptr->width; -+ png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, NULL, NULL, NULL); - pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height; - if (pixels_sq > ((size_t) -1) / 3) - signal_image_error ("PNG image too large to instantiate", instantiator); -@@ -1018,29 +1018,29 @@ png_instantiate (Lisp_Object image_insta - /* Now that we're using EImage, ask for 8bit RGB triples for any type - of image*/ - /* convert palette images to RGB */ -- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) -+ if (color_type == PNG_COLOR_TYPE_PALETTE) - png_set_palette_to_rgb (png_ptr); - /* convert grayscale images to RGB */ -- else if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY || -- info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -+ else if (color_type == PNG_COLOR_TYPE_GRAY || -+ color_type == PNG_COLOR_TYPE_GRAY_ALPHA) - png_set_gray_to_rgb (png_ptr); - /* pad images with depth < 8 bits */ -- else if (info_ptr->bit_depth < 8) -+ else if (bit_depth < 8) - { -- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) -+ if (color_type == PNG_COLOR_TYPE_GRAY) - png_set_expand (png_ptr); - else - png_set_packing (png_ptr); - } - /* strip 16-bit depth files down to 8 bits */ -- if (info_ptr->bit_depth == 16) -+ if (bit_depth == 16) - png_set_strip_16 (png_ptr); - /* strip alpha channel - #### shouldn't we handle this? - first call png_read_update_info in case above transformations - have generated an alpha channel */ - png_read_update_info(png_ptr, info_ptr); -- if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) -+ if (color_type & PNG_COLOR_MASK_ALPHA) - png_set_strip_alpha (png_ptr); - - png_read_image (png_ptr, row_pointers); -@@ -1050,19 +1050,22 @@ png_instantiate (Lisp_Object image_insta - * into the glyph code, where you can get to it from lisp - * anyway. - WMP */ - { -- int i; -+ int i, num_text; -+ png_textp text_ptr; - DECLARE_EISTRING (key); - DECLARE_EISTRING (text); -- -- for (i = 0 ; i < info_ptr->num_text ; i++) -+ -+ png_get_text(png_ptr, info_ptr, &text_ptr, &num_text); -+ -+ for (i = 0 ; i < num_text ; i++) - { - /* How paranoid do I have to be about no trailing NULLs, and - using (int)info_ptr->text[i].text_length, and strncpy and a temp - string somewhere? */ - eireset(key); - eireset(text); -- eicpy_ext(key, info_ptr->text[i].key, Qbinary); -- eicpy_ext(text, info_ptr->text[i].text, Qbinary); -+ eicpy_ext(key, text_ptr[i].key, Qbinary); -+ eicpy_ext(text, text_ptr[i].text, Qbinary); - - warn_when_safe (Qpng, Qinfo, "%s - %s", - eidata(key), eidata(text)); ++++++ xemacs-rpmlintrc ++++++ addFilter(".*zero-length.*dump-paths\.el.*") ++++++ xemacs.patch ++++++ --- /var/tmp/diff_new_pack.JpDxn6/_old 2012-03-05 18:02:54.000000000 +0100 +++ /var/tmp/diff_new_pack.JpDxn6/_new 2012-03-05 18:02:54.000000000 +0100 @@ -152,37 +152,33 @@ =================================================================== --- xemacs-21.5.29.orig/lib-src/vcdiff +++ xemacs-21.5.29/lib-src/vcdiff -@@ -62,6 +62,17 @@ esac +@@ -75,7 +75,10 @@ case $# in + esac - rev1= rev2= status=0 -+rev1=/tmp/geta$$ -+rev2=/tmp/getb$$ -+rm -f $rev1 $rev2 -+if test -e $rev1 -o -e $rev2 ; then -+ echo "$0: temporaray files exists." 1>&2 +-rev1= rev2= status=0 ++if ! type -p mktemp > /dev/null 2>&1 ; then ++ echo "$0: can not create temporary files." 1>&2 + exit 1 +fi -+if test -n "`type -p mktemp`" ; then -+ rev1="`mktemp ${rev1}.XXXXXX`" || exit 1 -+ rev2="`mktemp ${rev2}.XXXXXX`" || exit 1 -+fi trap 'status=2; exit' 1 2 13 15 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0 -@@ -79,14 +90,12 @@ do +@@ -86,14 +89,14 @@ do case $f in s.* | */s.*) if -- rev1=/tmp/geta$$ - get -s -p -k $sid1 "$f" > $rev1 && +- rev1=`mktemp /tmp/geta.XXXXXXXX` ++ rev1=`mktemp /tmp/geta.XXXXXXXX` || exit 1 + sccs get -s -p -k $sid1 "$f" > $rev1 && case $sid2 in '') workfile=`expr " /$f" : '.*/s.$.*$'` ;; *) -- rev2=/tmp/getb$$ - get -s -p -k $sid2 "$f" > $rev2 +- rev2=`mktemp /tmp/getb.XXXXXXXX` ++ rev2=`mktemp /tmp/getb.XXXXXXXX` || exit 1 + sccs get -s -p -k $sid2 "$f" > $rev2 workfile=$rev2 esac Index: xemacs-21.5.29/lisp/default.el @@ -203,15 +199,15 @@ =================================================================== --- xemacs-21.5.29.orig/lisp/dumped-lisp.el +++ xemacs-21.5.29/lisp/dumped-lisp.el -@@ -38,6 +38,7 @@ in dumped-lisp.el and is not itself list +@@ -42,6 +42,7 @@ in dumped-lisp.el and is not itself list "cl" - "cl-extra" + "cl-extra" ; also loads cl-macs if we're running interpreted. "cl-seq" -+ "cl-macs" ; Avoid autoloading of kernel functions - "widget" - "custom" ; Before the world so everything can be - ; customized -@@ -303,6 +304,7 @@ in dumped-lisp.el and is not itself list ++ "cl-macs" ; Avoid autoloading of kernel functions + "post-gc" + "version" + "custom" ; Before the world so everything can be customized +@@ -300,6 +301,7 @@ in dumped-lisp.el and is not itself list ;; "sun-eos-debugger-extra" ;; "sun-eos-menubar")) "loaddefs" ; <=== autoloads get loaded here @@ -891,7 +887,7 @@ +++ xemacs-21.5.29/suse/README.SuSE @@ -0,0 +1,18 @@ + -+ XEmacs-21.5.16 ++ XEmacs-21.5.31 + + * Sie finden eine Referenz-Karte im Verzeichnis etc/ + in der Datei refcard.ps, die Sie ausdrucken können. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wireshark for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package wireshark for openSUSE:Factory checked in at 2012-03-05 18:02:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wireshark (Old) and /work/SRC/openSUSE:Factory/.wireshark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wireshark", Maintainer is "CYLiu(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/wireshark/wireshark.changes 2012-01-20 20:28:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wireshark.new/wireshark.changes 2012-03-05 18:02:47.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 1 15:29:52 UTC 2012 - asn(a)cryptomilk.org + +- Add known bit for Netlogon ServerAutheticate2 flags. + +------------------------------------------------------------------- New: ---- wireshark-1.6.5-netlogon-aes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireshark.spec ++++++ --- /var/tmp/diff_new_pack.q8JWnk/_old 2012-03-05 18:02:50.000000000 +0100 +++ /var/tmp/diff_new_pack.q8JWnk/_new 2012-03-05 18:02:50.000000000 +0100 @@ -36,6 +36,7 @@ Patch3: %{name}-corosync-packet-dissector.patch # PATCH-FIX-OPENSUSE wireshark-1.2.4-enable_lua.patch bnc#650434 Patch4: %{name}-1.2.4-enable_lua.patch +Patch5: %{name}-1.6.5-netlogon-aes.patch BuildRequires: bison BuildRequires: cairo-devel BuildRequires: flex @@ -97,6 +98,7 @@ %patch2 %patch3 -p1 %patch4 +%patch5 -p1 sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark.desktop # run as root on 11.3 and older - bnc#349782 ++++++ wireshark-1.6.5-netlogon-aes.patch ++++++ Index: wireshark-1.6.5/epan/dissectors/packet-dcerpc-netlogon.c =================================================================== --- wireshark-1.6.5.orig/epan/dissectors/packet-dcerpc-netlogon.c 2012-01-10 20:08:57.000000000 +0100 +++ wireshark-1.6.5/epan/dissectors/packet-dcerpc-netlogon.c 2012-03-02 14:28:11.415607283 +0100 @@ -6669,12 +6669,12 @@ static int netlogon_dissect_neg_options( hf_netlogon_neg_flags_2000000, tvb, offset, 4, flags); proto_tree_add_boolean (negotiate_flags_tree, - hf_netlogon_neg_flags_1000000, - tvb, offset, 4, flags); - proto_tree_add_boolean (negotiate_flags_tree, hf_netlogon_neg_flags_800000, tvb, offset, 4, flags);*/ proto_tree_add_boolean (negotiate_flags_tree, + hf_netlogon_neg_flags_1000000, + tvb, offset, 4, flags); + proto_tree_add_boolean (negotiate_flags_tree, hf_netlogon_neg_flags_400000, tvb, offset, 4, flags); proto_tree_add_boolean (negotiate_flags_tree, @@ -8807,7 +8807,7 @@ proto_register_dcerpc_netlogon(void) { "Not used 2000000", "ntlmssp.neg_flags.na200000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_2000000, "Not used", HFILL }}, { &hf_netlogon_neg_flags_1000000, - { "Not used 1000000", "ntlmssp.neg_flags.na100000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_1000000, "Not used", HFILL }}, + { "AES supported", "ntlmssp.neg_flags.na100000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_1000000, "AES", HFILL }}, { &hf_netlogon_neg_flags_800000, { "Not used 800000", "ntlmssp.neg_flags.na8000000", FT_BOOLEAN, 32, TFS(&tfs_set_notset), NETLOGON_FLAG_800000, "Not used", HFILL }}, ++++++ wireshark-corosync-packet-dissector.patch ++++++ --- /var/tmp/diff_new_pack.q8JWnk/_old 2012-03-05 18:02:50.000000000 +0100 +++ /var/tmp/diff_new_pack.q8JWnk/_new 2012-03-05 18:02:50.000000000 +0100 @@ -1,8 +1,8 @@ -Index: wireshark-1.4.3/epan/dissectors/Makefile.common +Index: wireshark-1.6.5/epan/dissectors/Makefile.common =================================================================== ---- wireshark-1.4.3.orig/epan/dissectors/Makefile.common -+++ wireshark-1.4.3/epan/dissectors/Makefile.common -@@ -307,6 +307,8 @@ DISSECTOR_SRC = \ +--- wireshark-1.6.5.orig/epan/dissectors/Makefile.common 2012-01-10 20:08:58.000000000 +0100 ++++ wireshark-1.6.5/epan/dissectors/Makefile.common 2012-03-02 14:27:44.059540118 +0100 +@@ -320,6 +320,8 @@ DISSECTOR_SRC = \ packet-collectd.c \ packet-componentstatus.c \ packet-cops.c \ @@ -11,10 +11,10 @@ packet-cosine.c \ packet-cpfi.c \ packet-cpha.c \ -Index: wireshark-1.4.3/epan/dissectors/packet-corosync-totemnet.c +Index: wireshark-1.6.5/epan/dissectors/packet-corosync-totemnet.c =================================================================== ---- /dev/null -+++ wireshark-1.4.3/epan/dissectors/packet-corosync-totemnet.c +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ wireshark-1.6.5/epan/dissectors/packet-corosync-totemnet.c 2012-03-02 14:27:44.060540120 +0100 @@ -0,0 +1,1274 @@ +/* packet-corosync-totemnet.c + * Routines for the lowest level(encryption/decryption) protocol used in Corosync cluster engine @@ -1290,10 +1290,10 @@ +} + +/* packet-corosync-totemnet.c ends here */ -Index: wireshark-1.4.3/epan/dissectors/packet-corosync-totemsrp.c +Index: wireshark-1.6.5/epan/dissectors/packet-corosync-totemsrp.c =================================================================== ---- /dev/null -+++ wireshark-1.4.3/epan/dissectors/packet-corosync-totemsrp.c +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ wireshark-1.6.5/epan/dissectors/packet-corosync-totemsrp.c 2012-03-02 14:27:44.061540123 +0100 @@ -0,0 +1,1379 @@ +/* packet-corosync-totemsrp.c + * Dissectors for totem single ring protocol implementated in corosync cluster engine @@ -2674,10 +2674,10 @@ + corosync_totemsrp_is_little_endian(pinfo)); +} + -Index: wireshark-1.4.3/epan/dissectors/packet-corosync-totemsrp.h +Index: wireshark-1.6.5/epan/dissectors/packet-corosync-totemsrp.h =================================================================== ---- /dev/null -+++ wireshark-1.4.3/epan/dissectors/packet-corosync-totemsrp.h +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ wireshark-1.6.5/epan/dissectors/packet-corosync-totemsrp.h 2012-03-02 14:27:44.061540123 +0100 @@ -0,0 +1,53 @@ +/* packet-corosync-totemsrp.h + * Dissectors for totem single ring protocol implemented in corosync cluster engine @@ -2732,11 +2732,11 @@ + + +#endif /* packet-totemsrp.h */ -Index: wireshark-1.4.3/epan/dissectors/Makefile.in +Index: wireshark-1.6.5/epan/dissectors/Makefile.in =================================================================== ---- wireshark-1.4.3.orig/epan/dissectors/Makefile.in -+++ wireshark-1.4.3/epan/dissectors/Makefile.in -@@ -224,6 +224,8 @@ am__objects_3 = libdissectors_la-packet- +--- wireshark-1.6.5.orig/epan/dissectors/Makefile.in 2012-01-10 20:09:44.000000000 +0100 ++++ wireshark-1.6.5/epan/dissectors/Makefile.in 2012-03-02 14:27:44.065540133 +0100 +@@ -231,6 +231,8 @@ am__objects_3 = libdissectors_la-packet- libdissectors_la-packet-collectd.lo \ libdissectors_la-packet-componentstatus.lo \ libdissectors_la-packet-cops.lo \ @@ -2745,7 +2745,7 @@ libdissectors_la-packet-cosine.lo \ libdissectors_la-packet-cpfi.lo \ libdissectors_la-packet-cpha.lo \ -@@ -1486,6 +1488,8 @@ DISSECTOR_SRC = \ +@@ -1555,6 +1557,8 @@ DISSECTOR_SRC = \ packet-collectd.c \ packet-componentstatus.c \ packet-cops.c \ @@ -2754,7 +2754,7 @@ packet-cosine.c \ packet-cpfi.c \ packet-cpha.c \ -@@ -2773,6 +2777,8 @@ distclean-compile: +@@ -2890,6 +2894,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-collectd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-componentstatus.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-cops.Plo@am__quote@ @@ -2763,7 +2763,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-cosine.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-cpfi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdissectors_la-packet-cpha.Plo@am__quote@ -@@ -4406,6 +4412,20 @@ libdissectors_la-packet-cops.lo: packet- +@@ -4611,6 +4617,20 @@ libdissectors_la-packet-cops.lo: packet- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdissectors_la_CFLAGS) $(CFLAGS) -c -o libdissectors_la-packet-cops.lo `test -f 'packet-cops.c' || echo '$(srcdir)/'`packet-cops.c -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit totem for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package totem for openSUSE:Factory checked in at 2012-03-05 18:02:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/totem (Old) and /work/SRC/openSUSE:Factory/.totem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "totem", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/totem/totem.changes 2012-02-20 16:19:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.totem.new/totem.changes 2012-03-05 18:02:42.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Feb 20 13:01:10 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.90: + + Show Vorbis DESCRIPTION field in Comments + + Use GTK+ code to detect the workspace's work area + + Do use direct seeking for files in the wastebasket + + Thumbnail FLAC files too + + Fix crash when using MPRIS plugin + + Fix compilation of the rotation plugin with newer Vala +- Add explicit BuildRequires after xorg-x11 packaging change: + libXtst-devel, pkgconfig(x11). +- Remove unneeded BuildRequires: pkgconfig(xrandr), + pkgconfig(xxf86vm). + +------------------------------------------------------------------- Old: ---- totem-3.3.4.tar.xz New: ---- totem-3.3.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ totem.spec ++++++ --- /var/tmp/diff_new_pack.g3E31i/_old 2012-03-05 18:02:46.000000000 +0100 +++ /var/tmp/diff_new_pack.g3E31i/_new 2012-03-05 18:02:46.000000000 +0100 @@ -15,10 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define build_zeitgeist_plugin 1 Name: totem -Version: 3.3.4 +Version: 3.3.90 Release: 0 # FIXME: Check if --disable-maintainer-mode can be dropped from configure. Last checked with 3.2.0 Url: http://www.gnome.org/projects/totem/ @@ -31,6 +32,7 @@ BuildRequires: gnome-doc-utils-devel BuildRequires: gstreamer-0_10-plugins-good BuildRequires: intltool +BuildRequires: libXtst-devel BuildRequires: lirc-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files @@ -51,7 +53,7 @@ BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) BuildRequires: pkgconfig(gstreamer-tag-0.10) -BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.6 BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libepc-ui-1.0) > 0.4.0 @@ -63,8 +65,7 @@ BuildRequires: pkgconfig(shared-mime-info) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(totem-plparser) -BuildRequires: pkgconfig(xrandr) -BuildRequires: pkgconfig(xxf86vm) +BuildRequires: pkgconfig(x11) %if %{build_zeitgeist_plugin} BuildRequires: pkgconfig(zeitgeist-1.0) %endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit schedtool for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package schedtool for openSUSE:Factory checked in at 2012-03-05 18:02:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/schedtool (Old) and /work/SRC/openSUSE:Factory/.schedtool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "schedtool", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/schedtool/schedtool.changes 2011-09-23 12:45:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.schedtool.new/schedtool.changes 2012-03-05 18:02:36.000000000 +0100 @@ -1,0 +2,15 @@ +Thu Feb 23 01:33:43 UTC 2012 - mrdocs(a)opensuse.org + +- add optflags macro + +------------------------------------------------------------------- +Thu Feb 23 01:25:42 UTC 2012 - mrdocs(a)opensuse.org + +- fix the spec file formatting + +------------------------------------------------------------------- +Mon Feb 13 10:55:50 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ schedtool.spec ++++++ --- /var/tmp/diff_new_pack.0MgqBg/_old 2012-03-05 18:02:37.000000000 +0100 +++ /var/tmp/diff_new_pack.0MgqBg/_new 2012-03-05 18:02:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package schedtool # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -14,16 +14,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - - Name: schedtool Version: 1.3.0 -Release: 1 -License: GPLv2 +Release: 0 Summary: Query and set CPU scheduling parameters -Url: http://freequaos.host.sk/schedtool/ +License: GPL-2.0 Group: System/Monitoring +Url: http://freequaos.host.sk/schedtool/ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,6 +32,8 @@ %setup -q %build +export CXXFLAGS="%{optflags}" +export CFLAGS="$CXXFLAGS" make %{?_smp_mflags} %install -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rygel for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package rygel for openSUSE:Factory checked in at 2012-03-05 18:02:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rygel (Old) and /work/SRC/openSUSE:Factory/.rygel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rygel", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/rygel/rygel.changes 2012-02-16 12:27:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rygel.new/rygel.changes 2012-03-05 18:02:33.000000000 +0100 @@ -1,0 +2,20 @@ +Tue Feb 21 14:44:18 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 0.13.2: + + Work around a reference issue when using vala-0.16. + + Really add the hack for WMP 12. + + Fix XBox 360 showing the same songs multiple times in the + "Songs" listing when not using MediaExport back-end. + + Drop obsolete gconf dependency. + + Don't crash when loading the same module twice accidently. + + Add tests for ItemCreator class. + + Refactor, document and clean-up ItemCreator class. + + Use supplied <dc:date> in CreateObject call. + + Tracker: + - Revert the change that lets the fs-miner choose the RDF type. + This broke uploading very badly. + - Use the item's date when creating a new item. + + Bugs fixed: bgo#660477, bgo#664184, bgo#669858. + + Updated translations. + +------------------------------------------------------------------- Old: ---- rygel-0.13.1.tar.xz New: ---- rygel-0.13.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rygel.spec ++++++ --- /var/tmp/diff_new_pack.BOfdlW/_old 2012-03-05 18:02:36.000000000 +0100 +++ /var/tmp/diff_new_pack.BOfdlW/_new 2012-03-05 18:02:36.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: rygel -Version: 0.13.1 +Version: 0.13.2 Release: 0 Summary: Home Media Solution for GNOME based on UPnP/DLNA License: LGPL-2.0+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-spruz for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package rubygem-spruz for openSUSE:Factory checked in at 2012-03-05 18:02:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-spruz (Old) and /work/SRC/openSUSE:Factory/.rubygem-spruz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-spruz", Maintainer is "jsrain(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-spruz/rubygem-spruz.changes 2011-09-23 12:45:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-spruz.new/rubygem-spruz.changes 2012-03-05 18:02:32.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Feb 14 14:22:12 UTC 2012 - saschpe(a)suse.de + +- Ran spec-cleaner, note on last version update + +------------------------------------------------------------------- +Fri Oct 14 12:39:13 UTC 2011 - fcastelli(a)suse.com + +- Update to 0.2.13 + * No upstream changelog + +------------------------------------------------------------------- Old: ---- spruz-0.2.2.gem New: ---- spruz-0.2.13.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-spruz.spec ++++++ --- /var/tmp/diff_new_pack.oGAGCT/_old 2012-03-05 18:02:33.000000000 +0100 +++ /var/tmp/diff_new_pack.oGAGCT/_new 2012-03-05 18:02:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rubygem-spruz # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,60 +15,47 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: rubygem-spruz -Version: 0.2.2 -Release: 1 -%define mod_name spruz -# -Group: Development/Languages/Ruby +Version: 0.2.13 +Release: 0 License: MIT -# -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Summary: Useful stuff +Url: http://flori.github.com/spruz +Group: Development/Languages/Ruby +Source: spruz-%{version}.gem +BuildRequires: fdupes BuildRequires: rubygems_with_buildroot_patch +Provides: rubygem-spruz-0_2 = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %rubygems_requires -# -Url: http://flori.github.com/spruz -Source: %{mod_name}-%{version}.gem -# -Summary: Useful stuff %description All the stuff that isn't good/big enough for a real library. %package doc -Summary: RDoc documentation for %{mod_name} +Summary: RDoc documentation for spruz Group: Development/Languages/Ruby -License: GPLv2+ or Ruby Requires: %{name} = %{version} %description doc Documentation generated at gem installation time. Usually in RDoc and RI formats. - - %prep - %build - %install -%gem_install %{S:0} - -%clean -%{__rm} -rf %{buildroot} +%gem_install %{SOURCE0} +%fdupes %{buildroot} %files %defattr(-,root,root,-) %{_bindir}/enum -%{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_name}-%{version}.gem -%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_name}-%{version}/ -%{_libdir}/ruby/gems/%{rb_ver}/specifications/%{mod_name}-%{version}.gemspec +%{_libdir}/ruby/gems/%{rb_ver}/cache/spruz-%{version}.gem +%{_libdir}/ruby/gems/%{rb_ver}/gems/spruz-%{version}/ +%{_libdir}/ruby/gems/%{rb_ver}/specifications/spruz-%{version}.gemspec %files doc %defattr(-,root,root,-) -%doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_name}-%{version}/ +%doc %{_libdir}/ruby/gems/%{rb_ver}/doc/spruz-%{version}/ %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-pg for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package rubygem-pg for openSUSE:Factory checked in at 2012-03-05 18:01:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-pg (Old) and /work/SRC/openSUSE:Factory/.rubygem-pg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-pg", Maintainer is "MRueckert(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-pg/rubygem-pg.changes 2011-09-23 12:44:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-pg.new/rubygem-pg.changes 2012-03-05 18:02:30.000000000 +0100 @@ -1,0 +2,24 @@ +Thu Feb 16 08:24:24 UTC 2012 - saschpe(a)suse.de + +- Added detail about last version update +- Ran spec-cleaner + +------------------------------------------------------------------- +Mon Feb 13 10:54:58 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Thu Aug 4 12:55:25 UTC 2011 - fcastelli(a)novell.com + +- update to version 0.11.0 + * Move connection-parameter parsing into Ruby + * Automated merge with ssh://bitbucket.org/larskanis/ruby-pg + * Update cross compilation tasks to use Ruby 1.8.7 instead of 1.8.6 + * Update readme for cross compile + * Use RUBY_CC_VERSION from command line, if set + * update PG and OpenSSL version for cross compile + * always run "make libpq.a" for cross compilation + * re-add required libs for cross compilation + +------------------------------------------------------------------- Old: ---- pg-0.10.1.gem New: ---- pg-0.11.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-pg.spec ++++++ --- /var/tmp/diff_new_pack.ayBgnK/_old 2012-03-05 18:02:32.000000000 +0100 +++ /var/tmp/diff_new_pack.ayBgnK/_new 2012-03-05 18:02:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rubygem-pg # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,28 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: rubygem-pg -Version: 0.10.1 -Release: 1 -%define mod_name pg -# +Version: 0.11.0 +Release: 0 +Summary: A Ruby interface to the PostgreSQL RDBMS +License: Ruby Group: Development/Languages/Ruby -License: GPLv2+ or Ruby -# -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Url: http://bitbucket.org/ged/ruby-pg/ +%define mod_name pg +%define mod_full_name %{mod_name}-%{version} +Source: %{mod_full_name}.gem +BuildRequires: openssl-devel +BuildRequires: postgresql-devel +BuildRequires: ruby-devel >= 1.8.7 BuildRequires: rubygems_with_buildroot_patch -%rubygems_requires -BuildRequires: openssl-devel postgresql-devel Requires: ruby >= 1.8.7 -BuildRequires: ruby-devel >= 1.8.7 -# -Url: http://bitbucket.org/ged/ruby-pg/ -Source: %{mod_name}-%{version}.gem -# -Summary: A Ruby interface to the PostgreSQL RDBMS +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%rubygems_requires %description This is the extension library to access a PostgreSQL database from Ruby. @@ -45,7 +41,6 @@ %package doc Summary: RDoc documentation for %{mod_name} Group: Development/Languages/Ruby -License: GPLv2+ or Ruby Requires: %{name} = %{version} %description doc @@ -55,36 +50,30 @@ %package testsuite Summary: Test suite for %{mod_name} Group: Development/Languages/Ruby -License: GPLv2+ or Ruby Requires: %{name} = %{version} %description testsuite Test::Unit or RSpec files, useful for developers. %prep - %build - %install -%gem_install %{S:0} +%gem_install %{SOURCE0} %gem_cleanup -%clean -%{__rm} -rf %{buildroot} - %files %defattr(-,root,root,-) -%{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_name}-%{version}.gem -%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_name}-%{version}/ -%exclude %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_name}-%{version}/spec -%{_libdir}/ruby/gems/%{rb_ver}/specifications/%{mod_name}-%{version}.gemspec +%{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_full_name}.gem +%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/ +%exclude %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/spec +%{_libdir}/ruby/gems/%{rb_ver}/specifications/%{mod_full_name}.gemspec %files doc %defattr(-,root,root,-) -%doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_name}-%{version}/ +%doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_full_name}/ %files testsuite %defattr(-,root,root,-) -%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_name}-%{version}/spec +%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/spec %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ristretto for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package ristretto for openSUSE:Factory checked in at 2012-03-05 18:01:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ristretto (Old) and /work/SRC/openSUSE:Factory/.ristretto.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ristretto", Maintainer is "xfce-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/ristretto/ristretto.changes 2012-02-16 10:09:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ristretto.new/ristretto.changes 2012-03-05 18:02:24.000000000 +0100 @@ -1,0 +2,11 @@ +Sat Mar 3 13:09:08 UTC 2012 - gber(a)opensuse.org + +- update to version 0.3.5 + - do not use symbols from gtk+ > 2.20 + - report image-loading errors back to the user + - fix ristretto.desktop mime-types list is incomplete) +- rebased ristretto-0.0.91-add-more-mime-types.patch as + ristretto-add-mime-types.patch +- drop obsolete ristretto-0.3.4-fix-gtk-requirements.patch + +------------------------------------------------------------------- Old: ---- ristretto-0.0.91-add-more-mime-types.patch ristretto-0.3.4-fix-gtk-requirements.patch ristretto-0.3.4.tar.bz2 New: ---- ristretto-0.3.5.tar.bz2 ristretto-add-mime-types.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ristretto.spec ++++++ --- /var/tmp/diff_new_pack.wf2wIX/_old 2012-03-05 18:02:30.000000000 +0100 +++ /var/tmp/diff_new_pack.wf2wIX/_new 2012-03-05 18:02:30.000000000 +0100 @@ -15,24 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ristretto -Version: 0.3.4 +Version: 0.3.5 Release: 0 Summary: Fast and Lightweight Image-viewer for the Xfce desktop environment License: GPL-2.0+ Group: Productivity/Graphics/Viewers Url: http://goodies.xfce.org/projects/applications/ristretto Source0: %{name}-%{version}.tar.bz2 -# PATCH-FEATURE-OPENSUSE ristretto-0.0.91-add-more-mime-types.patch gber(a)opensuse.org -- Adds support for additional image MIME types supported by openSUSE -Patch0: ristretto-0.0.91-add-more-mime-types.patch -# PATCH-FIX-UPSTREAM ristretto-0.3.4-fix-gtk-requirements.patch bxo#8343 gber(a)opensuse.org -- Only depend on GTK+ >= 2.20 (patch from upstream git) -Patch1: ristretto-0.3.4-fix-gtk-requirements.patch +# PATCH-FEATURE-OPENSUSE ristretto-add-mime-types.patch gber(a)opensuse.org -- Adds support for additional image MIME types supported by openSUSE +Patch0: ristretto-add-mime-types.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: pkg-config BuildRequires: thunar-devel BuildRequires: update-desktop-files -BuildRequires: xfce4-dev-tools BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libxfce4ui-1) @@ -44,10 +42,8 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build -xdt-autogen %configure --docdir=%{_datadir}/xfce4/ristretto make %{?_smp_mflags} ++++++ ristretto-0.3.4.tar.bz2 -> ristretto-0.3.5.tar.bz2 ++++++ ++++ 3284 lines of diff (skipped) ++++++ ristretto-add-mime-types.patch ++++++ Index: ristretto-0.3.5/ristretto.desktop.in =================================================================== --- ristretto-0.3.5.orig/ristretto.desktop.in +++ ristretto-0.3.5/ristretto.desktop.in @@ -10,4 +10,4 @@ Type=Application X-MultipleArgs=false Categories=GTK;Graphics;Viewer; StartupNotify=true -MimeType=image/png;image/gif;image/jpeg;image/bmp;image/x-pixmap;image/tiff;image/svg+xml;image/x-xpixmap; +MimeType=image/png;image/gif;image/jpeg;image/bmp;image/tiff;image/svg+xml;image/x-xpixmap;image/x-xpm;image/x-cmu-raster;image/x-ico;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-sun-raster;image/x-tga;image/x-win-bitmap;image/x-xbitmap; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rfc for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package rfc for openSUSE:Factory checked in at 2012-03-05 18:01:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rfc (Old) and /work/SRC/openSUSE:Factory/.rfc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rfc", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rfc/rfc.changes 2012-02-25 14:12:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rfc.new/rfc.changes 2012-03-05 18:01:51.000000000 +0100 @@ -2 +2 @@ -Sat Feb 25 07:42:32 CET 2012 - autobuild(a)suse.de +Sat Mar 3 08:44:03 CET 2012 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2012-02-25 +- automated update on 2012-03-03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfc.tgz ++++++ /work/SRC/openSUSE:Factory/rfc/rfc.tgz /work/SRC/openSUSE:Factory/.rfc.new/rfc.tgz differ: char 5, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-feedparser for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package python-feedparser for openSUSE:Factory checked in at 2012-03-05 18:01:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-feedparser (Old) and /work/SRC/openSUSE:Factory/.python-feedparser.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-feedparser", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-feedparser/python-feedparser.changes 2012-02-22 16:36:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-feedparser.new/python-feedparser.changes 2012-03-05 18:01:38.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 21 12:48:33 UTC 2012 - saschpe(a)suse.de + +- Fix feedparser.py syntax error + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-feedparser.spec ++++++ --- /var/tmp/diff_new_pack.FifxiR/_old 2012-03-05 18:01:42.000000000 +0100 +++ /var/tmp/diff_new_pack.FifxiR/_new 2012-03-05 18:01:42.000000000 +0100 @@ -42,7 +42,6 @@ %prep %setup -q -n feedparser-%{version} chmod 0644 README # Fix executable bits -sed -i "1d" feedparser/feedparser.py # Fix non-executable script %build python setup.py build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-Fabric for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package python-Fabric for openSUSE:Factory checked in at 2012-03-05 18:01:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Fabric (Old) and /work/SRC/openSUSE:Factory/.python-Fabric.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Fabric", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-Fabric/python-Fabric.changes 2012-02-14 13:10:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-Fabric.new/python-Fabric.changes 2012-03-05 18:01:31.000000000 +0100 @@ -1,0 +2,61 @@ +Tue Feb 21 11:38:31 UTC 2012 - saschpe(a)suse.de + +- Comment out testsuite requirements for now + +------------------------------------------------------------------- +Tue Feb 21 09:05:01 UTC 2012 - saschpe(a)suse.de + +- Disabled testsuite for now, python-fudge is to new ;-) + +------------------------------------------------------------------- +Mon Feb 20 22:15:10 UTC 2012 - saschpe(a)gmx.de + +- Update to version 1.4.0: + * :bug:495 Fixed documentation example showing how to subclass + ~fabric.tasks.Task. Thanks to Brett Haydon for the catch and Mark Merritt + for the patch. + * :bug:410 Fixed a bug where using the ~fabric.decorators.task decorator + inside/under another decorator such as ~fabric.decorators.hosts could cause + that task to become invalid when invoked by name (due to how old-style vs + new-style tasks are detected.) Thanks to Dan Colish for the initial patch. + * :feature:559 ~fabric.contrib.project.rsync_project now allows users to + append extra SSH-specific arguments to rsync's --rsh flag. + * :feature:138 :ref:env.port <port> may now be written to at fabfile module + level to set a default nonstandard port number. Previously this value was + read-only. + * :feature:3 Fabric can now load a subset of SSH config functionality + directly from your local ~/.ssh/config if :ref:env.use_ssh_config + <use-ssh-config> is set to True. See :ref:ssh-config for details. + Thanks to Kirill Pinchuk for the initial patch. + * :feature:12 Added the ability to try connecting multiple times to + temporarily-down remote systems, instead of immediately failing. (Default + behavior is still to only try once.) See :ref:env.timeout <timeout> and + :ref:env.connection_attempts <connection-attempts> for controlling both + connection timeouts and total number of attempts. ~fabric.operations.reboot + has also been overhauled (but practically deprecated -- see its updated + docs.) + * :feature:474 ~fabric.tasks.execute now allows you to access the executed + task's return values, by itself returning a dictionary whose keys are the + host strings executed against. + * :bug:487 Overhauled the regular expression escaping performed in + ~fabric.contrib.files.append and ~fabric.contrib.files.contains to try + and handle more corner cases. Thanks to Neilen Marais for the patch. + * :support:532 Reorganized and cleaned up the output of fab --help. + * :feature:8 Added :option:--skip-bad-hosts/:ref:env.skip_bad_hosts + <skip-bad-hosts> option to allow skipping past temporarily down/unreachable + hosts. + * :feature:13 Env vars may now be set at runtime via the new :option:--set + command-line flag. + * :feature:506 A new :ref:output alias <output-aliases>, commands, has + been added, which allows hiding remote stdout and local "running command X" + output lines. + * :feature:72 SSH agent forwarding support has made it into Fabric's SSH + library, and hooks for using it have been added (disabled by default; use + :option:-A or :ref:env.forward_agent <forward-agent> to enable.) Thanks + to Ben Davis for porting an existing Paramiko patch to ssh and providing + the necessary tweak to Fabric. +- Package AUTHORS and LICENSE +- Run testsuite and add related BuildRequires +- BuildRequire python-ssh + +------------------------------------------------------------------- @@ -30 +91 @@ - ``ImportError``s for dependencies. Thanks to David Wolever for the patches. + ImportErrors for dependencies. Thanks to David Wolever for the patches. Old: ---- Fabric-1.3.4.tar.bz2 New: ---- Fabric-1.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Fabric.spec ++++++ --- /var/tmp/diff_new_pack.PKGfFa/_old 2012-03-05 18:01:32.000000000 +0100 +++ /var/tmp/diff_new_pack.PKGfFa/_new 2012-03-05 18:01:32.000000000 +0100 @@ -15,26 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-Fabric -Version: 1.3.4 +Version: 1.4.0 Release: 0 -Url: http://fabfile.org Summary: Fabric is a simple, Pythonic tool for remote execution and deployment License: BSD-2-Clause Group: Development/Languages/Python -Source: Fabric-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Url: http://fabfile.org +Source: Fabric-%{version}.tar.gz BuildRequires: python-devel BuildRequires: python-distribute -Requires: python-paramiko >= 1.7.6 +#BuildRequires: python-fudge +#BuildRequires: python-ssh Requires: python-distribute -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1110 +Requires: python-ssh +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else BuildArch: noarch %endif -%endif -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description Fabric is a Python (2.5 or higher) library and command-line tool for @@ -81,9 +82,12 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +#%%check +#python setup.py test + %files %defattr(-,root,root,-) -%doc README +%doc AUTHORS LICENSE README %{_bindir}/fab %{python_sitelib}/* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit plasmoid-cwp for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package plasmoid-cwp for openSUSE:Factory checked in at 2012-03-05 18:01:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasmoid-cwp (Old) and /work/SRC/openSUSE:Factory/.plasmoid-cwp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasmoid-cwp", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/plasmoid-cwp/plasmoid-cwp.changes 2012-02-27 18:35:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plasmoid-cwp.new/plasmoid-cwp.changes 2012-03-05 18:01:20.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Feb 29 20:33:22 UTC 2012 - asterios.dramis(a)gmail.com + +- Update to version 1.5.11: + * xml: gismeteo.com: fixed (thanks to Dreid) + * xml: www.weather.com.cn: fixes + +------------------------------------------------------------------- Old: ---- 98925-cwp-1.5.10.tar.bz2 New: ---- 98925-cwp-1.5.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasmoid-cwp.spec ++++++ --- /var/tmp/diff_new_pack.bCOZdh/_old 2012-03-05 18:01:21.000000000 +0100 +++ /var/tmp/diff_new_pack.bCOZdh/_new 2012-03-05 18:01:21.000000000 +0100 @@ -18,7 +18,7 @@ Name: plasmoid-cwp -Version: 1.5.10 +Version: 1.5.11 Release: 0 Summary: Customizable Weather Plasmoid License: GPL-3.0+ ++++++ 98925-cwp-1.5.10.tar.bz2 -> 98925-cwp-1.5.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/ChangeLog new/cwp-1.5.11/ChangeLog --- old/cwp-1.5.10/ChangeLog 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/ChangeLog 2012-02-28 21:32:30.000000000 +0100 @@ -1,3 +1,8 @@ +1.5.11 +====== +- xml: gismeteo.com: fixed (thanks to Dreid) +- xml: www.weather.com.cn: fixes + 1.5.10 ====== - xml: gismeteo.com: negative temperature values fixed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/README new/cwp-1.5.11/README --- old/cwp-1.5.10/README 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/README 2012-02-28 21:32:31.000000000 +0100 @@ -1,5 +1,5 @@ -========================================= -Customizable Weather Plasmoid (CWP) 1.5.10 +========================================== +Customizable Weather Plasmoid (CWP) 1.5.11 ========================================== This is another weather plasmoid. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/br_weather_com.xml new/cwp-1.5.11/data/br_weather_com.xml --- old/cwp-1.5.10/data/br_weather_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/br_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="br.weather.com" search_page="http://br.weather.com" example_zip="BRXX0043" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="br.weather.com" search_page="http://br.weather.com" example_zip="BRXX0043" unit="C" /> <locale_settings locale="pt" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/de_weather_com.xml new/cwp-1.5.11/data/de_weather_com.xml --- old/cwp-1.5.10/data/de_weather_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/de_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="de.weather.com" search_page="http://de.weather.com" example_zip="80331" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="de.weather.com" search_page="http://de.weather.com" example_zip="80331" unit="C" /> <locale_settings locale="de" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/espanol_weather_com.xml new/cwp-1.5.11/data/espanol_weather_com.xml --- old/cwp-1.5.10/data/espanol_weather_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/espanol_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="espanol.weather.com" search_page="http://espanol.weather.com" example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="espanol.weather.com" search_page="http://espanol.weather.com" example_zip="Ciudad-de-Mexico-MXDF0132" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/fr_weather_com.xml new/cwp-1.5.11/data/fr_weather_com.xml --- old/cwp-1.5.10/data/fr_weather_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/fr_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="fr.weather.com" search_page="http://fr.weather.com" example_zip="Paris-FRXX0076" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="fr.weather.com" search_page="http://fr.weather.com" example_zip="Paris-FRXX0076" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/freemeteo_com_celsius.xml new/cwp-1.5.11/data/freemeteo_com_celsius.xml --- old/cwp-1.5.10/data/freemeteo_com_celsius.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/freemeteo_com_celsius.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="freemeteo.com" search_page="http://freemeteo.com" example_zip="gid=3117735&la=4" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="freemeteo.com" search_page="http://freemeteo.com" example_zip="gid=3117735&la=4" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/freemeteo_com_fahrenheit.xml new/cwp-1.5.11/data/freemeteo_com_fahrenheit.xml --- old/cwp-1.5.10/data/freemeteo_com_fahrenheit.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/freemeteo_com_fahrenheit.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="freemeteo.com" search_page="http://freemeteo.com" example_zip="gid=3117735&la=4" unit="F" /> + <xml_file_version type="cwp" version="2012-02-28" name="freemeteo.com" search_page="http://freemeteo.com" example_zip="gid=3117735&la=4" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/ilmeteo_it.xml new/cwp-1.5.11/data/ilmeteo_it.xml --- old/cwp-1.5.10/data/ilmeteo_it.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/ilmeteo_it.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="ilmeteo.it" search_page="http://www.ilmeteo.it" example_zip="Roma" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="ilmeteo.it" search_page="http://www.ilmeteo.it" example_zip="Roma" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/in_weather_com.xml new/cwp-1.5.11/data/in_weather_com.xml --- old/cwp-1.5.10/data/in_weather_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/in_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="in.weather.com" search_page="http://in.weather.com" example_zip="New-Delhi-INXX0096" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="in.weather.com" search_page="http://in.weather.com" example_zip="New-Delhi-INXX0096" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/myforecast_com_celsius.xml new/cwp-1.5.11/data/myforecast_com_celsius.xml --- old/cwp-1.5.10/data/myforecast_com_celsius.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/myforecast_com_celsius.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.myforecast.com" search_page="http://www.myforecast.com" example_zip="12844" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="www.myforecast.com" search_page="http://www.myforecast.com" example_zip="12844" unit="C" /> <locale_settings locale="en" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/myforecast_com_fahrenheit.xml new/cwp-1.5.11/data/myforecast_com_fahrenheit.xml --- old/cwp-1.5.10/data/myforecast_com_fahrenheit.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/myforecast_com_fahrenheit.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.myforecast.com" search_page="http://www.myforecast.com" example_zip="12844" unit="F" /> + <xml_file_version type="cwp" version="2012-02-28" name="www.myforecast.com" search_page="http://www.myforecast.com" example_zip="12844" unit="F" /> <locale_settings locale="en" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/pogodynka_pl.xml new/cwp-1.5.11/data/pogodynka_pl.xml --- old/cwp-1.5.10/data/pogodynka_pl.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/pogodynka_pl.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="pogodynka.pl" search_page="http://www.pogodynka.pl" example_zip="polska/warszawa_warszawa" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="pogodynka.pl" search_page="http://www.pogodynka.pl" example_zip="polska/warszawa_warszawa" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/satellite_images.xml new/cwp-1.5.11/data/satellite_images.xml --- old/cwp-1.5.10/data/satellite_images.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/satellite_images.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp_satellite_images" version="2012-02-19" /> + <xml_file_version type="cwp_satellite_images" version="2012-02-28" />  <image name="- - Global - -" url="" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/uk_weather_com.xml new/cwp-1.5.11/data/uk_weather_com.xml --- old/cwp-1.5.10/data/uk_weather_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/uk_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="uk.weather.com" search_page="http://uk.weather.com" example_zip="London-UKXX0085" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="uk.weather.com" search_page="http://uk.weather.com" example_zip="London-UKXX0085" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/wetter_com.xml new/cwp-1.5.11/data/wetter_com.xml --- old/cwp-1.5.10/data/wetter_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/wetter_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.wetter.com" search_page="http://www.wetter.com" example_zip="DE0006515" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="www.wetter.com" search_page="http://www.wetter.com" example_zip="DE0006515" unit="C" /> <locale_settings locale="de" encoding="latin1" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/www_accuweather_com_us_celsius.xml new/cwp-1.5.11/data/www_accuweather_com_us_celsius.xml --- old/cwp-1.5.10/data/www_accuweather_com_us_celsius.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/www_accuweather_com_us_celsius.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.accuweather.com US" search_page="http://www.accuweather.com" example_zip="85001" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="www.accuweather.com US" search_page="http://www.accuweather.com" example_zip="85001" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/www_accuweather_com_us_fahrenheit.xml new/cwp-1.5.11/data/www_accuweather_com_us_fahrenheit.xml --- old/cwp-1.5.10/data/www_accuweather_com_us_fahrenheit.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/www_accuweather_com_us_fahrenheit.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.accuweather.com US" search_page="http://www.accuweather.com" example_zip="85001" unit="F" /> + <xml_file_version type="cwp" version="2012-02-28" name="www.accuweather.com US" search_page="http://www.accuweather.com" example_zip="85001" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/www_accuweather_com_world_celsius.xml new/cwp-1.5.11/data/www_accuweather_com_world_celsius.xml --- old/cwp-1.5.10/data/www_accuweather_com_world_celsius.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/www_accuweather_com_world_celsius.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.accuweather.com World" search_page="http://www.accuweather.com/rss-center.asp" example_zip="AFR|ZA|SF004|JOHANNESBURG" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="www.accuweather.com World" search_page="http://www.accuweather.com/rss-center.asp" example_zip="AFR|ZA|SF004|JOHANNESBURG" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/www_accuweather_com_world_fahrenheit.xml new/cwp-1.5.11/data/www_accuweather_com_world_fahrenheit.xml --- old/cwp-1.5.10/data/www_accuweather_com_world_fahrenheit.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/www_accuweather_com_world_fahrenheit.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.accuweather.com World" search_page="http://www.accuweather.com/rss-center.asp" example_zip="AFR|ZA|SF004|JOHANNESBURG" unit="F" /> + <xml_file_version type="cwp" version="2012-02-28" name="www.accuweather.com World" search_page="http://www.accuweather.com/rss-center.asp" example_zip="AFR|ZA|SF004|JOHANNESBURG" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/www_gismeteo_com.xml new/cwp-1.5.11/data/www_gismeteo_com.xml --- old/cwp-1.5.10/data/www_gismeteo_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/www_gismeteo_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.gismeteo.com" search_page="http://www.gismeteo.ru" example_zip="4944" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="www.gismeteo.com" search_page="http://www.gismeteo.ru" example_zip="4944" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -33,14 +33,14 @@ <data_current_temperature url="urlc" update_time="grep icon\ date | sed -e "s/.*icon date[^>]*>[^:]* $[0-9]\+:[0-9]\+$.*/\1/" | awk '{if ($1 ~ /^[0-9]+:[0-9]+$/) {print} else {print "N.A."} ; }'" - temperature="grep -A 19 id=\"weather\" | grep temp | sed -e "s/<[^>]*>//g" | sed -e "s/&minus;/-/g" | sed -e "s/[^-0-9]*$[^&]*$.*/\1/"" + temperature="grep -A 19 id=\"weather\" | grep "temp c" | sed -e "s/&minus;/-/" | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^-0-9]$[-0-9]\+$&deg.*/\1/"" temperature_felt="echo -n" /> <data_current_wind url="urlc" - wind="grep -A 19 id=\"weather\" | grep wind | sed -e "s/.*wicon.*wicon.*<dd>$[^<]*$<.*unit[^>]*>$[^<,]*$.*<dt>$[^<]*$.*/\1 \2 - \3/"" - wind_code="grep -A 19 id=\"weather\" | grep wind | sed -e "s/.*wicon.*wicon.*<dd>$[^<]*$<.*unit[^>,]*>$[^<,]*$.*<dt>$[^<]*$.*/\3/"" - wind_speed="grep -A 19 id=\"weather\" | grep wind | sed -e "s/.*wicon.*wicon.*<dd>$[^<]*$<.*unit[^>,]*>$[^<,]*$.*<dt>$[^<]*$.*/\1 \2/"" + wind="grep -A 19 id=\"weather\"|grep -A 4 wicon| tr -d '\r' | tr -d '\n'|sed -e "s/.*wind ms[^>]*>$[^<]*$<[^<]*class=.unit[^>]>$[^<]*$<.*<dt>$[^<]*$<.*/\3 - \1 \2/"" + wind_code="grep -A 19 id=\"weather\"|grep -A 4 wicon|tail -n 1|sed -e "s/<[^>]*>//g"" + wind_speed="grep -A 19 id=\"weather\" | grep "wind ms" | sed -e "s/.*class=.value[^>]*>$[^<]*$<.*class=.unit[^>]*>$[^<]*$<.*/\1 \2/"" /> <data_current_icon url="urlc" @@ -50,66 +50,66 @@ /> <data_current_additional url="urlc" - humidity="grep -A 19 id=\"weather\" | grep hum | sed -e "s/<[^>]*>//g"" + humidity="grep -A 26 id=\"weather\" | grep hum | sed -e "s/<[^>]*>//g" | sed -e "s/&nbsp;/ /"" rain="echo -n" dew_point="echo -n" visibility="echo -n" - pressure="grep -A 19 id=\"weather\" | grep barp | sed -e "s/<[^>]*>//g"" + pressure="grep -A 26 id=\"weather\" | grep "press tor" | sed -e "s/<[^>]*>//g"" uv_index="echo -n" /> <data_day1 url="url1" name="grep -A 8 weekday | head -n 9 | tail -n 9 | grep weekday | sed -e "s/.*weekday[^>]*>$[^<]*$.*/\1/"" - temperature_low="grep -A 8 weekday | head -n 9 | tail -n 9 | grep temp | head -n 1 | sed -e "s/.*temp[^>]*>+*$[^<]\+$.*/\1/" | sed -e "s/&minus;/-/g"" - temperature_high="grep -A 8 weekday | head -n 9 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/.*temp[^>]*>+*$[^<]\+$.*/\1/" | sed -e "s/&minus;/-/g"" + temperature_low="grep -A 8 weekday | head -n 9 | tail -n 9 | grep temp | head -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*$[-0-9]\+$.*/\1/"" + temperature_high="grep -A 8 weekday | head -n 9 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*$[-0-9]\+$.*/\1/"" icon="grep -A 8 weekday | head -n 9 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*$http[^\"]*$.*/\1/"" icon_code="grep -A 8 weekday | head -n 9 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*$http[^\"]*$.*/\1/" | sed 's/.*new\/$.*$\.png.*/\1/'" icon_text="grep -A 8 weekday | head -n 9 | tail -n 9 | grep cltext | tail -n 1 | sed -e "s/.*cltext[^>]*>$[^<]*$.*/\1/"" /> <data_day2 url="url1" name="grep -A 8 weekday | head -n 19 | tail -n 9 | grep weekday | sed -e "s/.*weekday[^>]*>$[^<]*$.*/\1/"" - temperature_low="grep -A 8 weekday | head -n 19 | tail -n 9 | grep temp | head -n 1 | sed -e "s/.*temp[^>]*>+*$[^<]\+$.*/\1/" | sed -e "s/&minus;/-/g"" - temperature_high="grep -A 8 weekday | head -n 19 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/.*temp[^>]*>+*$[^<]\+$.*/\1/" | sed -e "s/&minus;/-/g"" + temperature_low="grep -A 8 weekday | head -n 19 | tail -n 9 | grep temp | head -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*$[-0-9]\+$.*/\1/"" + temperature_high="grep -A 8 weekday | head -n 19 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*$[-0-9]\+$.*/\1/"" icon="grep -A 8 weekday | head -n 19 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*$http[^\"]*$.*/\1/"" icon_code="grep -A 8 weekday | head -n 19 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*$http[^\"]*$.*/\1/" | sed 's/.*new\/$.*$\.png.*/\1/'" icon_text="grep -A 8 weekday | head -n 19 | tail -n 9 | grep cltext | tail -n 1 | sed -e "s/.*cltext[^>]*>$[^<]*$.*/\1/"" /> <data_day3 url="url1" name="grep -A 8 weekday | head -n 29 | tail -n 9 | grep weekday | sed -e "s/.*weekday[^>]*>$[^<]*$.*/\1/"" - temperature_low="grep -A 8 weekday | head -n 29 | tail -n 9 | grep temp | head -n 1 | sed -e "s/.*temp[^>]*>+*$[^<]\+$.*/\1/" | sed -e "s/&minus;/-/g"" - temperature_high="grep -A 8 weekday | head -n 29 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/.*temp[^>]*>+*$[^<]\+$.*/\1/" | sed -e "s/&minus;/-/g"" + temperature_low="grep -A 8 weekday | head -n 29 | tail -n 9 | grep temp | head -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*$[-0-9]\+$.*/\1/"" + temperature_high="grep -A 8 weekday | head -n 29 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*$[-0-9]\+$.*/\1/"" icon="grep -A 8 weekday | head -n 29 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*$http[^\"]*$.*/\1/"" icon_code="grep -A 8 weekday | head -n 29 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*$http[^\"]*$.*/\1/" | sed 's/.*new\/$.*$\.png.*/\1/'" icon_text="grep -A 8 weekday | head -n 29 | tail -n 9 | grep cltext | tail -n 1 | sed -e "s/.*cltext[^>]*>$[^<]*$.*/\1/"" /> <data_day4 url="url1" name="grep -A 8 weekday | head -n 39 | tail -n 9 | grep weekday | sed -e "s/.*weekday[^>]*>$[^<]*$.*/\1/"" - temperature_low="grep -A 8 weekday | head -n 39 | tail -n 9 | grep temp | head -n 1 | sed -e "s/.*temp[^>]*>+*$[^<]\+$.*/\1/" | sed -e "s/&minus;/-/g"" - temperature_high="grep -A 8 weekday | head -n 39 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/.*temp[^>]*>+*$[^<]\+$.*/\1/" | sed -e "s/&minus;/-/g"" + temperature_low="grep -A 8 weekday | head -n 39 | tail -n 9 | grep temp | head -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*$[-0-9]\+$.*/\1/"" + temperature_high="grep -A 8 weekday | head -n 39 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*$[-0-9]\+$.*/\1/"" icon="grep -A 8 weekday | head -n 39 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*$http[^\"]*$.*/\1/"" icon_code="grep -A 8 weekday | head -n 39 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*$http[^\"]*$.*/\1/" | sed 's/.*new\/$.*$\.png.*/\1/'" icon_text="grep -A 8 weekday | head -n 39 | tail -n 9 | grep cltext | tail -n 1 | sed -e "s/.*cltext[^>]*>$[^<]*$.*/\1/"" /> <data_day5 url="url1" name="grep -A 8 weekday | head -n 49 | tail -n 9 | grep weekday | sed -e "s/.*weekday[^>]*>$[^<]*$.*/\1/"" - temperature_low="grep -A 8 weekday | head -n 49 | tail -n 9 | grep temp | head -n 1 | sed -e "s/.*temp[^>]*>+*$[^<]\+$.*/\1/" | sed -e "s/&minus;/-/g"" - temperature_high="grep -A 8 weekday | head -n 49 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/.*temp[^>]*>+*$[^<]\+$.*/\1/" | sed -e "s/&minus;/-/g"" + temperature_low="grep -A 8 weekday | head -n 49 | tail -n 9 | grep temp | head -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*$[-0-9]\+$.*/\1/"" + temperature_high="grep -A 8 weekday | head -n 49 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*$[-0-9]\+$.*/\1/"" icon="grep -A 8 weekday | head -n 49 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*$http[^\"]*$.*/\1/"" icon_code="grep -A 8 weekday | head -n 49 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*$http[^\"]*$.*/\1/" | sed 's/.*new\/$.*$\.png.*/\1/'" icon_text="grep -A 8 weekday | head -n 49 | tail -n 9 | grep cltext | tail -n 1 | sed -e "s/.*cltext[^>]*>$[^<]*$.*/\1/"" /> <data_day6 url="url1" name="grep -A 8 weekday | head -n 59 | tail -n 9 | grep weekday | sed -e "s/.*weekday[^>]*>$[^<]*$.*/\1/"" - temperature_low="grep -A 8 weekday | head -n 59 | tail -n 9 | grep temp | head -n 1 | sed -e "s/.*temp[^>]*>+*$[^<]\+$.*/\1/" | sed -e "s/&minus;/-/g"" - temperature_high="grep -A 8 weekday | head -n 59 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/.*temp[^>]*>+*$[^<]\+$.*/\1/" | sed -e "s/&minus;/-/g"" + temperature_low="grep -A 8 weekday | head -n 59 | tail -n 9 | grep temp | head -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*$[-0-9]\+$.*/\1/"" + temperature_high="grep -A 8 weekday | head -n 59 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*$[-0-9]\+$.*/\1/"" icon="grep -A 8 weekday | head -n 59 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*$http[^\"]*$.*/\1/"" icon_code="grep -A 8 weekday | head -n 59 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*$http[^\"]*$.*/\1/" | sed 's/.*new\/$.*$\.png.*/\1/'" icon_text="grep -A 8 weekday | head -n 59 | tail -n 9 | grep cltext | tail -n 1 | sed -e "s/.*cltext[^>]*>$[^<]*$.*/\1/"" /> <data_day7 url="url1" name="grep -A 8 weekday | head -n 69 | tail -n 9 | grep weekday | sed -e "s/.*weekday[^>]*>$[^<]*$.*/\1/"" - temperature_low="grep -A 8 weekday | head -n 69 | tail -n 9 | grep temp | head -n 1 | sed -e "s/.*temp[^>]*>+*$[^<]\+$.*/\1/" | sed -e "s/&minus;/-/g"" - temperature_high="grep -A 8 weekday | head -n 69 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/.*temp[^>]*>+*$[^<]\+$.*/\1/" | sed -e "s/&minus;/-/g"" + temperature_low="grep -A 8 weekday | head -n 69 | tail -n 9 | grep temp | head -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*$[-0-9]\+$.*/\1/"" + temperature_high="grep -A 8 weekday | head -n 69 | tail -n 9 | grep temp | tail -n 1 | sed -e "s/&minus;/-/" | sed -e "s/.*temp c[^>]*>+*$[-0-9]\+$.*/\1/"" icon="grep -A 8 weekday | head -n 69 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*$http[^\"]*$.*/\1/"" icon_code="grep -A 8 weekday | head -n 69 | tail -n 9 | grep png | tail -n 1 | sed -e "s/.*$http[^\"]*$.*/\1/" | sed 's/.*new\/$.*$\.png.*/\1/'" icon_text="grep -A 8 weekday | head -n 69 | tail -n 9 | grep cltext | tail -n 1 | sed -e "s/.*cltext[^>]*>$[^<]*$.*/\1/"" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/www_weather_com.cn.xml new/cwp-1.5.11/data/www_weather_com.cn.xml --- old/cwp-1.5.10/data/www_weather_com.cn.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/www_weather_com.cn.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.weather.com.cn" search_page="http://www.weather.com.cn" example_zip="101010100" unit="C" /> + <xml_file_version type="cwp" version="2012-02-28" name="www.weather.com.cn" search_page="http://www.weather.com.cn" example_zip="101010100" unit="C" /> <locale_settings locale="utf-8" encoding="utf8" /> @@ -60,65 +60,65 @@ <data_day1 url="url1" name="grep -A 3 day\ 1 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 40 day\ 1 | grep -A 1 ℃ | head -n 1 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" - temperature_high="grep -A 40 day\ 1 | grep -A 1 ℃ | head -n 3 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" - icon="grep -A 20 day\ 1 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/"" - icon_code="grep -A 20 day\ 1 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/$[^\/]*$.gif/\1/"" - icon_text="grep -A 20 day\ 1 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>$[^<]*$.*/\1/"" + temperature_low="grep -A 50 day\ 1 | grep -A 1 ℃ | head -n 1 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" + temperature_high="grep -A 50 day\ 1 | grep -A 1 ℃ | head -n 3 | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" + icon="grep -A 28 day\ 1 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/"" + icon_code="grep -A 28 day\ 1 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/$[^\/]*$.gif/\1/"" + icon_text="grep -A 28 day\ 1 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>$[^<]*$.*/\1/"" /> <data_day2 url="url1" name="grep -A 3 day\ 2 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 40 day\ 2 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" - temperature_high="grep -A 40 day\ 2 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" - icon="grep -A 20 day\ 2 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/"" - icon_code="grep -A 20 day\ 2 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/$[^\/]*$.gif/\1/"" - icon_text="grep -A 20 day\ 2 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>$[^<]*$.*/\1/"" + temperature_low="grep -A 50 day\ 2 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" + temperature_high="grep -A 50 day\ 2 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" + icon="grep -A 28 day\ 2 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/"" + icon_code="grep -A 28 day\ 2 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/$[^\/]*$.gif/\1/"" + icon_text="grep -A 28 day\ 2 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>$[^<]*$.*/\1/"" /> <data_day3 url="url1" name="grep -A 3 day\ 3 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 40 day\ 3 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" - temperature_high="grep -A 40 day\ 3 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" - icon="grep -A 20 day\ 3 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/"" - icon_code="grep -A 20 day\ 3 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/$[^\/]*$.gif/\1/"" - icon_text="grep -A 20 day\ 3 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>$[^<]*$.*/\1/"" + temperature_low="grep -A 50 day\ 3 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" + temperature_high="grep -A 50 day\ 3 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" + icon="grep -A 28 day\ 3 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/"" + icon_code="grep -A 28 day\ 3 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/$[^\/]*$.gif/\1/"" + icon_text="grep -A 28 day\ 3 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>$[^<]*$.*/\1/"" /> <data_day4 url="url1" name="grep -A 3 day\ 4 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 40 day\ 4 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" - temperature_high="grep -A 40 day\ 4 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" - icon="grep -A 20 day\ 4 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/"" - icon_code="grep -A 20 day\ 4 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/$[^\/]*$.gif/\1/"" - icon_text="grep -A 20 day\ 4 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>$[^<]*$.*/\1/"" + temperature_low="grep -A 50 day\ 4 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" + temperature_high="grep -A 50 day\ 4 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" + icon="grep -A 28 day\ 4 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/"" + icon_code="grep -A 28 day\ 4 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/$[^\/]*$.gif/\1/"" + icon_text="grep -A 28 day\ 4 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>$[^<]*$.*/\1/"" /> <data_day5 url="url1" name="grep -A 3 day\ 5 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 40 day\ 5 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" - temperature_high="grep -A 40 day\ 5 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" - icon="grep -A 20 day\ 5 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/"" - icon_code="grep -A 20 day\ 5 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/$[^\/]*$.gif/\1/"" - icon_text="grep -A 20 day\ 5 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>$[^<]*$.*/\1/"" + temperature_low="grep -A 50 day\ 5 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" + temperature_high="grep -A 50 day\ 5 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" + icon="grep -A 28 day\ 5 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/"" + icon_code="grep -A 28 day\ 5 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/$[^\/]*$.gif/\1/"" + icon_text="grep -A 28 day\ 5 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>$[^<]*$.*/\1/"" /> <data_day6 url="url1" name="grep -A 3 day\ 6 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 40 day\ 6 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" - temperature_high="grep -A 40 day\ 6 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" - icon="grep -A 20 day\ 6 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/"" - icon_code="grep -A 20 day\ 6 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/$[^\/]*$.gif/\1/"" - icon_text="grep -A 20 day\ 6 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>$[^<]*$.*/\1/"" + temperature_low="grep -A 50 day\ 6 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" + temperature_high="grep -A 50 day\ 6 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" + icon="grep -A 28 day\ 6 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/"" + icon_code="grep -A 28 day\ 6 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/$[^\/]*$.gif/\1/"" + icon_text="grep -A 28 day\ 6 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>$[^<]*$.*/\1/"" /> <data_day7 url="url1" name="grep -A 3 day\ 7 | tail -n 1 | sed -e "s/<[^>]*>//g"" - temperature_low="grep -A 40 day\ 7 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" - temperature_high="grep -A 40 day\ 7 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" - icon="grep -A 20 day\ 7 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/"" - icon_code="grep -A 20 day\ 7 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/$[^\/]*$.gif/\1/"" - icon_text="grep -A 20 day\ 7 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>$[^<]*$.*/\1/"" + temperature_low="grep -A 50 day\ 7 | grep ℃ | tail -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" + temperature_high="grep -A 50 day\ 7 | grep ℃ | head -n 1 | sed -e "s/<[^>]*>//g" | sed -e "s/.*[^0-9-]$[-]*[0-9]*$℃.*/\1/"" + icon="grep -A 28 day\ 7 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/"" + icon_code="grep -A 28 day\ 7 | grep icon_weather | head -n 1 | sed -e "s/.*img src=\"$[^\"]*$.*/http:\/\/www.weather.com.cn\1/" | sed -e "s/.*\/$[^\/]*$.gif/\1/"" + icon_text="grep -A 28 day\ 7 | grep -A 3 icon_weather | tail -n 1 | sed -e "s/[^<]*<[^>]*>[^<]*<[^>]*>$[^<]*$.*/\1/"" /> <icon_transform diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/data/www_weather_com.xml new/cwp-1.5.11/data/www_weather_com.xml --- old/cwp-1.5.10/data/www_weather_com.xml 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/data/www_weather_com.xml 2012-02-28 21:32:31.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <custom_weather> - <xml_file_version type="cwp" version="2012-02-19" name="www.weather.com" search_page="http://www.weather.com" example_zip="USDC0001" unit="F" /> + <xml_file_version type="cwp" version="2012-02-28" name="www.weather.com" search_page="http://www.weather.com" example_zip="USDC0001" unit="F" /> <locale_settings locale="utf-8" encoding="utf8" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/plasma-applet-cwp.desktop new/cwp-1.5.11/plasma-applet-cwp.desktop --- old/cwp-1.5.10/plasma-applet-cwp.desktop 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/plasma-applet-cwp.desktop 2012-02-28 21:32:30.000000000 +0100 @@ -30,7 +30,7 @@ X-KDE-PluginInfo-Author=Georg Hennig X-KDE-PluginInfo-Email=georg.hennig(a)web.de X-KDE-PluginInfo-Name=plasma_applet_cwp -X-KDE-PluginInfo-Version=1.5.10 +X-KDE-PluginInfo-Version=1.5.11 X-KDE-PluginInfo-Website=http://www.kde-look.org/content/show.php/show.php?… X-KDE-PluginInfo-Category= X-KDE-PluginInfo-Depends= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cwp-1.5.10/version.h new/cwp-1.5.11/version.h --- old/cwp-1.5.10/version.h 2012-02-19 11:45:52.000000000 +0100 +++ new/cwp-1.5.11/version.h 2012-02-28 21:32:31.000000000 +0100 @@ -20,7 +20,7 @@ #ifndef version_h #define version_h -#define VERSION "1.5.10" +#define VERSION "1.5.11" #define DATE "2009-2012" #define AUTHOR "Georg Hennig" #define NAME "Customizable Weather Plasmoid (CWP)" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Package-Constants for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package perl-Package-Constants for openSUSE:Factory checked in at 2012-03-05 18:01:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Package-Constants (Old) and /work/SRC/openSUSE:Factory/.perl-Package-Constants.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Package-Constants", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Package-Constants.new/perl-Package-Constants.changes 2012-03-05 18:01:15.000000000 +0100 @@ -0,0 +1,17 @@ +------------------------------------------------------------------- +Tue Nov 30 14:44:52 UTC 2010 - coolo(a)novell.com + +- switch to perl_requires macro + +------------------------------------------------------------------- +Sat Jul 25 19:41:05 CEST 2009 - chris(a)computersalat.de + +- spec mods + * removed ^---------- + * removed ^#--------- + +------------------------------------------------------------------- +Sat Jun 27 19:46:21 CEST 2009 - chris(a)computersalat.de + +- initial pkg 0.02 + New: ---- Package-Constants-0.02.tar.gz perl-Package-Constants.changes perl-Package-Constants.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Package-Constants.spec ++++++ # # spec file for package perl-Package-Constants # # Copyright (c) 2012 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/ # Name: perl-Package-Constants Version: 0.02 Release: 0 %define cpan_name Package-Constants Summary: List all constants declared in a package License: GPL-1.0+ or Artistic-1.0 Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Package-Constants/ Source: http://www.cpan.org/authors/id/K/KA/KANE/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros %{perl_requires} %description 'Package::Constants' lists all the constants defined in a certain package. This can be useful for, among others, setting up an autogenerated '@EXPORT/@EXPORT_OK' for a Constants.pm file. %prep %setup -q -n %{cpan_name}-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} %check %{__make} test %install %perl_make_install %perl_process_packlist %perl_gen_filelist %files -f %{name}.files %defattr(-,root,root,755) %doc CHANGES README %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Net-IDN-Encode for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package perl-Net-IDN-Encode for openSUSE:Factory checked in at 2012-03-05 18:01:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Net-IDN-Encode (Old) and /work/SRC/openSUSE:Factory/.perl-Net-IDN-Encode.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Net-IDN-Encode", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Net-IDN-Encode.new/perl-Net-IDN-Encode.changes 2012-03-05 18:01:08.000000000 +0100 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 1 13:34:06 UTC 2010 - coolo(a)novell.com + +- switch to perl_requires macro + +------------------------------------------------------------------- +Mon Nov 1 23:04:29 UTC 2010 - pascal.bleser(a)opensuse.org + +- initial package (1.100) + New: ---- Net-IDN-Encode-1.100.tar.gz perl-Net-IDN-Encode.changes perl-Net-IDN-Encode.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Net-IDN-Encode.spec ++++++ # vim: set sw=4 ts=4 et nu: # # spec file for package perl-Net-IDN-Encode # # Copyright (c) 2012 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/ # Name: perl-Net-IDN-Encode Version: 1.100 Release: 0 Summary: Internationalizing Domain Names in Applications (RFC 3490) License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Source: http://search.cpan.org/CPAN/authors/id/C/CF/CFAERBER/Net-IDN-Encode-%{versi… Url: http://search.cpan.org/dist/Net-IDN-Encode/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} BuildRequires: make BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Net::IDN::Nameprep) BuildRequires: perl(Test::NoWarnings) Requires: perl(Net::IDN::Nameprep) %description This module provides an easy-to-use interface for encoding and decoding Internationalized Domain Names (IDNs). IDNs use characters drawn from a large repertoire (Unicode), but IDNA allows the non-ASCII characters to be represented using only the ASCII characters already allowed in so-called host names today (letter-digit-hypen, /[A-Z0-9-]/i). %prep %setup -q -n "Net-IDN-Encode-%{version}" find . -type f -name '*.pm' -exec %__chmod -x {} \; %build %__perl ./Build.PL ./Build %install ./Build pure_install --destdir "%{buildroot}" --installdirs vendor %perl_process_packlist %check ./Build test %clean %{?buildroot:%__rm -rf "%{buildroot}"} %files %defattr(-,root,root) %doc Changes README LICENSE %dir %{perl_vendorarch}/Net %dir %{perl_vendorarch}/Net/IDN %{perl_vendorarch}/Net/IDN/Encode.pm %dir %{perl_vendorarch}/Net/IDN/Punycode.pm %{perl_vendorarch}/Net/IDN/Punycode %dir %{perl_vendorarch}/auto/Net %dir %{perl_vendorarch}/auto/Net/IDN %{perl_vendorarch}/auto/Net/IDN/Encode %{perl_vendorarch}/auto/Net/IDN/Punycode %doc %{perl_man3dir}/Net::IDN::Encode.%{perl_man3ext}%{ext_man} %doc %{perl_man3dir}/Net::IDN::Punycode.%{perl_man3ext}%{ext_man} %doc %{perl_man3dir}/Net::IDN::Punycode::*.%{perl_man3ext}%{ext_man} %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit package-translations for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package package-translations for openSUSE:Factory checked in at 2012-03-05 18:00:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/package-translations (Old) and /work/SRC/openSUSE:Factory/.package-translations.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "package-translations", Maintainer is "coolo(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/package-translations/package-translations.changes 2012-03-01 17:22:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.package-translations.new/package-translations.changes 2012-03-05 18:00:35.000000000 +0100 @@ -2 +2 @@ -Wed Feb 29 16:13:29 CET 2012 - coolo(a)suse.com +Sun Mar 4 16:13:42 CET 2012 - coolo(a)suse.com @@ -4 +4 @@ -- automated update on 2012-02-29 +- automated update on 2012-03-04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ package-translations.tar.bz2 ++++++ Files old/mo/package-translations-ru.mo and new/mo/package-translations-ru.mo differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mercurial for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package mercurial for openSUSE:Factory checked in at 2012-03-05 18:00:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mercurial (Old) and /work/SRC/openSUSE:Factory/.mercurial.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mercurial", Maintainer is "tiwai(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mercurial/mercurial.changes 2012-02-08 17:18:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mercurial.new/mercurial.changes 2012-03-05 18:00:28.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 5 08:34:32 UTC 2012 - wr(a)rosenauer.org + +- update to version 2.1.1 + * bugfix release + http://mercurial.selenic.com/wiki/WhatsNew + +------------------------------------------------------------------- Old: ---- mercurial-2.1.tar.gz New: ---- mercurial-2.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.hoQVKA/_old 2012-03-05 18:00:30.000000000 +0100 +++ /var/tmp/diff_new_pack.hoQVKA/_new 2012-03-05 18:00:30.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: mercurial -Version: 2.1 +Version: 2.1.1 Release: 0 Summary: Scalable Distributed SCM License: GPL-2.0+ @@ -58,14 +59,14 @@ %if 0%{?with_tests} Source90: tests.blacklist -BuildRequires: gpg -BuildRequires: ncurses-devel -BuildRequires: unzip BuildRequires: bzr BuildRequires: git -BuildRequires: subversion-python +BuildRequires: gpg +BuildRequires: ncurses-devel BuildRequires: python-Pygments BuildRequires: python-openssl +BuildRequires: subversion-python +BuildRequires: unzip #BuildRequires: python-pyflakes %endif ++++++ mercurial-2.1.tar.gz -> mercurial-2.1.1.tar.gz ++++++ ++++ 3529 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mailman for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package mailman for openSUSE:Factory checked in at 2012-03-05 18:00:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mailman (Old) and /work/SRC/openSUSE:Factory/.mailman.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mailman", Maintainer is "JMatejek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mailman/mailman.changes 2011-09-23 02:12:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mailman.new/mailman.changes 2012-03-05 18:00:20.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 2 23:40:05 UTC 2012 - opensuse(a)cboltz.de + +- add "su mailman mailman" to logrotate config (bnc#750259) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailman.spec ++++++ --- /var/tmp/diff_new_pack.n9At30/_old 2012-03-05 18:00:23.000000000 +0100 +++ /var/tmp/diff_new_pack.n9At30/_new 2012-03-05 18:00:23.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mailman # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,23 +15,28 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: mailman #!BuildIgnore: sendmail -BuildRequires: krb5 pcre-devel postfix pwdutils python-devel +BuildRequires: krb5 +BuildRequires: pcre-devel +BuildRequires: postfix +BuildRequires: pwdutils +BuildRequires: python-devel %define DISTRIBUTABLE 1 -License: GPL-2.0+ -Group: Productivity/Networking/Email/Mailinglists Url: http://www.gnu.org/software/mailman/mailman.html -Requires: python cron smtp_daemon w3m logrotate -AutoReqProv: on +Requires: cron +Requires: logrotate +Requires: python +Requires: smtp_daemon +Requires: w3m PreReq: /usr/sbin/useradd /usr/sbin/groupadd /bin/echo /bin/cp /bin/rm /bin/mkdir /usr/bin/awk /usr/bin/touch /usr/bin/getent openssl PreReq: permissions Summary: The GNU Mailing List Manager +License: GPL-2.0+ +Group: Productivity/Networking/Email/Mailinglists Version: 2.1.14 -Release: 7 +Release: 0 Source: %{name}-%{version}.tgz Source1: README.SuSE Source2: mailman-2.1-manpages.tgz ++++++ logrotate.mailman ++++++ --- /var/tmp/diff_new_pack.n9At30/_old 2012-03-05 18:00:23.000000000 +0100 +++ /var/tmp/diff_new_pack.n9At30/_new 2012-03-05 18:00:23.000000000 +0100 @@ -7,6 +7,7 @@ size=+1024k notifempty missingok + su mailman mailman create 664 mailman mailman } @@ -18,6 +19,7 @@ size=+1024k notifempty missingok + su mailman mailman create 664 mailman mailman postrotate /usr/lib/mailman/bin/mailmanctl reopen -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lilo for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package lilo for openSUSE:Factory checked in at 2012-03-05 18:00:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lilo (Old) and /work/SRC/openSUSE:Factory/.lilo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lilo", Maintainer is "jplack(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/lilo/lilo.changes 2012-02-16 14:58:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lilo.new/lilo.changes 2012-03-05 18:00:16.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 2 23:55:10 CET 2012 - meissner(a)suse.de + +- pass -m32 to print-gcc-lib , as the boot images are 32bit. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.spec ++++++ --- /var/tmp/diff_new_pack.JKqODB/_old 2012-03-05 18:00:20.000000000 +0100 +++ /var/tmp/diff_new_pack.JKqODB/_new 2012-03-05 18:00:20.000000000 +0100 @@ -26,16 +26,17 @@ License: BSD-3-Clause Group: System/Boot BuildRoot: %{_tmppath}/%{name}-%{version}-build -Obsoletes: yaboot quik +Obsoletes: quik +Obsoletes: yaboot %ifarch ppc ppc64 %if 0%{?suse_version} > 1020 BuildRequires: dtc %endif -Requires: hfsutils +Requires: coreutils Requires: dosfstools Requires: gawk +Requires: hfsutils Requires: sed -Requires: coreutils # for relinking the prep/chrp images in lilo %ifarch ppc ppc64 Requires: gcc @@ -58,8 +59,8 @@ BuildRequires: device-mapper-devel %endif %ifarch x86_64 -BuildRequires: glibc-devel-32bit BuildRequires: device-mapper-32bit +BuildRequires: glibc-devel-32bit # openSUSE 11.3 and SLE_11 do not have device-mapper-devel-32bit %if 0%{?suse_version} != 1130 && 0%{?suse_version} != 1110 BuildRequires: device-mapper-devel-32bit ++++++ lilo-libgcc.patch ++++++ --- /var/tmp/diff_new_pack.JKqODB/_old 2012-03-05 18:00:20.000000000 +0100 +++ /var/tmp/diff_new_pack.JKqODB/_new 2012-03-05 18:00:20.000000000 +0100 @@ -6,7 +6,7 @@ $obj_dir/chrp/prom.a \ - $obj_dir/common/zlib.a + $obj_dir/common/zlib.a \ -+ `gcc -print-libgcc-file-name` ++ `gcc -m32 -print-libgcc-file-name` # if [ "$no_addnote" = "false" ] ; then case "$HOSTTYPE" in @@ -18,7 +18,7 @@ $obj_dir/chrp/prom.a \ - $obj_dir/common/zlib.a + $obj_dir/common/zlib.a \ -+ `gcc -print-libgcc-file-name` ++ `gcc -m32 -print-libgcc-file-name` rm -f "$output" cp "$tmp/output" "$output" @@ -30,7 +30,7 @@ $obj_dir/chrp/prom.a \ - $obj_dir/common/zlib.a + $obj_dir/common/zlib.a \ -+ `gcc -print-libgcc-file-name` ++ `gcc -m32 -print-libgcc-file-name` # objcopy \ -O aixcoff-rs6000 \ @@ -42,7 +42,7 @@ $obj_dir/chrp/prom.a \ - $obj_dir/common/zlib.a + $obj_dir/common/zlib.a \ -+ `gcc -print-libgcc-file-name` ++ `gcc -m32 -print-libgcc-file-name` objcopy \ -O elf32-powerpc \ @@ -52,7 +52,7 @@ $tmp/ps3-head.o \ $tmp/empty.o \ $obj_dir/ps3/ps3.a \ -+ `gcc -print-libgcc-file-name` ++ `gcc -m32 -print-libgcc-file-name` # convert to RAW format objcopy -O binary --set-section-flags=.bss=contents,alloc,load,data $tmp/zImage.ps3 $tmp/zImage.ps3.bin ++++++ yaboot-libgcc.patch ++++++ --- /var/tmp/diff_new_pack.JKqODB/_old 2012-03-05 18:00:20.000000000 +0100 +++ /var/tmp/diff_new_pack.JKqODB/_new 2012-03-05 18:00:20.000000000 +0100 @@ -14,7 +14,7 @@ second/yaboot: $(OBJS) util/addnote ld.script second/yaboot.a second/empty.o - $(LD) -T ld.script $(LFLAGS) second/empty.o second/crt0.o second/yaboot.a -o $@ -+ $(LD) -T ld.script $(LFLAGS) second/empty.o second/crt0.o second/yaboot.a -o $@ `gcc -print-libgcc-file-name` ++ $(LD) -T ld.script $(LFLAGS) second/empty.o second/crt0.o second/yaboot.a -o $@ `gcc -m32 -print-libgcc-file-name` chmod -x $@ cp $@ $@.chrp util/addnote $@.chrp @@ -26,7 +26,7 @@ $tmp/empty.o \ - $obj_dir/chrp/yaboot.a + $obj_dir/chrp/yaboot.a \ -+ `gcc -print-libgcc-file-name` ++ `gcc -m32 -print-libgcc-file-name` # if [ "$do_addnote" = "true" ] ; then echo add note section for RS6K -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libupnp for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package libupnp for openSUSE:Factory checked in at 2012-03-05 18:00:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libupnp (Old) and /work/SRC/openSUSE:Factory/.libupnp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libupnp", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.libupnp.new/libupnp.changes 2012-03-05 18:00:09.000000000 +0100 @@ -0,0 +1,15 @@ +------------------------------------------------------------------- +Sat Feb 25 08:35:41 UTC 2012 - coolo(a)suse.com + +- sync package name with spec file name + +------------------------------------------------------------------- +Mon Jan 30 13:09:31 UTC 2012 - jengelh(a)medozas.de + +- Properly provide pkgconfig symbols + +------------------------------------------------------------------- +Sat Oct 8 10:26:59 UTC 2011 - saschpe(a)gmx.de + +- Initial version + Old: ---- libupnp6.changes libupnp6.spec New: ---- libupnp.changes libupnp.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libupnp6.spec -> libupnp.spec ++++++ --- /work/SRC/openSUSE:Factory/libupnp/libupnp6.spec 2011-10-18 13:57:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libupnp.new/libupnp.spec 2012-03-05 18:00:09.000000000 +0100 @@ -1,6 +1,7 @@ # -# spec file for package minidlna +# spec file for package libupnp # +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011, Sascha Peilicke <saschpe(a)gmx.de> # # All modifications and additions to the file contributed by third parties @@ -16,27 +17,37 @@ # +%define lname libupnp6 -Name: libupnp6 +Name: libupnp Version: 1.6.13 Release: 0 Summary: Portable Universal Plug and Play (UPnP) SDK -Group: System/Libraries License: BSD-3-Clause -URL: http://sourceforge.net/projects/pupnp/ +Group: System/Libraries +Url: http://sourceforge.net/projects/pupnp/ Source0: http://downloads.sourceforge.net/pupnp/libupnp-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig %description The portable Universal Plug and Play (UPnP) SDK provides support for building UPnP-compliant control points, devices, and bridges on several operating systems. +%package -n %lname +Summary: Portable Universal Plug and Play (UPnP) SDK +Group: System/Libraries + +%description -n %lname +The portable Universal Plug and Play (UPnP) SDK provides support for building +UPnP-compliant control points, devices, and bridges on several operating +systems + %package -n libupnp-devel Summary: Portable Universal Plug and Play (UPnP) SDK Group: Development/Libraries/C and C++ -Provides: pkgconfig(libupnp) -Requires: %{name} = %{version} +Requires: %{lname} = %{version} %description -n libupnp-devel The portable Universal Plug and Play (UPnP) SDK provides support for building @@ -44,7 +55,7 @@ systems. %prep -%setup -n libupnp-%{version} +%setup %build %configure --disable-static @@ -54,11 +65,11 @@ %makeinstall find %{buildroot} -type f -name '*.la' -exec rm -f {} ';' -%post -p /sbin/ldconfig +%post -p /sbin/ldconfig -n %lname -%postun -p /sbin/ldconfig +%postun -p /sbin/ldconfig -n %lname -%files +%files -n %lname %defattr(-,root,root,-) %doc ChangeLog NEWS README TODO %{_libdir}/libixml.so.* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kseg for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package kseg for openSUSE:Factory checked in at 2012-03-05 18:00:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kseg (Old) and /work/SRC/openSUSE:Factory/.kseg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kseg", Maintainer is "uwedr(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kseg/kseg.changes 2011-09-23 02:07:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kseg.new/kseg.changes 2012-03-05 18:00:04.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Feb 15 20:22:04 UTC 2012 - lars(a)linux-schulserver.de + +- fix copyright header in specfile + +------------------------------------------------------------------- +Thu Jan 12 11:30:41 UTC 2012 - coolo(a)suse.com + +- change license to be in spdx.org format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kseg.spec ++++++ --- /var/tmp/diff_new_pack.uGbQPg/_old 2012-03-05 18:00:08.000000000 +0100 +++ /var/tmp/diff_new_pack.uGbQPg/_new 2012-03-05 18:00:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kseg # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -19,14 +19,14 @@ Name: kseg Version: 0.403 -Release: 70 -License: GPL +Release: 206 +License: GPL-2.0+ Summary: A Simulator of Euclidean Geometry Url: http://www.mit.edu/~ibaran Group: Productivity/Scientific/Math -Source0: %name-%version.tar.bz2 -Source1: %name.desktop -Source2: %name.xpm +Source0: %{name}-%{version}.tar.bz2 +Source1: %{name}.desktop +Source2: %{name}.xpm Source10: kseg_mn.qm # PATCH-FIX-UPSTREAM add missing include Patch0: kseg-assert.patch @@ -37,9 +37,11 @@ BuildRequires: libdrm-devel BuildRequires: libjpeg-devel BuildRequires: qt3-devel +%if 0%{?suse_version} BuildRequires: update-desktop-files +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define kseg_home %{_datadir}/%name +%define kseg_home %{_datadir}/%{name} %description KSEG is a program for exploring Euclidean geometry. You can create a @@ -49,7 +51,7 @@ well be used in math lessons in school. %prep -%setup -q -n %name +%setup -q -n %{name} %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -63,16 +65,18 @@ %install mkdir -p %{buildroot}%{kseg_home}/{examples,pics,locale} -install -Dm755 kseg %{buildroot}%{_bindir}/%name +install -Dm755 kseg %{buildroot}%{_bindir}/%{name} install -p -m644 *.qm *.html %{buildroot}%{kseg_home}/locale/ install -p -m644 examples/* %{buildroot}%{kseg_home}/examples/ install -p -m644 pics/* %{buildroot}%{kseg_home}/pics/ # install additional locales -install -m644 %{SOURCE10} %{buildroot}%{_datadir}/%name/locale/ +install -m644 %{SOURCE10} %{buildroot}%{_datadir}/%{name}/locale/ # install desktop icon and entry -install -Dm644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%name.xpm -%suse_update_desktop_file -i %name Edutainment Math +install -Dm644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.xpm +%if 0%{?suse_version} +%suse_update_desktop_file -i %{name} Edutainment Math +%endif %clean rm -rf %{buildroot} @@ -82,8 +86,8 @@ %doc COPYING AUTHORS README %doc README.translators VERSION %{_bindir}/kseg -%{_datadir}/applications/%name.desktop -%{_datadir}/pixmaps/%name.xpm +%{_datadir}/applications/%{name}.desktop +%{_datadir}/pixmaps/%{name}.xpm %{kseg_home} %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit klavaro for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package klavaro for openSUSE:Factory checked in at 2012-03-05 17:59:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/klavaro (Old) and /work/SRC/openSUSE:Factory/.klavaro.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "klavaro", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/klavaro/klavaro.changes 2011-09-23 02:06:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.klavaro.new/klavaro.changes 2012-03-05 17:59:58.000000000 +0100 @@ -1,0 +2,31 @@ +Sun Mar 4 14:29:36 UTC 2012 - kkirill(a)opensuse.org + +- added klavaro-1.9.4-dso.patch to fix linking with gmodule-2.0 + +------------------------------------------------------------------- +Wed Feb 15 20:01:53 UTC 2012 - lars(a)linux-schulserver.de + +- update to 1.9.4: + + Added: + ++ Spanish Dvorak layout: dvorak_es_nativo.kbd + ++ Swiss layouts: qwertz_ch_de.kbd, qwertz_ch_fr.kbd + + General color configuration through the preferences.ini file. + + Detecting difficult keys through timing, not just errors. + + Enabled fluidity practice with the complete text, not randomizing + the paragraphs (set "0 paragraphs" to activate this). + + Updated the man documentation, including a description for the + configuration of colors. + + Fixed virtual keyboard: foreground of keys were fixed in black, + to avoid issues with dark GTK themes. + + Updated translations: + - Czech + - Danish + - Dutch + - Esperanto + - Hungarian + - Portuguese + - Ukrainian + - Vietnamese +- build with optflags + +------------------------------------------------------------------- Old: ---- klavaro-1.9.3.tar.bz2 New: ---- klavaro-1.9.4-dso.patch klavaro-1.9.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ klavaro.spec ++++++ --- /var/tmp/diff_new_pack.0FFu8Z/_old 2012-03-05 17:59:59.000000000 +0100 +++ /var/tmp/diff_new_pack.0FFu8Z/_new 2012-03-05 17:59:59.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package klavaro # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -18,7 +18,7 @@ Name: klavaro -Version: 1.9.3 +Version: 1.9.4 Release: 1 License: GPL-3.0+ Summary: Typing tutor @@ -26,10 +26,14 @@ Group: Amusements/Teaching/Other Source0: %{name}-%{version}.tar.bz2 Source1: klavaro.desktop +# PATCH-FIX-UPSTREAM klavaro-1.9.4-dso.patch kkirill(a)opensuse.org -- Fix linking with libgmodule +Patch0: klavaro-1.9.4-dso.patch Requires: espeak %if 0%{?suse_version} BuildRequires: update-desktop-files %endif +BuildRequires: autoconf +BuildRequires: automake BuildRequires: bison BuildRequires: espeak-devel BuildRequires: fdupes @@ -51,14 +55,14 @@ the program was designed to not depend on specific layouts. - %lang_package %prep %setup -q +%patch0 %build -# otherwise it doesn't work -%{expand: %%define optflags -O2} +export CFLAGS="%{optflags}" +autoreconf -fi %configure make %{?_smp_mflags} @@ -92,7 +96,7 @@ %files -f %{name}.lang %defattr(0755, root, root, 0755) %{_bindir}/klavaro -%defattr(-, root, root, 0755) +%defattr(-, root, root) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{_mandir}/man1/klavaro.1* %{_datadir}/klavaro/ ++++++ klavaro-1.9.4-dso.patch ++++++ Index: configure.in =================================================================== --- configure.in.orig +++ configure.in @@ -25,6 +25,7 @@ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules AC_SUBST(PACKAGE_CFLAGS) AC_SUBST(PACKAGE_LIBS) +AC_CHECK_LIB([gmodule-2.0], [g_module_open]) AC_CHECK_LIB([gtkdatabox], [gtk_databox_new]) AC_CHECK_LIB([curl], [curl_global_init]) AC_CHECK_LIB([m], [sqrt]) ++++++ klavaro-1.9.3.tar.bz2 -> klavaro-1.9.4.tar.bz2 ++++++ ++++ 32751 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit imapfilter for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package imapfilter for openSUSE:Factory checked in at 2012-03-05 17:59:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/imapfilter (Old) and /work/SRC/openSUSE:Factory/.imapfilter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "imapfilter", Maintainer is "hvogel(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/imapfilter/imapfilter.changes 2012-02-27 18:35:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.imapfilter.new/imapfilter.changes 2012-03-05 17:59:55.000000000 +0100 @@ -1,0 +2,44 @@ +Tue Feb 28 04:58:01 UTC 2012 - arun(a)nubati.net + +- updated to version 2.5.1 (taken from the NEWS file) + +IMAPFilter 2.5.1 - 27 Feb 2012 + - Support for recovery of a session after a BYE response is received. + - Option to control in which cases a terminated session will be restored. + - Bug fix; a BYE response could sometimes get incorrectly ignored. + +IMAPFilter 2.5 - 23 Feb 2012 + - Support for recovery of a session when a network failure is encountered, + and other robustness improvements. + - Informational messages are printed also for the fetch and append methods. + - Lua 5.2 compatibility, while the codebase can still be compiled with + version 5.1. + - The OpenSSL library is now a mandatory build requirement. + - Bug fix; unrecoverable login failures did not result in aborting of the + execution of the configuration. + - Bug fix; when messages were appended to a mailbox that did not exist, it + failed to create the mailbox and then retry the appending. + - Bug fix; misleading errors were printed on some SSL failures. + - Bug fix; protected call of the commands to execute in the daemon function + could hide important failures. + - Bug fix; the man page had an incorrect description of the -d option. + * Support for the old deprecated 1.x configuration format has been removed, + and the current 2.x format can only be executed from now on. + +IMAPFilter 2.4.2 - 19 Jan 2012 + - Bug fix; some ASCII characters in mailbox names were incorrectly converted + to UTF-7. + +IMAPFilter 2.4.1 - 8 Dec 2011 + - Bug fix; become_daemon() failure. + +IMAPFilter 2.4 - 6 Dec 2011 + - Support for non-ASCII mailbox names. + - New environment variable to set the configuration directory. + - Bug fix; parsing of some server responses was broken since the previous + release. + - Bug fix; the match_field() method matched on the whole header field, + instead of only the header field body. + - Bug fix; debug file check caused printing of a misleading error message. + - Bug fix; typo error in a configuration man page example. +------------------------------------------------------------------- Old: ---- imapfilter-2.3.0.tar.bz2 New: ---- imapfilter-2.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imapfilter.spec ++++++ --- /var/tmp/diff_new_pack.jQkjFu/_old 2012-03-05 17:59:56.000000000 +0100 +++ /var/tmp/diff_new_pack.jQkjFu/_new 2012-03-05 17:59:56.000000000 +0100 @@ -15,20 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: imapfilter Summary: A mail filtering utility License: MIT Group: Productivity/Networking/Email/Utilities -Url: http://imapfilter.hellug.gr -Version: 2.3.0 +Url: https://github.com/lefcha/imapfilter +Version: 2.5.1 Release: 0 -Source: http://imapfilter.hellug.gr/source/%{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %suse_version > 1210 -BuildRequires: lua51-devel -%else BuildRequires: lua-devel >= 5.1 -%endif BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: pkgconfig ++++++ imapfilter-2.3.0.tar.bz2 -> imapfilter-2.5.1.tar.bz2 ++++++ ++++ 8899 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ignuit for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package ignuit for openSUSE:Factory checked in at 2012-03-05 17:59:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ignuit (Old) and /work/SRC/openSUSE:Factory/.ignuit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ignuit", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ignuit/ignuit.changes 2011-09-23 02:03:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ignuit.new/ignuit.changes 2012-03-05 17:59:53.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Mar 3 10:21:28 UTC 2012 - kkirill(a)opensuse.org + +- updated to 2.20.0: + + Added a manual page, an info page, and a Russian translation + + Updated build files + +------------------------------------------------------------------- @@ -21 +28 @@ -- update to 0.0.16: +- updated to 0.0.16: @@ -34 +41 @@ -- update to 0.0.15: +- updated to 0.0.15: @@ -42 +49 @@ -- update to 0.0.14: +- updated to 0.0.14: @@ -62 +69 @@ -- update to 0.0.12: +- updated to 0.0.12: @@ -70 +77 @@ -- update to 0.0.11: +- updated to 0.0.11: @@ -78 +85 @@ -- update to 0.0.10: +- updated to 0.0.10: Old: ---- LINGUAS ignuit-0.0.16.tar.bz2 ru.po New: ---- ignuit-2.20.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ignuit.spec ++++++ --- /var/tmp/diff_new_pack.PZW2Yf/_old 2012-03-05 17:59:55.000000000 +0100 +++ /var/tmp/diff_new_pack.PZW2Yf/_new 2012-03-05 17:59:55.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ignuit # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -18,7 +18,7 @@ Name: ignuit -Version: 0.0.16 +Version: 2.20.0 Release: 5 License: GPL-3.0+ and GPL-2.0 Summary: Flashcard learning system @@ -26,8 +26,6 @@ Group: Amusements/Teaching/Other Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.desktop -Source2: ru.po -Source3: LINGUAS BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -39,6 +37,7 @@ BuildRequires: libxslt-devel BuildRequires: pkgconfig(libglade-2.0) %gconf_schemas_prereq +PreReq: %install_info_prereq %description Ignuit is a memorization aid based on the Leitner flashcard system. @@ -51,8 +50,6 @@ %lang_package %prep %setup -q -cp %{SOURCE2} po/ -cp %{SOURCE3} po/ %build %configure --disable-scrollkeeper @@ -78,8 +75,14 @@ %posttrans -f %{name}.schemas_posttrans +%post +%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz + %preun -f %{name}.schemas_preun +%postun +%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz + %files -f %{name}.lst %defattr(-, root, root) %doc AUTHORS ChangeLog COPYING COPYING.extras NEWS README TODO examples @@ -94,5 +97,7 @@ %{_datadir}/icons/hicolor/*/apps/%{name}.* %{_datadir}/%{name}/ %{_datadir}/omf/%{name}/*.omf +%{_infodir}/%{name}.* +%{_mandir}/man1/%{name}.1* %changelog ++++++ ignuit-0.0.16.tar.bz2 -> ignuit-2.20.0.tar.bz2 ++++++ ++++ 46136 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ht for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package ht for openSUSE:Factory checked in at 2012-03-05 17:59:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ht (Old) and /work/SRC/openSUSE:Factory/.ht.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ht", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ht/ht.changes 2012-02-29 14:07:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ht.new/ht.changes 2012-03-05 17:59:49.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Mar 4 11:19:50 UTC 2012 - jengelh(a)medozas.de + +- Update to new upstream release 2.0.20 +* Last version had a bug preventing load of 32 bit ELFs + +------------------------------------------------------------------- Old: ---- ht-2.0.19.tar.bz2 ht-enable-math.diff ht-locale-fix.diff ht-search-progress.diff New: ---- ht-2.0.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ht.spec ++++++ --- /var/tmp/diff_new_pack.1vnlw2/_old 2012-03-05 17:59:52.000000000 +0100 +++ /var/tmp/diff_new_pack.1vnlw2/_new 2012-03-05 17:59:52.000000000 +0100 @@ -14,10 +14,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: ht -Version: 2.0.19 +Version: 2.0.20 Release: 0 Summary: Disassembler, object dumper and hex editor License: GPL-2.0 @@ -26,9 +24,6 @@ #Source-DL: http://downloads.sf.net/%name/%name-%version.tar.bz2 Source: %name-%version.tar.bz2 -Patch1: ht-locale-fix.diff -Patch2: ht-search-progress.diff -Patch3: ht-enable-math.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: bison @@ -44,7 +39,6 @@ %prep %setup -q -%patch -P 1 -P 2 -P 3 -p1 %build autoreconf -fi; ++++++ ht-2.0.19.tar.bz2 -> ht-2.0.20.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/ChangeLog new/ht-2.0.20/ChangeLog --- old/ht-2.0.19/ChangeLog 2012-01-17 18:48:15.000000000 +0100 +++ new/ht-2.0.20/ChangeLog 2012-03-03 18:14:55.000000000 +0100 @@ -1,6 +1,11 @@ HT ChangeLog ============== +version 2.0.20: + - Fixed loading of 32 bit ELFs (Thanks Oleg) + - Use wide ncurses if necessars (Thanks Jan) + - Show search progress in MiB (Thanks Jan) + version 2.0.19: - [x86] fixed a lot of small bugs - fixed a crash with the "follow" function on diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/classview.cc new/ht-2.0.20/classview.cc --- old/ht-2.0.19/classview.cc 2007-06-19 20:56:27.000000000 +0200 +++ new/ht-2.0.20/classview.cc 2012-03-03 18:22:07.000000000 +0100 @@ -713,11 +713,20 @@ static ht_view *class_init(Bounds *b, File *file, ht_format_group *group) { u1 magic[4]; + u1 extra_magic[4]; - file->seek(0); - file->read(magic, 4); + try { + file->seek(0); + file->readx(magic, 4); + file->readx(extra_magic, 4); + } catch (...) { + return NULL; + } + // Mach-O binaries also use 0xcafebabe here. The second byte is the + // number of architectures; if there's more than 10 it's probably + // a Java class file instead. if (magic[0] == 0xca && magic[1] == 0xfe - && magic[2] == 0xba && magic[3] == 0xbe) { + && magic[2] == 0xba && magic[3] == 0xbe && extra_magic[3] > 10) { file->seek(0); void *shared_data = (void*)class_read(file); if (!shared_data) return NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/config.h new/ht-2.0.20/config.h --- old/ht-2.0.19/config.h 2012-01-17 18:53:41.000000000 +0100 +++ new/ht-2.0.20/config.h 2012-03-03 16:13:05.000000000 +0100 @@ -65,7 +65,7 @@ #define PACKAGE_NAME "ht" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ht 2.0.19" +#define PACKAGE_STRING "ht 2.0.20" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ht" @@ -74,7 +74,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.0.19" +#define PACKAGE_VERSION "2.0.20" /* The size of `char', as computed by sizeof. */ #define SIZEOF_CHAR 1 @@ -98,7 +98,7 @@ /* #undef USE_MINILZO */ /* Version number of package */ -#define VERSION "2.0.19" +#define VERSION "2.0.20" /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/configure new/ht-2.0.20/configure --- old/ht-2.0.19/configure 2012-02-19 21:54:35.000000000 +0100 +++ new/ht-2.0.20/configure 2012-03-03 16:16:47.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for ht 2.0.19. +# Generated by GNU Autoconf 2.68 for ht 2.0.20. # # Report bugs to <https://sourceforge.net/tracker/?group_id=1066>. # @@ -560,8 +560,8 @@ # Identity of this package. PACKAGE_NAME='ht' PACKAGE_TARNAME='ht' -PACKAGE_VERSION='2.0.19' -PACKAGE_STRING='ht 2.0.19' +PACKAGE_VERSION='2.0.20' +PACKAGE_STRING='ht 2.0.20' PACKAGE_BUGREPORT='https://sourceforge.net/tracker/?group_id=1066' PACKAGE_URL='' @@ -1289,7 +1289,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 ht 2.0.19 to adapt to many kinds of systems. +\`configure' configures ht 2.0.20 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1360,7 +1360,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ht 2.0.19:";; + short | recursive ) echo "Configuration of ht 2.0.20:";; esac cat <<\_ACEOF @@ -1464,7 +1464,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ht configure 2.0.19 +ht configure 2.0.20 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2049,7 +2049,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ht $as_me 2.0.19, which was +It was created by ht $as_me 2.0.20, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2992,7 +2992,7 @@ # Define the identity of the package. PACKAGE='ht' - VERSION='2.0.19' + VERSION='2.0.20' cat >>confdefs.h <<_ACEOF @@ -3046,6 +3046,7 @@ echo "*** LINUX, building POSIX version. we need (n)curses." 1>&2 NEED_CURSES=1 HAVE_PIPE=1 + HT_LIBS="$HT_LIBS -lm" FLAGS_ALL="$FLAGS_ALL -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" ;; *freebsd*) @@ -5737,7 +5738,7 @@ _ACEOF $as_echo "#define CURSES_HDR <ncurses.h>" >>confdefs.h - CURSES_LIB=ncurses + CURSES_LIB=ncursesw fi done @@ -6547,7 +6548,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ht $as_me 2.0.19, which was +This file was extended by ht $as_me 2.0.20, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6613,7 +6614,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ht config.status 2.0.19 +ht config.status 2.0.20 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/configure.in new/ht-2.0.20/configure.in --- old/ht-2.0.19/configure.in 2012-02-19 21:54:19.000000000 +0100 +++ new/ht-2.0.20/configure.in 2012-03-03 16:16:45.000000000 +0100 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(ht,[2.0.19],[https://sourceforge.net/tracker/?group_id=1066]) +AC_INIT(ht,[2.0.20],[https://sourceforge.net/tracker/?group_id=1066]) AC_PREREQ(2.59) dnl Check the system. @@ -42,6 +42,7 @@ echo "*** LINUX, building POSIX version. we need (n)curses." 1>&2 NEED_CURSES=1 HAVE_PIPE=1 + HT_LIBS="$HT_LIBS -lm" FLAGS_ALL="$FLAGS_ALL -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" ;; *freebsd*) @@ -191,7 +192,7 @@ dnl AC_CONFIG_HEADER(config.h) CURSES_LIB= if test "x$NEED_CURSES" = "x1"; then - AC_CHECK_HEADERS(ncurses.h, AC_DEFINE(CURSES_HDR, <ncurses.h>, [This system provides (n)curses.h]) CURSES_LIB=ncurses) + AC_CHECK_HEADERS(ncurses.h, AC_DEFINE(CURSES_HDR, <ncurses.h>, [This system provides (n)curses.h/wide]) CURSES_LIB=ncursesw) if test "x$CURSES_LIB" = "x"; then AC_CHECK_HEADERS(curses.h, AC_DEFINE(CURSES_HDR, <curses.h>, [This system provides (n)curses.h]) CURSES_LIB=curses) if test "x$CURSES_LIB" = "x"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/doc/ht.texi new/ht-2.0.20/doc/ht.texi --- old/ht-2.0.19/doc/ht.texi 2012-02-19 15:06:59.000000000 +0100 +++ new/ht-2.0.20/doc/ht.texi 2012-03-03 16:07:48.000000000 +0100 @@ -51,7 +51,7 @@ @titlepage @title{HT Manual} -@subtitle{Edition 2.0.19, January 2012} +@subtitle{Edition 2.0.20, January 2012} @author{Stefan Weyergraf, Sebastian Biallas} @c The following two commands start the copyright page. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/htelf.cc new/ht-2.0.20/htelf.cc --- old/ht-2.0.19/htelf.cc 2012-01-17 18:48:16.000000000 +0100 +++ new/ht-2.0.20/htelf.cc 2012-03-03 16:07:47.000000000 +0100 @@ -155,6 +155,8 @@ if (!elf_shared->sheaders.count) { elf_shared->sheaders.sheaders32 = NULL; } else { + elf_shared->sheaders.sheaders32 = + ht_malloc(elf_shared->sheaders.count * sizeof *elf_shared->sheaders.sheaders32); file->seek(header_ofs + elf_shared->header32.e_shoff); file->readx(elf_shared->sheaders.sheaders32, elf_shared->sheaders.count*sizeof *elf_shared->sheaders.sheaders32); for (uint i=0; i < elf_shared->sheaders.count; i++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/htinfo.h new/ht-2.0.20/htinfo.h --- old/ht-2.0.19/htinfo.h 2012-01-17 18:48:16.000000000 +0100 +++ new/ht-2.0.20/htinfo.h 2012-03-03 16:07:47.000000000 +0100 @@ -24,7 +24,7 @@ #define ht_url "http://hte.sourceforge.net" #define ht_name "ht" -#define ht_version "2.0.19" +#define ht_version "2.0.20" #define ht_author1 "Stefan Weyergraf" #define ht_copyright1 "(c) 1999-2004 "ht_author1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/htsearch.cc new/ht-2.0.20/htsearch.cc --- old/ht-2.0.19/htsearch.cc 2008-04-09 00:07:16.000000000 +0200 +++ new/ht-2.0.20/htsearch.cc 2012-03-03 16:34:48.000000000 +0100 @@ -531,10 +531,10 @@ } ctx->o -= ctx->patlen-1; - int p = (int)(((double)(ctx->o - ctx->ofs))*100/ctx->len); + int p = (((double)(ctx->o - ctx->ofs))*100/ctx->len); char status[64]; - ht_snprintf(status, sizeof status, "%d %%", p); + ht_snprintf(status, sizeof status, "%d %% (%d MiB)", p, int ((unsigned long long)ctx->o >> 20)); progress_indicator->settext(status); return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ht-2.0.19/io/posix/sysdisplay.cc new/ht-2.0.20/io/posix/sysdisplay.cc --- old/ht-2.0.19/io/posix/sysdisplay.cc 2008-05-06 22:31:14.000000000 +0200 +++ new/ht-2.0.20/io/posix/sysdisplay.cc 2012-03-03 16:16:45.000000000 +0100 @@ -301,7 +301,7 @@ setCursor(0, 0, CURSOR_OFF); -// ::setlocale(LC_ALL, ""); + ::setlocale(LC_ALL, ""); // terminal = ::newterm(NULL, stdout, stdin); win = ::initscr(); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fcitx for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2012-03-05 17:59:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx (Old) and /work/SRC/openSUSE:Factory/.fcitx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fcitx", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-02-27 18:35:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-03-05 17:59:28.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Feb 29 21:04:39 UTC 2012 - i(a)marguerite.su + +- update source from git. +- to keep source in the same state as modules submited, + as upstream suggested. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx-4.2.tar.bz2 ++++++ ++++ 14232 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cutecom for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package cutecom for openSUSE:Factory checked in at 2012-03-05 17:59:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cutecom (Old) and /work/SRC/openSUSE:Factory/.cutecom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cutecom", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/cutecom/cutecom.changes 2012-01-19 09:41:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cutecom.new/cutecom.changes 2012-03-05 17:59:23.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 23 17:08:17 UTC 2012 - opensuse(a)dstoecker.de + +- display correct license in about dialog + +------------------------------------------------------------------- New: ---- cutecom-0.22.0-license.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cutecom.spec ++++++ --- /var/tmp/diff_new_pack.VnwLgf/_old 2012-03-05 17:59:24.000000000 +0100 +++ /var/tmp/diff_new_pack.VnwLgf/_new 2012-03-05 17:59:24.000000000 +0100 @@ -15,6 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: cutecom Version: 0.22.0 Release: 0 @@ -30,6 +32,7 @@ Source3: %{name}.desktop Source4: %{name}.png Patch: cutecom-0.22.0-nolinebreak.diff +Patch1: cutecom-0.22.0-license.diff %if 0%{?suse_version} # for >= 11.1 validity tests @@ -43,6 +46,7 @@ %prep %setup %patch -p1 +%patch1 -p1 %build cmake . ++++++ cutecom-0.22.0-license.diff ++++++ diff -ur cutecom-0.22.0/qcppdialogimpl.cpp cutecom-0.22.0_fix/qcppdialogimpl.cpp --- cutecom-0.22.0/qcppdialogimpl.cpp 2009-06-25 22:10:49.000000000 +0200 +++ cutecom-0.22.0_fix/qcppdialogimpl.cpp 2012-02-23 18:06:51.000000000 +0100 @@ -376,7 +376,7 @@ void QCPPDialogImpl::showAboutMsg() { - QMessageBox::about(this, tr("About CuteCom"), tr("This is CuteCom 0.22.0<br>(c)2004-2009 Alexander Neundorf, <neundorf(a)kde.org><br>Licensed under the GNU GPL v2")); + QMessageBox::about(this, tr("About CuteCom"), tr("This is CuteCom 0.22.0<br>(c)2004-2009 Alexander Neundorf, <neundorf(a)kde.org><br>Licensed under the GNU GPL version 2 (or any later version).")); } void QCPPDialogImpl::sendFile() -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit crawl for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package crawl for openSUSE:Factory checked in at 2012-03-05 17:59:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crawl (Old) and /work/SRC/openSUSE:Factory/.crawl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crawl", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/crawl/crawl.changes 2012-02-14 19:00:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.crawl.new/crawl.changes 2012-03-05 17:59:18.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 21 15:57:21 UTC 2012 - saschpe(a)suse.de + +- BuildRequire lua51-devel on openSUSE > 12.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crawl.spec ++++++ --- /var/tmp/diff_new_pack.2rl4So/_old 2012-03-05 17:59:19.000000000 +0100 +++ /var/tmp/diff_new_pack.2rl4So/_new 2012-03-05 17:59:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package crawl # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Sascha Peilicke <sasch.pe(a)gmx.de> # # All modifications and additions to the file contributed by third parties @@ -17,14 +17,13 @@ # - Name: crawl Version: 0.9.1 Release: 0 -License: GPL-2.0+ Summary: Roguelike dungeon exploration game -Url: http://crawl.develz.org/ +License: GPL-2.0+ Group: Amusements/Games/RPG +Url: http://crawl.develz.org/ Source0: stone_soup-%{version}.tar.bz2 Source1: %{name}.desktop Patch0: %{name}-ncurses-with-tinfo.patch @@ -33,7 +32,11 @@ BuildRequires: freetype2-devel BuildRequires: gcc-c++ BuildRequires: libpng-devel +%if 0%{?suse_version} > 1210 +BuildRequires: lua51-devel +%else BuildRequires: lua-devel +%endif BuildRequires: ncurses-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cheese for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package cheese for openSUSE:Factory checked in at 2012-03-05 17:59:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cheese (Old) and /work/SRC/openSUSE:Factory/.cheese.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cheese", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/cheese/cheese.changes 2012-02-17 15:17:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cheese.new/cheese.changes 2012-03-05 17:59:12.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Feb 21 08:12:47 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.90: + + Initialise X11 threading (bgo#669845) + + Fix trashing videos (bgo#670178) + + Do not hardcode package names to install, and use a PackageKit + catalog instead (bgo#669547) + + Properly handle "delete-event" signal at Preferences dialog to + avoid empty dialog later on (bgo#669384) + + Code cleanups. + + Updated translations. + +------------------------------------------------------------------- Old: ---- cheese-3.3.5.tar.xz New: ---- cheese-3.3.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cheese.spec ++++++ --- /var/tmp/diff_new_pack.F5llSg/_old 2012-03-05 17:59:15.000000000 +0100 +++ /var/tmp/diff_new_pack.F5llSg/_new 2012-03-05 17:59:15.000000000 +0100 @@ -20,7 +20,7 @@ %define lib_gtk_major 21 Name: cheese -Version: 3.3.5 +Version: 3.3.90 Release: 0 # FIXME: the %%{_datadir}/help/$locale/ files be found by %%find_lang Summary: Webcam Booth for GNOME -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit autofs for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package autofs for openSUSE:Factory checked in at 2012-03-05 17:59:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autofs (Old) and /work/SRC/openSUSE:Factory/.autofs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autofs", Maintainer is "MSzeredi(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/autofs/autofs.changes 2012-02-06 15:54:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.autofs.new/autofs.changes 2012-03-05 17:59:01.000000000 +0100 @@ -1,0 +2,29 @@ +Wed Feb 29 13:00:01 UTC 2012 - lchiquitto(a)suse.com + +- update 5.0.6 upstream patches to 20120228, fixing some bugs and + implementing new features (bnc#749098): + * fix improve mount location error reporting + * fix fix wait for master source mutex + * add sss lookup module + * teach automount about sss source + * fix init script usage message + * ignore duplicate exports in auto.net + * add kernel version check function + * add function to check mount.nfs version + * reinstate singleton mount probe + * rework error return handling in rpc code + * catch EHOSTUNREACH and bail out early + * systemd support fixes + * check scandir() return value (bnc#748588) + * allow for kernel packet size change (in kernel 3.3.0+) + * fix function to check mount.nfs version +- get-upstream-patches: make it work again after kernel.org FTP + server reorganization + +------------------------------------------------------------------- +Thu Feb 2 22:18:53 UTC 2012 - lchiquitto(a)suse.com + +- fix segfault caused by an use after free in st_queue_handler() + (bnc#727392) + +------------------------------------------------------------------- Old: ---- autofs-5.0.5-add-piddir-to-configure.patch autofs-5.0.5-add-systemd-unit-support.patch autofs-5.0.5-dir-map-type-patch-v2.patch autofs-5.0.6-add-disable-move-mount-configure-option.patch autofs-5.0.6-code-analysis-fixes-1.patch autofs-5.0.6-fix-LDAP-result-leaks-on-error-paths.patch autofs-5.0.6-fix-MNT_DETACH-define.patch autofs-5.0.6-fix-dumpmaps-not-reading-maps.patch autofs-5.0.6-fix-fix-LDAP-result-leaks-on-error-paths.patch autofs-5.0.6-fix-fix-map-source-check-in-file-lookup.patch autofs-5.0.6-fix-ipv6-configure-check.patch autofs-5.0.6-fix-ipv6-name-lookup-check.patch autofs-5.0.6-fix-ipv6-rpc-calls.patch autofs-5.0.6-fix-lsb-service-name-in-init-script-2.patch autofs-5.0.6-fix-not-bind-mounting-local-filesystem.patch autofs-5.0.6-fix-paged-query-more-results-check.patch autofs-5.0.6-fix-result-null-check-in-read_one_map.patch autofs-5.0.6-fix-rpc-build-error.patch autofs-5.0.6-fix-submount-shutdown-race.patch autofs-5.0.6-fix-wait-for-master-source-mutex.patch autofs-5.0.6-improve-mount-location-error-reporting.patch autofs-5.0.6-remove-empty-command-line-arguments.patch autofs-5.0.6-upstream-patches-20110703.bz2 New: ---- autofs-5.0.6-task-use-after-free.patch autofs-5.0.6-upstream-patches-20120228.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.m7UHIf/_old 2012-03-05 17:59:04.000000000 +0100 +++ /var/tmp/diff_new_pack.m7UHIf/_new 2012-03-05 17:59:04.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %if 0%{?suse_version} >= 1220 %define with_systemd 1 %else @@ -51,32 +52,14 @@ Source6: autofs.service Source7: NetworkManager-autofs Source8: get-upstream-patches -%define patchdate 20110703 +# Upstream patches that will be in the next release +%define patchdate 20120228 Patch0: autofs-%{version}-upstream-patches-%{patchdate}.bz2 -Patch1: autofs-5.0.6-improve-mount-location-error-reporting.patch -Patch2: autofs-5.0.6-fix-paged-query-more-results-check.patch -Patch3: autofs-5.0.6-fix-dumpmaps-not-reading-maps.patch -Patch4: autofs-5.0.6-fix-result-null-check-in-read_one_map.patch -Patch5: autofs-5.0.6-fix-LDAP-result-leaks-on-error-paths.patch -Patch6: autofs-5.0.6-fix-fix-LDAP-result-leaks-on-error-paths.patch -Patch7: autofs-5.0.6-code-analysis-fixes-1.patch -Patch8: autofs-5.0.6-fix-not-bind-mounting-local-filesystem.patch -Patch9: autofs-5.0.5-dir-map-type-patch-v2.patch -Patch10: autofs-5.0.6-fix-wait-for-master-source-mutex.patch -Patch11: autofs-5.0.6-fix-submount-shutdown-race.patch -Patch12: autofs-5.0.6-fix-fix-map-source-check-in-file-lookup.patch -Patch13: autofs-5.0.6-add-disable-move-mount-configure-option.patch -Patch14: autofs-5.0.6-fix-lsb-service-name-in-init-script-2.patch -Patch15: autofs-5.0.6-fix-ipv6-name-lookup-check.patch -Patch16: autofs-5.0.6-fix-ipv6-rpc-calls.patch -Patch17: autofs-5.0.6-fix-ipv6-configure-check.patch -Patch18: autofs-5.0.5-add-piddir-to-configure.patch -Patch19: autofs-5.0.5-add-systemd-unit-support.patch -Patch20: autofs-5.0.6-fix-MNT_DETACH-define.patch -Patch21: autofs-5.0.6-remove-empty-command-line-arguments.patch -Patch22: autofs-5.0.6-fix-rpc-build-error.patch -Patch23: autofs-5.0.6-invalid-ghost-dirs.patch -Patch24: autofs-5.0.6-fix-libtirpc-name-typo.patch +# Patches submitted upstream but not yet accepted +Patch80: autofs-5.0.6-invalid-ghost-dirs.patch +Patch81: autofs-5.0.6-fix-libtirpc-name-typo.patch +Patch82: autofs-5.0.6-task-use-after-free.patch +# SUSE specific patches Patch100: autofs-suse-auto_master_default.patch Patch101: autofs-suse-build.patch Requires(pre): %fillup_prereq @@ -100,30 +83,9 @@ cp %{SOURCE5} . # %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 +%patch80 -p1 +%patch81 -p1 +%patch82 -p1 %patch100 -p1 %patch101 -p1 ++++++ autofs-5.0.6-fix-libtirpc-name-typo.patch ++++++ --- /var/tmp/diff_new_pack.m7UHIf/_old 2012-03-05 17:59:04.000000000 +0100 +++ /var/tmp/diff_new_pack.m7UHIf/_new 2012-03-05 17:59:04.000000000 +0100 @@ -6,7 +6,7 @@ =================================================================== --- autofs-5.0.6.orig/daemon/automount.c +++ autofs-5.0.6/daemon/automount.c -@@ -2225,9 +2225,9 @@ int main(int argc, char *argv[]) +@@ -2237,9 +2237,9 @@ int main(int argc, char *argv[]) xmlInitParser(); #endif #ifdef TIRPC_WORKAROUND @@ -18,15 +18,3 @@ #endif if (!master_read_master(master_list, age, 0)) { -Index: autofs-5.0.6/CHANGELOG -=================================================================== ---- autofs-5.0.6.orig/CHANGELOG -+++ autofs-5.0.6/CHANGELOG -@@ -21,6 +21,7 @@ - - add systemd unit support. - - remove empty command line arguments (passed by systemd). - - fix rpc build error. -+- fix typo in libtirpc file name. - - 28/06/2011 autofs-5.0.6 - ----------------------- ++++++ autofs-5.0.6-invalid-ghost-dirs.patch ++++++ --- /var/tmp/diff_new_pack.m7UHIf/_old 2012-03-05 17:59:04.000000000 +0100 +++ /var/tmp/diff_new_pack.m7UHIf/_new 2012-03-05 17:59:04.000000000 +0100 @@ -15,7 +15,7 @@ =================================================================== --- autofs-5.0.6.orig/daemon/lookup.c +++ autofs-5.0.6/daemon/lookup.c -@@ -605,6 +605,9 @@ int lookup_ghost(struct autofs_point *ap +@@ -606,6 +606,9 @@ int lookup_ghost(struct autofs_point *ap if (!strcmp(me->key, "*")) goto next; ++++++ autofs-5.0.6-task-use-after-free.patch ++++++ From: Leonardo Chiquitto <lchiquitto(a)suse.com> Subject: fix segmentation fault in st_queue_handler() References: bnc#727392 Index: autofs-5.0.6/daemon/state.c =================================================================== --- autofs-5.0.6.orig/daemon/state.c +++ autofs-5.0.6/daemon/state.c @@ -1150,12 +1150,12 @@ remove: struct state_queue, pending); list_del(&task->list); - free(task); list_del_init(&next->pending); list_add_tail(&next->list, head); if (p == head) p = head->next; + free(task); } if (list_empty(head)) ++++++ get-upstream-patches ++++++ --- /var/tmp/diff_new_pack.m7UHIf/_old 2012-03-05 17:59:05.000000000 +0100 +++ /var/tmp/diff_new_pack.m7UHIf/_new 2012-03-05 17:59:05.000000000 +0100 @@ -1,20 +1,20 @@ #! /bin/bash +# # get autofs upstream patched from -# http://www.kernel.org/pub/linux/daemons/autofs/v5/ +# http://www.kernel.org/pub/linux/daemons/autofs/v5/patches-$version/ # and cat them in one bzipped file -# autofs-$VERSION-upstream-patches-$DATE +# autofs-$LATEST_RELEASE-upstream-patches-$DATE # where DATE is the date of the top patch in the series # -# usage: get-upstream-patches [VERSION] +# usage: get-upstream-patches -# default version -VERSION=5.0.6 -test -n "$1" && VERSION="$1" +LATEST_RELEASE="5.0.6" +NEXT_RELEASE="5.0.7" -BASE=http://www.kernel.org/pub/linux/daemons/autofs/v5 -SERIES=patch_order-$VERSION +BASE=http://www.kernel.org/pub/linux/daemons/autofs/v5/patches-$NEXT_RELEASE/ +SERIES=patch_order-$LATEST_RELEASE WGET_OPTS=-q -PATCHDIR=upstream-patches-$VERSION +PATCHDIR=upstream-patches-$LATEST_RELEASE CURRENT=$PWD DELIMITER=$(mktemp) @@ -47,11 +47,11 @@ echo "----------" >> $DELIMITER echo >> $DELIMITER -cat $SERIES $DELIMITER $(cat $SERIES) > $CURRENT/autofs-$VERSION-upstream-patches-$DATE +cat $SERIES $DELIMITER $(cat $SERIES) > $CURRENT/autofs-$LATEST_RELEASE-upstream-patches-$DATE rm -f $DELIMITER -bzip2 $CURRENT/autofs-$VERSION-upstream-patches-$DATE +bzip2 $CURRENT/autofs-$LATEST_RELEASE-upstream-patches-$DATE popd > /dev/null 2>&1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit atheme for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package atheme for openSUSE:Factory checked in at 2012-03-05 17:58:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/atheme (Old) and /work/SRC/openSUSE:Factory/.atheme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "atheme", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/atheme/atheme.changes 2011-09-23 01:52:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.atheme.new/atheme.changes 2012-03-05 17:58:56.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 12 11:30:30 UTC 2012 - coolo(a)suse.com + +- change license to be in spdx.org format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ atheme.spec ++++++ --- /var/tmp/diff_new_pack.e6wlhO/_old 2012-03-05 17:58:57.000000000 +0100 +++ /var/tmp/diff_new_pack.e6wlhO/_new 2012-03-05 17:58:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package atheme # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,19 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: atheme Version: 6.0.8 -Release: 1 +Release: 0 %define pkg_name atheme-services # -License: BSD -Group: Productivity/Networking/IRC # BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libmowgli-devel >= 0.7.0 libopenssl-devel pcre-devel pkgconfig -BuildRequires: openldap2-devel xz +BuildRequires: libmowgli-devel >= 0.7.0 +BuildRequires: libopenssl-devel +BuildRequires: openldap2-devel +BuildRequires: pcre-devel +BuildRequires: pkgconfig +BuildRequires: xz %define atheme_home /var/lib/atheme %define atheme_log /var/log/atheme %define atheme_run /var/run/atheme @@ -40,6 +40,8 @@ Patch2: atheme-config.diff # Summary: A portable, secure set of open source, modular IRC services +License: BSD-3-Clause +Group: Productivity/Networking/IRC Requires(pre): pwdutils %description -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit arpwatch-ethercodes for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package arpwatch-ethercodes for openSUSE:Factory checked in at 2012-03-05 17:58:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arpwatch-ethercodes (Old) and /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "arpwatch-ethercodes", Maintainer is "draht(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/arpwatch-ethercodes/arpwatch-ethercodes.changes 2012-03-02 13:46:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new/arpwatch-ethercodes.changes 2012-03-05 17:58:52.000000000 +0100 @@ -2 +2 @@ -Fri Mar 2 07:40:11 CET 2012 - autobuild(a)suse.de +Sat Mar 3 07:40:25 CET 2012 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2012-03-02 +- automated update on 2012-03-03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch-ethercodes.spec ++++++ --- /var/tmp/diff_new_pack.iLt1q6/_old 2012-03-05 17:58:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iLt1q6/_new 2012-03-05 17:58:54.000000000 +0100 @@ -23,7 +23,7 @@ License: BSD-3-Clause Group: Productivity/Networking/Diagnostic Summary: Ethercodes Data for arpwatch -Version: 2012.3.2 +Version: 2012.3.3 Release: 1 Source0: http://standards.ieee.org/regauth/oui/oui.txt BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ oui.txt ++++++ --- /var/tmp/diff_new_pack.iLt1q6/_old 2012-03-05 17:58:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iLt1q6/_new 2012-03-05 17:58:54.000000000 +0100 @@ -86110,6 +86110,12 @@ Shenzhen Guangdong 518000 CHINA +40-16-FA (hex) EKM Metering +4016FA (base 16) EKM Metering + 363 Berkeley Way + Santa Cruz CA 95062 + UNITED STATES + 40-18-B1 (hex) Aerohive Networks Inc. 4018B1 (base 16) Aerohive Networks Inc. 330 Gibraltar Drive @@ -88797,6 +88803,12 @@ Jablonec nad Nisou 466 01 CZECH REPUBLIC +60-F3-DA (hex) Logic Way GmbH +60F3DA (base 16) Logic Way GmbH + Hagenower Str. 73 + Schwerin Mecklenburg-West Pomerania 19061 + GERMANY + 60-F5-9C (hex) CRU-Dataport 60F59C (base 16) CRU-Dataport 1000 SE Tech Center Drive @@ -89142,6 +89154,12 @@ San Jose CA 95134 UNITED STATES +64-AE-88 (hex) Polytec GmbH +64AE88 (base 16) Polytec GmbH + Polytec Platz 1-7 + Waldbronn BW 76337 + GERMANY + 64-B6-4A (hex) ViVOtech, Inc. 64B64A (base 16) ViVOtech, Inc. 451 El Camino Real @@ -93990,6 +94008,13 @@ Waterloo Ontario N2L 5R9 CANADA +A0-6D-09 (hex) Intelcan Technosystems Inc. +A06D09 (base 16) Intelcan Technosystems Inc. + 5490 Boul Thimens + Suite 250 + Saint-Laurent Quebec H4R2K9 + CANADA + A0-6E-50 (hex) Nanotek Elektronik Sistemler Ltd. Sti. A06E50 (base 16) Nanotek Elektronik Sistemler Ltd. Sti. Ivedik Organize Sanayi @@ -94111,6 +94136,12 @@ Seoul 135-833 KOREA, REPUBLIC OF +A0-C3-DE (hex) Triton Electronic Systems Ltd. +A0C3DE (base 16) Triton Electronic Systems Ltd. + 620063, Ekaterinburg, P/O box 522 + Ekaterinburg Sverdlovskaya obl. 620063 + RUSSIAN FEDERATION + A0-CF-5B (hex) Cisco Systems A0CF5B (base 16) Cisco Systems 80 West Tasman Dr. @@ -97925,6 +97956,12 @@ Round Rock Texas 78682 UNITED STATES +D0-69-9E (hex) LUMINEX Lighting Control Equipment +D0699E (base 16) LUMINEX Lighting Control Equipment + Berkenlaan 8A + Hechtel-Eksel Limburg 3940 + BELGIUM + D0-75-BE (hex) Reno A&E D075BE (base 16) Reno A&E 4655 Aircenter Circle -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nemiver for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package nemiver for openSUSE:12.1:Update:Test checked in at 2012-03-05 16:53:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/nemiver (Old) and /work/SRC/openSUSE:12.1:Update:Test/.nemiver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nemiver", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/nemiver/nemiver.changes 2012-03-05 16:53:07.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.nemiver.new/nemiver.changes 2012-03-05 16:53:09.000000000 +0100 @@ -1,0 +2,16 @@ +Sun Nov 20 18:35:38 UTC 2011 - dimstar(a)opensuse.org + +- Update to version 0.9.1: + + Handle deprecated functions on glibmm-2.4 2.30.0 and + glib-2.0 2.31.0 + + Bye bye gziped tarballs, welcome xz + + Source code tab label completely ellipsized [bgo#664385] + + Allow shrinking of the memory view widget + + Relax the fixed minimum sizes preventing shrinking [bnc#750099] + + Allow selecting current frame twice consecutively + + Add cmd line option to choose the gdb binary [bgo#646698] + + Handle plural form of a string [bgo#659462] + + Use local time instead of UTC time + + Updated translations. + +------------------------------------------------------------------- Old: ---- nemiver-0.9.0.tar.bz2 New: ---- nemiver-0.9.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nemiver.spec ++++++ --- /var/tmp/diff_new_pack.Zf8Vzq/_old 2012-03-05 16:53:10.000000000 +0100 +++ /var/tmp/diff_new_pack.Zf8Vzq/_new 2012-03-05 16:53:10.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package nemiver # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,12 +16,11 @@ # - Name: nemiver -Version: 0.9.0 -Release: 1 -License: GPLv2+ +Version: 0.9.1 +Release: 0 Summary: Nemiver graphical debugger +License: GPL-2.0+ Group: Development/Tools/Debuggers Url: http://home.gna.org/nemiver/ Source0: http://download.gnome.org/sources/nemiver/0.9/%{name}-%{version}.tar.bz2 @@ -53,10 +52,9 @@ the well known GNU Debugger gdb to debug C / C++ programs. %package devel -License: GPLv2+ Summary: Nemiver graphical debugger - Development files -Requires: %{name} = %{version} Group: Development/Tools/Debuggers +Requires: %{name} = %{version} %description devel Nemiver is a standalone graphical debugger that integrates well in the ++++++ nemiver-0.9.0.tar.bz2 -> nemiver-0.9.1.tar.bz2 ++++++ ++++ 15568 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit timezone for openSUSE:11.4
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package timezone for openSUSE:11.4 checked in at Mon Mar 5 16:50:07 CET 2012. -------- --- old-versions/11.4/UPDATES/all/timezone/timezone-java.changes 2011-10-24 19:24:44.000000000 +0200 +++ 11.4/timezone/timezone-java.changes 2012-03-03 11:47:59.000000000 +0100 @@ -1,0 +2,35 @@ +Sat Mar 3 11:33:38 CET 2012 - dmueller(a)suse.de + +- update to 2012b (bnc#748550): + * Cuba has delayed start of DST by 3 weeks + (now starts April 1 rather than March 11 + * Chile 2011/2012 and 2012/2013 summer time date adjustments. + * Falkland Islands onto permanent summer time (we're assuming for the + foreseeable future, though 2012 is all we're fairly certain of.) + * Armenia has abolished Summer Time. + * Tokelau jumped the International Date Line back last December + (just the same as their near neighbour, Samoa). + * America/Creston is a new zone for a small area of British Columbia + * There will be a leapsecod 2012-06-30 23:59:60 UTC. + +------------------------------------------------------------------- +Sat Nov 5 13:58:36 CET 2011 - dmueller(a)suse.de + +- update to 2011n: + * Cuba (America/Havana) has extended summer time to end on Nov 13 + * Europe/Tiraspol decided not to split from the rest of Moldova, hence + that zone has been removed + * Fiji end of summer time was moved fromrward from Feb 26 to Jan 22 + +------------------------------------------------------------------- +Tue Oct 25 17:49:32 CEST 2011 - dmueller(a)suse.de + +- fix build failure of timezone-java + +------------------------------------------------------------------- +Tue Oct 25 14:48:15 CEST 2011 - dmueller(a)suse.de + +- apply patches also for timezone-java +- add patch to fix Tiraspol split + +------------------------------------------------------------------- timezone.changes: same change calling whatdependson for 11.4-i586 Old: ---- tzcode2011i.tar.gz tzdata2011m.tar.gz New: ---- tzcode2012b.tar.gz tzdata2012b.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ timezone-java.spec ++++++ --- /var/tmp/diff_new_pack.i3w2sX/_old 2012-03-05 16:49:13.000000000 +0100 +++ /var/tmp/diff_new_pack.i3w2sX/_new 2012-03-05 16:49:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package timezone-java # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,20 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: timezone-java -BuildRequires: fastjar gcc-gij javazic -License: Public Domain, Freeware +BuildRequires: fastjar +BuildRequires: gcc-gij +BuildRequires: javazic Summary: Timezone Descriptions +License: SUSE-Public-Domain Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2011m +Version: 2012b Release: 0.<RELEASE2> Source: ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz -Source1: ftp://munnari.oz.au/pub/tzcode2011i.tar.gz +Source1: ftp://munnari.oz.au/pub/tzcode2012b.tar.gz +Patch0: tzdata-china.diff +Patch1: tzcode-zic.diff +Patch2: tzcode-ksh.diff +Patch3: iso3166-uk.diff +Patch4: tzcode-link.diff # COMMON-END # COMMON-END Url: http://www.gnu.org/software/libc/libc.html @@ -44,7 +50,16 @@ %prep -%setup -c +%setup -c -a 1 +# COMMON-PREP-BEGIN +# COMMON-PREP-BEGIN +%patch0 +%patch1 +%patch2 +%patch3 +%patch4 +# COMMON-PREP-END +# COMMON-PREP-END %build gij -jar %{_javadir}/javazic.jar -V %{version} \ ++++++ timezone.spec ++++++ --- /var/tmp/diff_new_pack.i3w2sX/_old 2012-03-05 16:49:13.000000000 +0100 +++ /var/tmp/diff_new_pack.i3w2sX/_new 2012-03-05 16:49:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package timezone # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,26 +15,25 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: timezone -License: PERMISSIVE-OSI-COMPLIANT(BSD-like ; public domain) Summary: Timezone Descriptions +License: PERMISSIVE-OSI-COMPLIANT(BSD-like ; public domain) Group: System/Base Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2011m +Version: 2012b Release: 0.<RELEASE2> Source: ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz -Source1: ftp://munnari.oz.au/pub/tzcode2011i.tar.gz -# COMMON-END +Source1: ftp://munnari.oz.au/pub/tzcode2012b.tar.gz Patch0: tzdata-china.diff Patch1: tzcode-zic.diff Patch2: tzcode-ksh.diff Patch3: iso3166-uk.diff Patch4: tzcode-link.diff +# COMMON-END BuildRoot: %{_tmppath}/%{name}-%{version}-build %global AREA Etc %global ZONE UTC @@ -47,11 +46,13 @@ %prep %setup -c -a 1 +# COMMON-PREP-BEGIN %patch0 %patch1 %patch2 %patch3 %patch4 +# COMMON-PREP-END %build unset ${!LC_*} ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.i3w2sX/_old 2012-03-05 16:49:13.000000000 +0100 +++ /var/tmp/diff_new_pack.i3w2sX/_new 2012-03-05 16:49:13.000000000 +0100 @@ -6,5 +6,7 @@ for spec in timezone-java.spec; do { sed -n -e '1,/COMMON-BEGIN/p' $spec.in sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' timezone.spec - sed -n -e '/COMMON-END/,$p' $spec.in; } > $spec.tmp && mv $spec.tmp $spec + sed -n -e '/COMMON-END/,/COMMON-PREP-BEGIN/p' $spec.in + sed -n -e '/COMMON-PREP-BEGIN/,/COMMON-PREP-END/p' timezone.spec + sed -n -e '/COMMON-PREP-END/,$p' $spec.in; } > $spec.tmp && mv $spec.tmp $spec done ++++++ timezone-java.spec.in ++++++ --- /var/tmp/diff_new_pack.i3w2sX/_old 2012-03-05 16:49:13.000000000 +0100 +++ /var/tmp/diff_new_pack.i3w2sX/_new 2012-03-05 16:49:13.000000000 +0100 @@ -38,7 +38,9 @@ %prep -%setup -c +%setup -c -a 1 +# COMMON-PREP-BEGIN +# COMMON-PREP-END %build gij -jar %{_javadir}/javazic.jar -V %{version} \ ++++++ tzcode2011i.tar.gz -> tzcode2012b.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README new/README --- old/README 2011-06-15 12:43:12.000000000 +0200 +++ new/README 2012-02-26 23:37:09.000000000 +0100 @@ -1,4 +1,4 @@ -@(#)README 8.3 +@(#)README 8.4 This file is in the public domain, so clarified as of 2009-05-17 by Arthur David Olson. @@ -40,7 +40,7 @@ mkdir tz cd tz - wget 'ftp://elsie.nci.nih.gov/pub/tz*.tar.gz' + wget 'ftp://munnari.oz.au/pub/tz*.tar.gz' gzip -dc tzcode*.tar.gz | tar -xf - gzip -dc tzdata*.tar.gz | tar -xf - @@ -71,7 +71,7 @@ 1970, and there are undoubtedly errors even for time stamps since 1970. If you know that the rules are different from those in a file, by all means feel free to change file (and please send the changed version to -tz(a)elsie.nci.nih.gov for use in the future). Europeans take note! +tz(a)iana.org for use in the future). Europeans take note! Thanks to these Timezone Caballeros who've made major contributions to the time conversion package: Keith Bostic; Bob Devine; Paul Eggert; Robert Elz; @@ -80,7 +80,13 @@ for testing work, and to Gwillim Law for checking local mean time data. None of them are responsible for remaining errors. -Look in the ~ftp/pub directory of elsie.nci.nih.gov +Look in the ~ftp/pub directory of munnari.oz.au for updated versions of these files. -Please send comments or information to tz(a)elsie.nci.nih.gov. +Please send comments or information to tz(a)iana.org. + +Postscript: The README above is largely unmodified (aside from details +of mailing list and ftp archive addresses) from that prepared many years +ago by Arthur David Olson, to whom the timezone community owes the +greatest debt of all. Arthur is not currently maintaining this data or +code (though he remains involved). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tz-art.htm new/tz-art.htm --- old/tz-art.htm 2011-06-15 12:43:15.000000000 +0200 +++ new/tz-art.htm 2012-02-27 00:38:50.000000000 +0100 @@ -9,7 +9,7 @@ <body> <h1>Time and the Arts</h1> <address> -(a)(#)tz-art.htm 8.20 +(a)(#)tz-art.htm 8.21 </address> <p> This file is in the public domain, so clarified as of @@ -17,7 +17,7 @@ </p> <p> Please send corrections to this web page to the -<a href="mailto:tz@elsie.nci.nih.gov">time zone mailing list</a>.</p> +<a href="mailto:tz@iana.org">time zone mailing list</a>.</p> <p> See also <a href="tz-link.htm">Sources for Time Zone and Daylight Saving Time Data</a>.</p> <hr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tz-link.htm new/tz-link.htm --- old/tz-link.htm 2011-08-17 19:31:59.000000000 +0200 +++ new/tz-link.htm 2012-02-27 14:25:59.000000000 +0100 @@ -18,7 +18,7 @@ <body> <h1>Sources for Time Zone and Daylight Saving Time Data</h1> <address> -(a)(#)tz-link.htm 8.32 +(a)(#)tz-link.htm 8.33 </address> <p> This file is in the public domain, so clarified as of @@ -26,7 +26,7 @@ </p> <p> Please send corrections to this web page to the -<a href="mailto:tz@elsie.nci.nih.gov">time zone mailing list</a>.</p> +<a href="mailto:tz@iana.org">time zone mailing list</a>.</p> <h2>The <code>tz</code> database</h2> <p> The <a href="http://en.wikipedia.org/wiki/Public_domain">public-domain</a> @@ -83,7 +83,7 @@ the location's full name, e.g., <code>TZ="America/New_York"</code>.</p> <p> In the <code>tz</code> database's -<a href="ftp://elsie.nci.nih.gov/pub"><abbr +<a href="ftp://munnari.oz.au/pub"><abbr title="File Transfer Protocol">FTP</abbr> distribution</a> the code is in the file <code>tzcode<var>C</var>.tar.gz</code>, where <code><var>C</var></code> is the code's version; @@ -98,25 +98,30 @@ <code>README</code> file for what to do next.</p> <pre style="margin-left: 2em"><code>mkdir tz cd tz -<a href="http://www.gnu.org/software/wget/">wget</a> 'ftp://elsie.nci.nih.gov/pub/tz*.tar.gz' +<a href="http://www.gnu.org/software/wget/">wget</a> 'ftp://munnari.oz.au/pub/tz*.tar.gz' <a href="http://www.gnu.org/software/gzip/">gzip</a> -dc tzcode*.tar.gz | <a href="http://www.gnu.org/software/tar/">tar</a> -xf - gzip -dc tzdata*.tar.gz | tar -xf - </code></pre> <p> +The code and data files can also be obtained from the +<a href="http://www.iana.org">IANA</a> +<a href="http://www.iana.org/time-zones">timezone web page</a>. +<p> The code lets you compile the <code>tz</code> source files into machine-readable binary files, one for each location. It also lets you read a <code>tz</code> binary file and interpret time stamps for that location.</p> <p> The data are by no means authoritative. If you find errors, please -send changes to the <a href="mailto:tz@elsie.nci.nih.gov">time zone +send changes to the <a href="mailto:tz@iana.org">time zone mailing list</a>. You can also <a href="http://news.gmane.org/gmane.comp.time.tz">browse recent messages</a> sent to the mailing list, <a -href="mailto:tz-request@elsie.nci.nih.gov">subscribe</a> to it, -retrieve the <a -href="ftp://elsie.nci.nih.gov/pub/tzarchive.gz">full archive of old -messages</a> (in gzip compressed format), or retrieve <a +href="https://mm.icann.org/mailman/listinfo/tz">subscribe</a> to it. +browse the <a +href="http://mm.icann.org/pipermail/tz/">archive of old +messages</a> (message by message or in gzip compressed format), +or retrieve <a href="ftp://munnari.oz.au/pub/oldtz">archived older versions of code and data</a>.</p> <p> @@ -273,6 +278,11 @@ It is freely available under the <abbr>LGPL</abbr>.</li> <li>Tcl, mentioned above, also contains a <code>tz</code> binary file reader.</li> +<li><a href="http://search.cpan.org/perldoc?DateTime::TimeZone::Tzfile"> +DateTime::TimeZone::Tzfile</a> +is a <code>tz</code> binary file reader written in Perl. +It is freely available under the same terms as Perl +(dual <abbr>GPL</abbr> and Artistic license).</li> </ul> <h2>Other <code>tz</code>-based time zone software</h2> <ul> ++++++ tzdata2011m.tar.gz -> tzdata2012b.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/antarctica new/antarctica --- old/antarctica 2011-09-20 19:55:03.000000000 +0200 +++ new/antarctica 2012-03-01 12:16:24.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)antarctica 8.9 +# @(#)antarctica 8.10 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -42,8 +42,19 @@ Rule ChileAQ 1998 only - Mar Sun>=9 3:00u 0 - Rule ChileAQ 1998 only - Sep 27 4:00u 1:00 S Rule ChileAQ 1999 only - Apr 4 3:00u 0 - -Rule ChileAQ 1999 max - Oct Sun>=9 4:00u 1:00 S -Rule ChileAQ 2000 max - Mar Sun>=9 3:00u 0 - +Rule ChileAQ 1999 2010 - Oct Sun>=9 4:00u 1:00 S +Rule ChileAQ 2000 2007 - Mar Sun>=9 3:00u 0 - +# N.B.: the end of March 29 in Chile is March 30 in Universal time, +# which is used below in specifying the transition. +Rule ChileAQ 2008 only - Mar 30 3:00u 0 - +Rule ChileAQ 2009 only - Mar Sun>=9 3:00u 0 - +Rule ChileAQ 2010 only - Apr Sun>=1 3:00u 0 - +Rule ChileAQ 2011 only - May Sun>=2 3:00u 0 - +Rule ChileAQ 2011 only - Aug Sun>=16 4:00u 1:00 S +Rule ChileAQ 2012 only - Apr Sun>=23 3:00u 0 - +Rule ChileAQ 2012 only - Sep Sun>=2 4:00u 1:00 S +Rule ChileAQ 2013 max - Mar Sun>=9 3:00u 0 - +Rule ChileAQ 2013 max - Oct Sun>=9 4:00u 1:00 S # These rules are stolen from the `australasia' file. Rule AusAQ 1917 only - Jan 1 0:01 1:00 - @@ -142,12 +153,16 @@ # Western (Aus) Standard Time 11:00 - CAST 2010 Mar 5 2:00 # Casey Time + 8:00 - WST 2011 Oct 28 2:00 + 11:00 - CAST 2012 Feb 21 17:00u 8:00 - WST Zone Antarctica/Davis 0 - zzz 1957 Jan 13 7:00 - DAVT 1964 Nov # Davis Time 0 - zzz 1969 Feb 7:00 - DAVT 2009 Oct 18 2:00 5:00 - DAVT 2010 Mar 10 20:00u + 7:00 - DAVT 2011 Oct 28 2:00 + 5:00 - DAVT 2012 Feb 21 20:00u 7:00 - DAVT Zone Antarctica/Mawson 0 - zzz 1954 Feb 13 6:00 - MAWT 2009 Oct 18 2:00 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asia new/asia --- old/asia 2011-10-15 05:17:13.000000000 +0200 +++ new/asia 2012-02-27 00:05:26.000000000 +0100 @@ -1,4 +1,4 @@ -# @(#)asia 8.69 +# @(#)asia 8.70 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -77,10 +77,6 @@ Rule RussiaAsia 1993 1995 - Sep lastSun 2:00s 0 - Rule RussiaAsia 1996 max - Oct lastSun 2:00s 0 - -# From Arthur David Olson (2011-06-15): -# While Russia abandoned DST in 2011, Armenia may choose to -# follow Russia's "old" rules. - # Afghanistan # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Kabul 4:36:48 - LMT 1890 @@ -97,6 +93,21 @@ # in 1996, though it did use DST in 1995. IATA SSIM (1991/1998) reports that # Armenia switched from 3:00 to 4:00 in 1998 and observed DST after 1991, # but started switching at 3:00s in 1998. + +# From Arthur David Olson (2011-06-15): +# While Russia abandoned DST in 2011, Armenia may choose to +# follow Russia's "old" rules. + +# From Alexander Krivenyshev (2012-02-10): +# According to News Armenia, on Feb 9, 2012, +# http://newsarmenia.ru/society/20120209/42609695.html +# +# The Armenia National Assembly adopted final reading of Amendments to the +# Law "On procedure of calculation time on the territory of the Republic of +# Armenia" according to which Armenia [is] abolishing Daylight Saving Time. +# or +# (brief) +# http://www.worldtimezone.com/dst_news/dst_news_armenia03.html # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Yerevan 2:58:00 - LMT 1924 May 2 3:00 - YERT 1957 Mar # Yerevan Time @@ -104,7 +115,8 @@ 3:00 1:00 YERST 1991 Sep 23 # independence 3:00 RussiaAsia AM%sT 1995 Sep 24 2:00s 4:00 - AMT 1997 - 4:00 RussiaAsia AM%sT + 4:00 RussiaAsia AM%sT 2012 Mar 25 2:00s + 4:00 - AMT # Azerbaijan # From Rustam Aliyev of the Azerbaijan Internet Forum (2005-10-23): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/australasia new/australasia --- old/australasia 2011-10-15 05:18:03.000000000 +0200 +++ new/australasia 2012-02-27 00:07:14.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)australasia 8.28 +# @(#)australasia 8.30 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -308,6 +308,20 @@ # advance at 2am to 3am on October 23, 2011 and one hour back at 3am to # 2am on February 26 next year. +# From Ken Rylander (2011-10-24) +# Another change to the Fiji DST end date. In the TZ database the end date for +# Fiji DST 2012, is currently Feb 26. This has been changed to Jan 22. +# +# <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=5017:am…"> +# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=5017:am… +# </a> +# states: +# +# The end of daylight saving scheduled initially for the 26th of February 2012 +# has been brought forward to the 22nd of January 2012. +# The commencement of daylight saving will remain unchanged and start +# on the 23rd of October, 2011. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - @@ -316,7 +330,7 @@ Rule Fiji 2010 only - Oct 24 2:00 1:00 S Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - Rule Fiji 2011 only - Oct 23 2:00 1:00 S -Rule Fiji 2012 only - Feb 26 3:00 0 - +Rule Fiji 2012 only - Jan 22 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fiji 11:53:40 - LMT 1915 Oct 26 # Suva 12:00 Fiji FJ%sT # Fiji Time @@ -602,6 +616,11 @@ # Dateline Change skip Friday 30th Dec 2011 # Thursday 29th December 2011 23:59:59 Hours # Saturday 31st December 2011 00:00:00 Hours +# +# Clarification by Tim Parenti (2012-01-03): +# Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012 +# seasons, there is not yet any indication that this trend will continue on +# a regular basis. For now, we have explicitly listed the transitions below. Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time @@ -619,9 +638,28 @@ 11:00 - SBT # Solomon Is Time # Tokelau Is +# +# From Gwillim Law (2011-12-29) +# A correspondent informed me that Tokelau, like Samoa, will be skipping +# December 31 this year, thereby changing its time zone from UTC-10 to +# UTC+14. When I tried to verify this statement, I found a confirming +# article in Time magazine online +# <a href="http://www.time.com/time/world/article/0,8599,2103243,00.html"> +# (http://www.time.com/time/world/article/0,8599,2103243,00.html). +# </a> +# +# From Jonathan Leffler (2011-12-29) +# Information from the BBC to the same effect: +# <a href="http://www.bbc.co.uk/news/world-asia-16351377"> +# http://www.bbc.co.uk/news/world-asia-16351377 +# </a> +# +# Patch supplied by Tim Parenti (2011-12-29) + # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fakaofo -11:24:56 - LMT 1901 - -10:00 - TKT # Tokelau Time + -10:00 - TKT 2011 Dec 30 # Tokelau Time + 14:00 - TKT # Tonga # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/backward new/backward --- old/backward 2011-10-20 04:20:30.000000000 +0200 +++ new/backward 2011-10-28 11:53:47.000000000 +0200 @@ -1,5 +1,5 @@ # <pre> -# @(#)backward 8.10 +# @(#)backward 8.11 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -67,6 +67,7 @@ Link Africa/Cairo Egypt Link Europe/Dublin Eire Link Europe/London Europe/Belfast +Link Europe/Chisinau Europe/Tiraspol Link Europe/London GB Link Europe/London GB-Eire Link Etc/GMT GMT+0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/europe new/europe --- old/europe 2011-10-24 16:09:01.000000000 +0200 +++ new/europe 2012-03-01 11:03:09.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)europe 8.39 +# @(#)europe 8.41 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -211,9 +211,15 @@ # the history of summer time legislation in the United Kingdom. # Since 1998 Joseph S. Myers has been updating # and extending this list, which can be found in -# <a href="http://student.cusu.cam.ac.uk/~jsm28/british-time/"> +# http://student.cusu.cam.ac.uk/~jsm28/british-time/ +# <a href="http://www.polyomino.org.uk/british-time/"> # History of legal time in Britain # </a> +# Rob Crowther (2012-01-04) reports that that URL no longer +# exists, and the article can now be found at: +# <a href="http://www.polyomino.org.uk/british-time/"> +# http://www.polyomino.org.uk/british-time/ +# </a> # From Joseph S. Myers (1998-01-06): # @@ -1151,10 +1157,10 @@ # write that they were used in Monaco and in many French locations. # Le Corre writes that the upper limit of the free zone was Arneguy, Orthez, # Mont-de-Marsan, Bazas, Langon, Lamotte-Montravel, Marouil, La -# Rochefoucault, Champagne-Mouton, La Roche-Posay, La Haye-Decartes, +# Rochefoucault, Champagne-Mouton, La Roche-Posay, La Haye-Descartes, # Loches, Montrichard, Vierzon, Bourges, Moulins, Digoin, # Paray-le-Monial, Montceau-les-Mines, Chalons-sur-Saone, Arbois, -# Dole, Morez, St-Claude, and Collognes (Haute-Savioe). +# Dole, Morez, St-Claude, and Collonges (Haute-Savoie). Rule France 1941 only - May 5 0:00 2:00 M # Midsummer # Shanks & Pottenger say this transition occurred at Oct 6 1:00, # but go with Denis Excoffier (1997-12-12), @@ -1678,6 +1684,18 @@ # a pre-1880 LMT offset of 1:58:32. # # (which agrees with the earlier entry that had been removed) +# +# From Alexander Krivenyshev (2011-10-26) +# NO need to divide Moldova into two timezones at this point. +# As of today, Transnistria (Pridnestrovie)- Tiraspol reversed its own +# decision to abolish DST this winter. +# Following Moldova and neighboring Ukraine- Transnistria (Pridnestrovie)- +# Tiraspol will go back to winter time on October 30, 2011. +# News from Moldova (in russian): +# <a href="http://ru.publika.md/link_317061.html"> +# http://ru.publika.md/link_317061.html +# </a> + # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/Chisinau 1:55:20 - LMT 1880 @@ -1694,21 +1712,6 @@ # See Romania commentary for the guessed 1997 transition to EU rules. 2:00 EU EE%sT -Zone Europe/Tiraspol 1:58:32 - LMT 1880 - 1:55 - CMT 1918 Feb 15 # Chisinau MT - 1:44:24 - BMT 1931 Jul 24 # Bucharest MT - 2:00 Romania EE%sT 1940 Aug 15 - 2:00 1:00 EEST 1941 Jul 17 - 1:00 C-Eur CE%sT 1944 Aug 24 - 3:00 Russia MSK/MSD 1990 - 3:00 - MSK 1990 May 6 - 2:00 - EET 1991 - 2:00 Russia EE%sT 1992 - 2:00 E-Eur EE%sT 1997 -# See Romania commentary for the guessed 1997 transition to EU rules. - 2:00 EU EE%sT 2011 Mar lastSun 1:00u - 3:00 - FET # Further-eastern European Time - # Monaco # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's # more precise 0:09:21. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leapseconds new/leapseconds --- old/leapseconds 2011-09-20 19:55:04.000000000 +0200 +++ new/leapseconds 2012-01-06 12:37:49.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)leapseconds 8.11 +# @(#)leapseconds 8.13 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -48,40 +48,54 @@ Leap 1998 Dec 31 23:59:60 + S Leap 2005 Dec 31 23:59:60 + S Leap 2008 Dec 31 23:59:60 + S +Leap 2012 Jun 30 23:59:60 + S # INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS) # # SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE # +# # SERVICE DE LA ROTATION TERRESTRE # OBSERVATOIRE DE PARIS # 61, Av. de l'Observatoire 75014 PARIS (France) -# Tel. : 33 (0) 1 40 51 22 29 +# Tel. : 33 (0) 1 40 51 22 26 # FAX : 33 (0) 1 40 51 22 91 -# Internet : services.iers(a)obspm.fr +# e-mail : (E-Mail Removed) +# http://hpiers.obspm.fr/eop-pc +# +# Paris, 5 January 2012 # -# Paris, 2 February 2011 # -# Bulletin C 41 +# Bulletin C 43 # # To authorities responsible # for the measurement and # distribution of time # -# INFORMATION ON UTC - TAI # -# NO positive leap second will be introduced at the end of June 2011. -# The difference between Coordinated Universal Time UTC and the -# International Atomic Time TAI is : +# UTC TIME STEP +# on the 1st of July 2012 +# # -# from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s +# A positive leap second will be introduced at the end of June 2012. +# The sequence of dates of the UTC second markers will be: +# +# 2012 June 30, 23h 59m 59s +# 2012 June 30, 23h 59m 60s +# 2012 July 1, 0h 0m 0s +# +# The difference between UTC and the International Atomic Time TAI is: +# +# from 2009 January 1, 0h UTC, to 2012 July 1 0h UTC : UTC-TAI = - 34s +# from 2012 July 1, 0h UTC, until further notice : UTC-TAI = - 35s # # Leap seconds can be introduced in UTC at the end of the months of December -# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every -# six months, either to announce a time step in UTC, or to confirm that there +# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every +# six months, either to announce a time step in UTC or to confirm that there # will be no time step at the next possible date. # +# # Daniel GAMBIS -# Head -# Earth Orientation Center of the IERS +# Head +# Earth Orientation Center of IERS # Observatoire de Paris, France diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/northamerica new/northamerica --- old/northamerica 2011-10-15 05:17:28.000000000 +0200 +++ new/northamerica 2012-03-02 06:29:15.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)northamerica 8.50 +# @(#)northamerica 8.53 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -1120,9 +1120,26 @@ # For now, assume all of DST-observing Canada will fall into line with the # new US DST rules, +# From Chris Walton (2011-12-01) +# In the first of Tammy Hardwick's articles +# <a href="http://www.ilovecreston.com/?p=articles&t=spec&ar=260"> +# http://www.ilovecreston.com/?p=articles&t=spec&ar=260 +# </a> +# she quotes the Friday November 1/1918 edition of the Creston Review. +# The quote includes these two statements: +# 'Sunday the CPR went back to the old system of time...' +# '... The daylight saving scheme was dropped all over Canada at the same time,' +# These statements refer to a transition from daylight time to standard time +# that occurred nationally on Sunday October 27/1918. This transition was +# also documented in the Saturday October 26/1918 edition of the Toronto Star. + +# In light of that evidence, we alter the date from the earlier believed +# Oct 31, to Oct 27, 1918 (and Sunday is a more likely transition day +# than Thursday) in all Canadian rulesets. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Canada 1918 only - Apr 14 2:00 1:00 D -Rule Canada 1918 only - Oct 31 2:00 0 S +Rule Canada 1918 only - Oct 27 2:00 0 S Rule Canada 1942 only - Feb 9 2:00 1:00 W # War Rule Canada 1945 only - Aug 14 23:00u 1:00 P # Peace Rule Canada 1945 only - Sep 30 2:00 0 S @@ -1645,7 +1662,7 @@ Rule Winn 1916 only - Apr 23 0:00 1:00 D Rule Winn 1916 only - Sep 17 0:00 0 S Rule Winn 1918 only - Apr 14 2:00 1:00 D -Rule Winn 1918 only - Oct 31 2:00 0 S +Rule Winn 1918 only - Oct 27 2:00 0 S Rule Winn 1937 only - May 16 2:00 1:00 D Rule Winn 1937 only - Sep 26 2:00 0 S Rule Winn 1942 only - Feb 9 2:00 1:00 W # War @@ -1728,7 +1745,7 @@ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Regina 1918 only - Apr 14 2:00 1:00 D -Rule Regina 1918 only - Oct 31 2:00 0 S +Rule Regina 1918 only - Oct 27 2:00 0 S Rule Regina 1930 1934 - May Sun>=1 0:00 1:00 D Rule Regina 1930 1934 - Oct Sun>=1 0:00 0 S Rule Regina 1937 1941 - Apr Sun>=8 0:00 1:00 D @@ -1765,7 +1782,7 @@ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Edm 1918 1919 - Apr Sun>=8 2:00 1:00 D -Rule Edm 1918 only - Oct 31 2:00 0 S +Rule Edm 1918 only - Oct 27 2:00 0 S Rule Edm 1919 only - May 27 2:00 0 S Rule Edm 1920 1923 - Apr lastSun 2:00 1:00 D Rule Edm 1920 only - Oct lastSun 2:00 0 S @@ -1795,9 +1812,68 @@ # Dawson Creek uses MST. Much of east BC is like Edmonton. # Matthews and Vincent (1998) write that Creston is like Dawson Creek. +# It seems though that (re: Creston) is not entirely correct: + +# From Chris Walton (2011-12-01): +# There are two areas within the Canadian province of British Columbia +# that do not currently observe daylight saving: +# a) The Creston Valley (includes the town of Creston and surrounding area) +# b) The eastern half of the Peace River Regional District +# (includes the cities of Dawson Creek and Fort St. John) + +# Earlier this year I stumbled across a detailed article about the time +# keeping history of Creston; it was written by Tammy Hardwick who is the +# manager of the Creston & District Museum. The article was written in May 2009. +# <a href="http://www.ilovecreston.com/?p=articles&t=spec&ar=260"> +# http://www.ilovecreston.com/?p=articles&t=spec&ar=260 +# </a> +# According to the article, Creston has not changed its clocks since June 1918. +# i.e. Creston has been stuck on UTC-7 for 93 years. +# Dawson Creek, on the other hand, changed its clocks as recently as April 1972. + +# Unfortunately the exact date for the time change in June 1918 remains +# unknown and will be difficult to ascertain. I e-mailed Tammy a few months +# ago to ask if Sunday June 2 was a reasonable guess. She said it was just +# as plausible as any other date (in June). She also said that after writing the +# article she had discovered another time change in 1916; this is the subject +# of another article which she wrote in October 2010. +# <a href="http://www.creston.museum.bc.ca/index.php?module=comments&uop=view_comment&…"> +# http://www.creston.museum.bc.ca/index.php?module=comments&uop=view_comment&… +# </a> + +# Here is a summary of the three clock change events in Creston's history: +# 1. 1884 or 1885: adoption of Mountain Standard Time (GMT-7) +# Exact date unknown +# 2. Oct 1916: switch to Pacific Standard Time (GMT-8) +# Exact date in October unknown; Sunday October 1 is a reasonable guess. +# 3. June 1918: switch to Pacific Daylight Time (GMT-7) +# Exact date in June unknown; Sunday June 2 is a reasonable guess. +# note#1: +# On Oct 27/1918 when daylight saving ended in the rest of Canada, +# Creston did not change its clocks. +# note#2: +# During WWII when the Federal Government legislated a mandatory clock change, +# Creston did not oblige. +# note#3: +# There is no guarantee that Creston will remain on Mountain Standard Time +# (UTC-7) forever. +# The subject was debated at least once this year by the town Council. +# <a href="http://www.bclocalnews.com/kootenay_rockies/crestonvalleyadvance/news/11676…"> +# http://www.bclocalnews.com/kootenay_rockies/crestonvalleyadvance/news/11676… +# </a> + +# During a period WWII, summer time (Daylight saying) was mandatory in Canada. +# In Creston, that was handled by shifting the area to PST (-8:00) then applying +# summer time to cause the offset to be -7:00, the same as it had been before +# the change. It can be argued that the timezone abbreviation during this +# period should be PDT rather than MST, but that doesn't seem important enough +# (to anyone) to further complicate the rules. + +# The transition dates (and times) are guesses. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Vanc 1918 only - Apr 14 2:00 1:00 D -Rule Vanc 1918 only - Oct 31 2:00 0 S +Rule Vanc 1918 only - Oct 27 2:00 0 S Rule Vanc 1942 only - Feb 9 2:00 1:00 W # War Rule Vanc 1945 only - Aug 14 23:00u 1:00 P # Peace Rule Vanc 1945 only - Sep 30 2:00 0 S @@ -1813,7 +1889,10 @@ -8:00 Canada P%sT 1947 -8:00 Vanc P%sT 1972 Aug 30 2:00 -7:00 - MST - +Zone America/Creston -7:46:04 - LMT 1884 + -7:00 - MST 1916 Oct 1 + -8:00 - PST 1918 Jun 2 + -7:00 - MST # Northwest Territories, Nunavut, Yukon @@ -2690,6 +2769,34 @@ # <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html"> # http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html # </a> +# +# From Steffen Thorsen (2011-10-30) +# Cuba will end DST two weeks later this year. Instead of going back +# tonight, it has been delayed to 2011-11-13 at 01:00. +# +# One source (Spanish) +# <a href="http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-…"> +# http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-… +# </a> +# +# Our page: +# <a href="http://www.timeanddate.com/news/time/cuba-time-changes-2011.html"> +# http://www.timeanddate.com/news/time/cuba-time-changes-2011.html +# </a> +# +# From Steffen Thorsen (2012-03-01) +# According to Radio Reloj, Cuba will start DST on Midnight between March +# 31 and April 1. +# +# Radio Reloj has the following info (Spanish): +# <a href="http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529…"> +# http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529… +# </a> +# +# Our info on it: +# <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html"> +# http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html +# </a> # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Cuba 1928 only - Jun 10 0:00 1:00 D @@ -2721,12 +2828,15 @@ Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S Rule Cuba 2000 2004 - Apr Sun>=1 0:00s 1:00 D -Rule Cuba 2006 max - Oct lastSun 0:00s 0 S +Rule Cuba 2006 2010 - Oct lastSun 0:00s 0 S Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D Rule Cuba 2008 only - Mar Sun>=15 0:00s 1:00 D Rule Cuba 2009 2010 - Mar Sun>=8 0:00s 1:00 D Rule Cuba 2011 only - Mar Sun>=15 0:00s 1:00 D -Rule Cuba 2012 max - Mar Sun>=8 0:00s 1:00 D +Rule Cuba 2011 only - Nov 13 0:00s 0 S +Rule Cuba 2012 only - Apr 1 0:00s 1:00 D +Rule Cuba 2012 max - Oct lastSun 0:00s 0 S +Rule Cuba 2013 max - Mar Sun>=8 0:00s 1:00 D # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Havana -5:29:28 - LMT 1890 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/southamerica new/southamerica --- old/southamerica 2011-10-15 05:46:37.000000000 +0200 +++ new/southamerica 2012-03-01 11:50:15.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)southamerica 8.52 +# @(#)southamerica 8.53 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -1218,6 +1218,28 @@ # August, not in October as they have since 1968. This is a pilot plan # which will be reevaluated in 2012. +# From Mauricio Parada (2012-02-22), translated by Glenn Eychaner (2012-02-23): +# As stated in the website of the Chilean Energy Ministry +# http://www.minenergia.cl/ministerio/noticias/generales/gobierno-anuncia-fec… +# The Chilean Government has decided to postpone the entrance into winter time +# (to leave DST) from March 11 2012 to April 28th 2012. The decision has not +# been yet formalized but it will within the next days. +# Quote from the website communication: +# +# 6. For the year 2012, the dates of entry into winter time will be as follows: +# a. Saturday April 28, 2012, clocks should go back 60 minutes; that is, at +# 23:59:59, instead of passing to 0:00, the time should be adjusted to be 23:00 +# of the same day. +# b. Saturday, September 1, 2012, clocks should go forward 60 minutes; that is, +# at 23:59:59, instead of passing to 0:00, the time should be adjusted to be +# 01:00 on September 2. +# +# Note that...this is yet another "temporary" change that will be reevaluated +# AGAIN in 2013. + +# NOTE: ChileAQ rules for Antarctic bases are stored separately in the +# 'antarctica' file. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Chile 1927 1932 - Sep 1 0:00 1:00 S Rule Chile 1928 1932 - Apr 1 0:00 0 - @@ -1248,8 +1270,6 @@ Rule Chile 1998 only - Sep 27 4:00u 1:00 S Rule Chile 1999 only - Apr 4 3:00u 0 - Rule Chile 1999 2010 - Oct Sun>=9 4:00u 1:00 S -Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 S -Rule Chile 2012 max - Oct Sun>=9 4:00u 1:00 S Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 - # N.B.: the end of March 29 in Chile is March 30 in Universal time, # which is used below in specifying the transition. @@ -1257,7 +1277,11 @@ Rule Chile 2009 only - Mar Sun>=9 3:00u 0 - Rule Chile 2010 only - Apr Sun>=1 3:00u 0 - Rule Chile 2011 only - May Sun>=2 3:00u 0 - -Rule Chile 2012 max - Mar Sun>=9 3:00u 0 - +Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 S +Rule Chile 2012 only - Apr Sun>=23 3:00u 0 - +Rule Chile 2012 only - Sep Sun>=2 4:00u 1:00 S +Rule Chile 2013 max - Mar Sun>=9 3:00u 0 - +Rule Chile 2013 max - Oct Sun>=9 4:00u 1:00 S # IATA SSIM anomalies: (1992-02) says 1992-03-14; # (1996-09) says 1998-03-08. Ignore these. # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1403,6 +1427,21 @@ # will not revert to local mean time, but clocks will remain on Summer # time (UTC/GMT - 3 hours) throughout the whole of 2011. Any long term # change to local time following the trial period will be notified. +# +# From Andrew Newman (2012-02-24) +# A letter from Justin McPhee, Chief Executive, +# Cable & Wireless Falkland Islands (dated 2012-02-22) +# states... +# The current Atlantic/Stanley entry under South America expects the +# clocks to go back to standard Falklands Time (FKT) on the 15th April. +# The database entry states that in 2011 Stanley was staying on fixed +# summer time on a trial basis only. FIG need to contact IANA and/or +# the maintainers of the database to inform them we're adopting +# the same policy this year and suggest recommendations for future years. +# +# For now we will assume permanent summer time for the Falklands +# until advised differently (to apply for 2012 and beyond, after the 2011 +# experiment was apparently successful.) # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Falk 1937 1938 - Sep lastSun 0:00 1:00 S Rule Falk 1938 1942 - Mar Sun>=19 0:00 0 - @@ -1415,14 +1454,14 @@ Rule Falk 1985 2000 - Sep Sun>=9 0:00 1:00 S Rule Falk 1986 2000 - Apr Sun>=16 0:00 0 - Rule Falk 2001 2010 - Apr Sun>=15 2:00 0 - -Rule Falk 2012 max - Apr Sun>=15 2:00 0 - -Rule Falk 2001 max - Sep Sun>=1 2:00 1:00 S +Rule Falk 2001 2010 - Sep Sun>=1 2:00 1:00 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Atlantic/Stanley -3:51:24 - LMT 1890 -3:51:24 - SMT 1912 Mar 12 # Stanley Mean Time -4:00 Falk FK%sT 1983 May # Falkland Is Time -3:00 Falk FK%sT 1985 Sep 15 - -4:00 Falk FK%sT + -4:00 Falk FK%sT 2010 Sep 5 02:00 + -3:00 - FKST # French Guiana # Zone NAME GMTOFF RULES FORMAT [UNTIL] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zone.tab new/zone.tab --- old/zone.tab 2011-10-24 16:42:16.000000000 +0200 +++ new/zone.tab 2012-03-02 06:21:33.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)zone.tab 8.50 +# @(#)zone.tab 8.55 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. # @@ -131,6 +131,7 @@ CA +690650-1050310 America/Cambridge_Bay Mountain Time - west Nunavut CA +6227-11421 America/Yellowknife Mountain Time - central Northwest Territories CA +682059-1334300 America/Inuvik Mountain Time - west Northwest Territories +CA +4906-11631 America/Creston Mountain Standard Time - Creston, British Columbia CA +5946-12014 America/Dawson_Creek Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia CA +4916-12307 America/Vancouver Pacific Time - west British Columbia CA +6043-13503 America/Whitehorse Pacific Time - south Yukon @@ -258,7 +259,6 @@ MA +3339-00735 Africa/Casablanca MC +4342+00723 Europe/Monaco MD +4700+02850 Europe/Chisinau -MD +4651+02938 Europe/Tiraspol Pridnestrovie ME +4226+01916 Europe/Podgorica MF +1804-06305 America/Marigot MG -1855+04731 Indian/Antananarivo @@ -334,7 +334,7 @@ RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad RU +5545+03735 Europe/Moscow Moscow+00 - west Russia RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea -RU +5312+05009 Europe/Samara Moscow - Samara, Udmurtia +RU +5312+05009 Europe/Samara Moscow+00 - Samara, Udmurtia RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk continue with "q"... 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 timezone for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package timezone for openSUSE:12.1:Update:Test checked in at 2012-03-05 14:18:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/timezone (Old) and /work/SRC/openSUSE:12.1:Update:Test/.timezone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "timezone", Maintainer is "matz(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/timezone/timezone-java.changes 2012-03-05 14:18:38.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.timezone.new/timezone-java.changes 2012-03-05 14:18:40.000000000 +0100 @@ -1,0 +2,15 @@ +Sat Mar 3 11:33:38 CET 2012 - dmueller(a)suse.de + +- update to 2012b (bnc#748550): + * Cuba has delayed start of DST by 3 weeks + (now starts April 1 rather than March 11 + * Chile 2011/2012 and 2012/2013 summer time date adjustments. + * Falkland Islands onto permanent summer time (we're assuming for the + foreseeable future, though 2012 is all we're fairly certain of.) + * Armenia has abolished Summer Time. + * Tokelau jumped the International Date Line back last December + (just the same as their near neighbour, Samoa). + * America/Creston is a new zone for a small area of British Columbia + * There will be a leapsecod 2012-06-30 23:59:60 UTC. + +------------------------------------------------------------------- timezone.changes: same change Old: ---- tzcode2011i.tar.gz tzdata2011n.tar.gz New: ---- tzcode2012b.tar.gz tzdata2012b.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ timezone-java.spec ++++++ --- /var/tmp/diff_new_pack.vvfIje/_old 2012-03-05 14:18:40.000000000 +0100 +++ /var/tmp/diff_new_pack.vvfIje/_new 2012-03-05 14:18:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package timezone-java # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,20 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: timezone-java -BuildRequires: fastjar gcc-gij javazic -License: Public Domain, Freeware +BuildRequires: fastjar +BuildRequires: gcc-gij +BuildRequires: javazic Summary: Timezone Descriptions +License: SUSE-Public-Domain Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2011n -Release: 1 +Version: 2012b +Release: 0 Source: ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz -Source1: ftp://munnari.oz.au/pub/tzcode2011i.tar.gz +Source1: ftp://munnari.oz.au/pub/tzcode2012b.tar.gz Patch0: tzdata-china.diff Patch1: tzcode-zic.diff Patch2: tzcode-ksh.diff ++++++ timezone.spec ++++++ --- /var/tmp/diff_new_pack.vvfIje/_old 2012-03-05 14:18:40.000000000 +0100 +++ /var/tmp/diff_new_pack.vvfIje/_new 2012-03-05 14:18:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package timezone # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,20 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: timezone -License: PERMISSIVE-OSI-COMPLIANT(BSD-like ; public domain) Summary: Timezone Descriptions +License: PERMISSIVE-OSI-COMPLIANT(BSD-like ; public domain) Group: System/Base Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2011n -Release: 1 +Version: 2012b +Release: 0 Source: ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz -Source1: ftp://munnari.oz.au/pub/tzcode2011i.tar.gz +Source1: ftp://munnari.oz.au/pub/tzcode2012b.tar.gz Patch0: tzdata-china.diff Patch1: tzcode-zic.diff Patch2: tzcode-ksh.diff ++++++ tzcode2011i.tar.gz -> tzcode2012b.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README new/README --- old/README 2011-06-15 12:43:12.000000000 +0200 +++ new/README 2012-02-26 23:37:09.000000000 +0100 @@ -1,4 +1,4 @@ -@(#)README 8.3 +@(#)README 8.4 This file is in the public domain, so clarified as of 2009-05-17 by Arthur David Olson. @@ -40,7 +40,7 @@ mkdir tz cd tz - wget 'ftp://elsie.nci.nih.gov/pub/tz*.tar.gz' + wget 'ftp://munnari.oz.au/pub/tz*.tar.gz' gzip -dc tzcode*.tar.gz | tar -xf - gzip -dc tzdata*.tar.gz | tar -xf - @@ -71,7 +71,7 @@ 1970, and there are undoubtedly errors even for time stamps since 1970. If you know that the rules are different from those in a file, by all means feel free to change file (and please send the changed version to -tz(a)elsie.nci.nih.gov for use in the future). Europeans take note! +tz(a)iana.org for use in the future). Europeans take note! Thanks to these Timezone Caballeros who've made major contributions to the time conversion package: Keith Bostic; Bob Devine; Paul Eggert; Robert Elz; @@ -80,7 +80,13 @@ for testing work, and to Gwillim Law for checking local mean time data. None of them are responsible for remaining errors. -Look in the ~ftp/pub directory of elsie.nci.nih.gov +Look in the ~ftp/pub directory of munnari.oz.au for updated versions of these files. -Please send comments or information to tz(a)elsie.nci.nih.gov. +Please send comments or information to tz(a)iana.org. + +Postscript: The README above is largely unmodified (aside from details +of mailing list and ftp archive addresses) from that prepared many years +ago by Arthur David Olson, to whom the timezone community owes the +greatest debt of all. Arthur is not currently maintaining this data or +code (though he remains involved). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tz-art.htm new/tz-art.htm --- old/tz-art.htm 2011-06-15 12:43:15.000000000 +0200 +++ new/tz-art.htm 2012-02-27 00:38:50.000000000 +0100 @@ -9,7 +9,7 @@ <body> <h1>Time and the Arts</h1> <address> -(a)(#)tz-art.htm 8.20 +(a)(#)tz-art.htm 8.21 </address> <p> This file is in the public domain, so clarified as of @@ -17,7 +17,7 @@ </p> <p> Please send corrections to this web page to the -<a href="mailto:tz@elsie.nci.nih.gov">time zone mailing list</a>.</p> +<a href="mailto:tz@iana.org">time zone mailing list</a>.</p> <p> See also <a href="tz-link.htm">Sources for Time Zone and Daylight Saving Time Data</a>.</p> <hr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tz-link.htm new/tz-link.htm --- old/tz-link.htm 2011-08-17 19:31:59.000000000 +0200 +++ new/tz-link.htm 2012-02-27 14:25:59.000000000 +0100 @@ -18,7 +18,7 @@ <body> <h1>Sources for Time Zone and Daylight Saving Time Data</h1> <address> -(a)(#)tz-link.htm 8.32 +(a)(#)tz-link.htm 8.33 </address> <p> This file is in the public domain, so clarified as of @@ -26,7 +26,7 @@ </p> <p> Please send corrections to this web page to the -<a href="mailto:tz@elsie.nci.nih.gov">time zone mailing list</a>.</p> +<a href="mailto:tz@iana.org">time zone mailing list</a>.</p> <h2>The <code>tz</code> database</h2> <p> The <a href="http://en.wikipedia.org/wiki/Public_domain">public-domain</a> @@ -83,7 +83,7 @@ the location's full name, e.g., <code>TZ="America/New_York"</code>.</p> <p> In the <code>tz</code> database's -<a href="ftp://elsie.nci.nih.gov/pub"><abbr +<a href="ftp://munnari.oz.au/pub"><abbr title="File Transfer Protocol">FTP</abbr> distribution</a> the code is in the file <code>tzcode<var>C</var>.tar.gz</code>, where <code><var>C</var></code> is the code's version; @@ -98,25 +98,30 @@ <code>README</code> file for what to do next.</p> <pre style="margin-left: 2em"><code>mkdir tz cd tz -<a href="http://www.gnu.org/software/wget/">wget</a> 'ftp://elsie.nci.nih.gov/pub/tz*.tar.gz' +<a href="http://www.gnu.org/software/wget/">wget</a> 'ftp://munnari.oz.au/pub/tz*.tar.gz' <a href="http://www.gnu.org/software/gzip/">gzip</a> -dc tzcode*.tar.gz | <a href="http://www.gnu.org/software/tar/">tar</a> -xf - gzip -dc tzdata*.tar.gz | tar -xf - </code></pre> <p> +The code and data files can also be obtained from the +<a href="http://www.iana.org">IANA</a> +<a href="http://www.iana.org/time-zones">timezone web page</a>. +<p> The code lets you compile the <code>tz</code> source files into machine-readable binary files, one for each location. It also lets you read a <code>tz</code> binary file and interpret time stamps for that location.</p> <p> The data are by no means authoritative. If you find errors, please -send changes to the <a href="mailto:tz@elsie.nci.nih.gov">time zone +send changes to the <a href="mailto:tz@iana.org">time zone mailing list</a>. You can also <a href="http://news.gmane.org/gmane.comp.time.tz">browse recent messages</a> sent to the mailing list, <a -href="mailto:tz-request@elsie.nci.nih.gov">subscribe</a> to it, -retrieve the <a -href="ftp://elsie.nci.nih.gov/pub/tzarchive.gz">full archive of old -messages</a> (in gzip compressed format), or retrieve <a +href="https://mm.icann.org/mailman/listinfo/tz">subscribe</a> to it. +browse the <a +href="http://mm.icann.org/pipermail/tz/">archive of old +messages</a> (message by message or in gzip compressed format), +or retrieve <a href="ftp://munnari.oz.au/pub/oldtz">archived older versions of code and data</a>.</p> <p> @@ -273,6 +278,11 @@ It is freely available under the <abbr>LGPL</abbr>.</li> <li>Tcl, mentioned above, also contains a <code>tz</code> binary file reader.</li> +<li><a href="http://search.cpan.org/perldoc?DateTime::TimeZone::Tzfile"> +DateTime::TimeZone::Tzfile</a> +is a <code>tz</code> binary file reader written in Perl. +It is freely available under the same terms as Perl +(dual <abbr>GPL</abbr> and Artistic license).</li> </ul> <h2>Other <code>tz</code>-based time zone software</h2> <ul> ++++++ tzdata2011n.tar.gz -> tzdata2012b.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/antarctica new/antarctica --- old/antarctica 2011-09-20 19:55:03.000000000 +0200 +++ new/antarctica 2012-03-01 12:16:24.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)antarctica 8.9 +# @(#)antarctica 8.10 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -42,8 +42,19 @@ Rule ChileAQ 1998 only - Mar Sun>=9 3:00u 0 - Rule ChileAQ 1998 only - Sep 27 4:00u 1:00 S Rule ChileAQ 1999 only - Apr 4 3:00u 0 - -Rule ChileAQ 1999 max - Oct Sun>=9 4:00u 1:00 S -Rule ChileAQ 2000 max - Mar Sun>=9 3:00u 0 - +Rule ChileAQ 1999 2010 - Oct Sun>=9 4:00u 1:00 S +Rule ChileAQ 2000 2007 - Mar Sun>=9 3:00u 0 - +# N.B.: the end of March 29 in Chile is March 30 in Universal time, +# which is used below in specifying the transition. +Rule ChileAQ 2008 only - Mar 30 3:00u 0 - +Rule ChileAQ 2009 only - Mar Sun>=9 3:00u 0 - +Rule ChileAQ 2010 only - Apr Sun>=1 3:00u 0 - +Rule ChileAQ 2011 only - May Sun>=2 3:00u 0 - +Rule ChileAQ 2011 only - Aug Sun>=16 4:00u 1:00 S +Rule ChileAQ 2012 only - Apr Sun>=23 3:00u 0 - +Rule ChileAQ 2012 only - Sep Sun>=2 4:00u 1:00 S +Rule ChileAQ 2013 max - Mar Sun>=9 3:00u 0 - +Rule ChileAQ 2013 max - Oct Sun>=9 4:00u 1:00 S # These rules are stolen from the `australasia' file. Rule AusAQ 1917 only - Jan 1 0:01 1:00 - @@ -142,12 +153,16 @@ # Western (Aus) Standard Time 11:00 - CAST 2010 Mar 5 2:00 # Casey Time + 8:00 - WST 2011 Oct 28 2:00 + 11:00 - CAST 2012 Feb 21 17:00u 8:00 - WST Zone Antarctica/Davis 0 - zzz 1957 Jan 13 7:00 - DAVT 1964 Nov # Davis Time 0 - zzz 1969 Feb 7:00 - DAVT 2009 Oct 18 2:00 5:00 - DAVT 2010 Mar 10 20:00u + 7:00 - DAVT 2011 Oct 28 2:00 + 5:00 - DAVT 2012 Feb 21 20:00u 7:00 - DAVT Zone Antarctica/Mawson 0 - zzz 1954 Feb 13 6:00 - MAWT 2009 Oct 18 2:00 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asia new/asia --- old/asia 2011-10-15 05:17:13.000000000 +0200 +++ new/asia 2012-02-27 00:05:26.000000000 +0100 @@ -1,4 +1,4 @@ -# @(#)asia 8.69 +# @(#)asia 8.70 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -77,10 +77,6 @@ Rule RussiaAsia 1993 1995 - Sep lastSun 2:00s 0 - Rule RussiaAsia 1996 max - Oct lastSun 2:00s 0 - -# From Arthur David Olson (2011-06-15): -# While Russia abandoned DST in 2011, Armenia may choose to -# follow Russia's "old" rules. - # Afghanistan # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Kabul 4:36:48 - LMT 1890 @@ -97,6 +93,21 @@ # in 1996, though it did use DST in 1995. IATA SSIM (1991/1998) reports that # Armenia switched from 3:00 to 4:00 in 1998 and observed DST after 1991, # but started switching at 3:00s in 1998. + +# From Arthur David Olson (2011-06-15): +# While Russia abandoned DST in 2011, Armenia may choose to +# follow Russia's "old" rules. + +# From Alexander Krivenyshev (2012-02-10): +# According to News Armenia, on Feb 9, 2012, +# http://newsarmenia.ru/society/20120209/42609695.html +# +# The Armenia National Assembly adopted final reading of Amendments to the +# Law "On procedure of calculation time on the territory of the Republic of +# Armenia" according to which Armenia [is] abolishing Daylight Saving Time. +# or +# (brief) +# http://www.worldtimezone.com/dst_news/dst_news_armenia03.html # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Yerevan 2:58:00 - LMT 1924 May 2 3:00 - YERT 1957 Mar # Yerevan Time @@ -104,7 +115,8 @@ 3:00 1:00 YERST 1991 Sep 23 # independence 3:00 RussiaAsia AM%sT 1995 Sep 24 2:00s 4:00 - AMT 1997 - 4:00 RussiaAsia AM%sT + 4:00 RussiaAsia AM%sT 2012 Mar 25 2:00s + 4:00 - AMT # Azerbaijan # From Rustam Aliyev of the Azerbaijan Internet Forum (2005-10-23): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/australasia new/australasia --- old/australasia 2011-10-24 18:58:31.000000000 +0200 +++ new/australasia 2012-02-27 00:07:14.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)australasia 8.29 +# @(#)australasia 8.30 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -616,6 +616,11 @@ # Dateline Change skip Friday 30th Dec 2011 # Thursday 29th December 2011 23:59:59 Hours # Saturday 31st December 2011 00:00:00 Hours +# +# Clarification by Tim Parenti (2012-01-03): +# Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012 +# seasons, there is not yet any indication that this trend will continue on +# a regular basis. For now, we have explicitly listed the transitions below. Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT 1950 # Samoa Time @@ -633,9 +638,28 @@ 11:00 - SBT # Solomon Is Time # Tokelau Is +# +# From Gwillim Law (2011-12-29) +# A correspondent informed me that Tokelau, like Samoa, will be skipping +# December 31 this year, thereby changing its time zone from UTC-10 to +# UTC+14. When I tried to verify this statement, I found a confirming +# article in Time magazine online +# <a href="http://www.time.com/time/world/article/0,8599,2103243,00.html"> +# (http://www.time.com/time/world/article/0,8599,2103243,00.html). +# </a> +# +# From Jonathan Leffler (2011-12-29) +# Information from the BBC to the same effect: +# <a href="http://www.bbc.co.uk/news/world-asia-16351377"> +# http://www.bbc.co.uk/news/world-asia-16351377 +# </a> +# +# Patch supplied by Tim Parenti (2011-12-29) + # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fakaofo -11:24:56 - LMT 1901 - -10:00 - TKT # Tokelau Time + -10:00 - TKT 2011 Dec 30 # Tokelau Time + 14:00 - TKT # Tonga # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/europe new/europe --- old/europe 2011-10-28 11:59:09.000000000 +0200 +++ new/europe 2012-03-01 11:03:09.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)europe 8.40 +# @(#)europe 8.41 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -211,9 +211,15 @@ # the history of summer time legislation in the United Kingdom. # Since 1998 Joseph S. Myers has been updating # and extending this list, which can be found in -# <a href="http://student.cusu.cam.ac.uk/~jsm28/british-time/"> +# http://student.cusu.cam.ac.uk/~jsm28/british-time/ +# <a href="http://www.polyomino.org.uk/british-time/"> # History of legal time in Britain # </a> +# Rob Crowther (2012-01-04) reports that that URL no longer +# exists, and the article can now be found at: +# <a href="http://www.polyomino.org.uk/british-time/"> +# http://www.polyomino.org.uk/british-time/ +# </a> # From Joseph S. Myers (1998-01-06): # @@ -1151,10 +1157,10 @@ # write that they were used in Monaco and in many French locations. # Le Corre writes that the upper limit of the free zone was Arneguy, Orthez, # Mont-de-Marsan, Bazas, Langon, Lamotte-Montravel, Marouil, La -# Rochefoucault, Champagne-Mouton, La Roche-Posay, La Haye-Decartes, +# Rochefoucault, Champagne-Mouton, La Roche-Posay, La Haye-Descartes, # Loches, Montrichard, Vierzon, Bourges, Moulins, Digoin, # Paray-le-Monial, Montceau-les-Mines, Chalons-sur-Saone, Arbois, -# Dole, Morez, St-Claude, and Collognes (Haute-Savioe). +# Dole, Morez, St-Claude, and Collonges (Haute-Savoie). Rule France 1941 only - May 5 0:00 2:00 M # Midsummer # Shanks & Pottenger say this transition occurred at Oct 6 1:00, # but go with Denis Excoffier (1997-12-12), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leapseconds new/leapseconds --- old/leapseconds 2011-09-20 19:55:04.000000000 +0200 +++ new/leapseconds 2012-01-06 12:37:49.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)leapseconds 8.11 +# @(#)leapseconds 8.13 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -48,40 +48,54 @@ Leap 1998 Dec 31 23:59:60 + S Leap 2005 Dec 31 23:59:60 + S Leap 2008 Dec 31 23:59:60 + S +Leap 2012 Jun 30 23:59:60 + S # INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS) # # SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE # +# # SERVICE DE LA ROTATION TERRESTRE # OBSERVATOIRE DE PARIS # 61, Av. de l'Observatoire 75014 PARIS (France) -# Tel. : 33 (0) 1 40 51 22 29 +# Tel. : 33 (0) 1 40 51 22 26 # FAX : 33 (0) 1 40 51 22 91 -# Internet : services.iers(a)obspm.fr +# e-mail : (E-Mail Removed) +# http://hpiers.obspm.fr/eop-pc +# +# Paris, 5 January 2012 # -# Paris, 2 February 2011 # -# Bulletin C 41 +# Bulletin C 43 # # To authorities responsible # for the measurement and # distribution of time # -# INFORMATION ON UTC - TAI # -# NO positive leap second will be introduced at the end of June 2011. -# The difference between Coordinated Universal Time UTC and the -# International Atomic Time TAI is : +# UTC TIME STEP +# on the 1st of July 2012 +# # -# from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s +# A positive leap second will be introduced at the end of June 2012. +# The sequence of dates of the UTC second markers will be: +# +# 2012 June 30, 23h 59m 59s +# 2012 June 30, 23h 59m 60s +# 2012 July 1, 0h 0m 0s +# +# The difference between UTC and the International Atomic Time TAI is: +# +# from 2009 January 1, 0h UTC, to 2012 July 1 0h UTC : UTC-TAI = - 34s +# from 2012 July 1, 0h UTC, until further notice : UTC-TAI = - 35s # # Leap seconds can be introduced in UTC at the end of the months of December -# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every -# six months, either to announce a time step in UTC, or to confirm that there +# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every +# six months, either to announce a time step in UTC or to confirm that there # will be no time step at the next possible date. # +# # Daniel GAMBIS -# Head -# Earth Orientation Center of the IERS +# Head +# Earth Orientation Center of IERS # Observatoire de Paris, France diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/northamerica new/northamerica --- old/northamerica 2011-10-30 08:57:54.000000000 +0100 +++ new/northamerica 2012-03-02 06:29:15.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)northamerica 8.51 +# @(#)northamerica 8.53 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -1120,9 +1120,26 @@ # For now, assume all of DST-observing Canada will fall into line with the # new US DST rules, +# From Chris Walton (2011-12-01) +# In the first of Tammy Hardwick's articles +# <a href="http://www.ilovecreston.com/?p=articles&t=spec&ar=260"> +# http://www.ilovecreston.com/?p=articles&t=spec&ar=260 +# </a> +# she quotes the Friday November 1/1918 edition of the Creston Review. +# The quote includes these two statements: +# 'Sunday the CPR went back to the old system of time...' +# '... The daylight saving scheme was dropped all over Canada at the same time,' +# These statements refer to a transition from daylight time to standard time +# that occurred nationally on Sunday October 27/1918. This transition was +# also documented in the Saturday October 26/1918 edition of the Toronto Star. + +# In light of that evidence, we alter the date from the earlier believed +# Oct 31, to Oct 27, 1918 (and Sunday is a more likely transition day +# than Thursday) in all Canadian rulesets. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Canada 1918 only - Apr 14 2:00 1:00 D -Rule Canada 1918 only - Oct 31 2:00 0 S +Rule Canada 1918 only - Oct 27 2:00 0 S Rule Canada 1942 only - Feb 9 2:00 1:00 W # War Rule Canada 1945 only - Aug 14 23:00u 1:00 P # Peace Rule Canada 1945 only - Sep 30 2:00 0 S @@ -1645,7 +1662,7 @@ Rule Winn 1916 only - Apr 23 0:00 1:00 D Rule Winn 1916 only - Sep 17 0:00 0 S Rule Winn 1918 only - Apr 14 2:00 1:00 D -Rule Winn 1918 only - Oct 31 2:00 0 S +Rule Winn 1918 only - Oct 27 2:00 0 S Rule Winn 1937 only - May 16 2:00 1:00 D Rule Winn 1937 only - Sep 26 2:00 0 S Rule Winn 1942 only - Feb 9 2:00 1:00 W # War @@ -1728,7 +1745,7 @@ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Regina 1918 only - Apr 14 2:00 1:00 D -Rule Regina 1918 only - Oct 31 2:00 0 S +Rule Regina 1918 only - Oct 27 2:00 0 S Rule Regina 1930 1934 - May Sun>=1 0:00 1:00 D Rule Regina 1930 1934 - Oct Sun>=1 0:00 0 S Rule Regina 1937 1941 - Apr Sun>=8 0:00 1:00 D @@ -1765,7 +1782,7 @@ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Edm 1918 1919 - Apr Sun>=8 2:00 1:00 D -Rule Edm 1918 only - Oct 31 2:00 0 S +Rule Edm 1918 only - Oct 27 2:00 0 S Rule Edm 1919 only - May 27 2:00 0 S Rule Edm 1920 1923 - Apr lastSun 2:00 1:00 D Rule Edm 1920 only - Oct lastSun 2:00 0 S @@ -1795,9 +1812,68 @@ # Dawson Creek uses MST. Much of east BC is like Edmonton. # Matthews and Vincent (1998) write that Creston is like Dawson Creek. +# It seems though that (re: Creston) is not entirely correct: + +# From Chris Walton (2011-12-01): +# There are two areas within the Canadian province of British Columbia +# that do not currently observe daylight saving: +# a) The Creston Valley (includes the town of Creston and surrounding area) +# b) The eastern half of the Peace River Regional District +# (includes the cities of Dawson Creek and Fort St. John) + +# Earlier this year I stumbled across a detailed article about the time +# keeping history of Creston; it was written by Tammy Hardwick who is the +# manager of the Creston & District Museum. The article was written in May 2009. +# <a href="http://www.ilovecreston.com/?p=articles&t=spec&ar=260"> +# http://www.ilovecreston.com/?p=articles&t=spec&ar=260 +# </a> +# According to the article, Creston has not changed its clocks since June 1918. +# i.e. Creston has been stuck on UTC-7 for 93 years. +# Dawson Creek, on the other hand, changed its clocks as recently as April 1972. + +# Unfortunately the exact date for the time change in June 1918 remains +# unknown and will be difficult to ascertain. I e-mailed Tammy a few months +# ago to ask if Sunday June 2 was a reasonable guess. She said it was just +# as plausible as any other date (in June). She also said that after writing the +# article she had discovered another time change in 1916; this is the subject +# of another article which she wrote in October 2010. +# <a href="http://www.creston.museum.bc.ca/index.php?module=comments&uop=view_comment&…"> +# http://www.creston.museum.bc.ca/index.php?module=comments&uop=view_comment&… +# </a> + +# Here is a summary of the three clock change events in Creston's history: +# 1. 1884 or 1885: adoption of Mountain Standard Time (GMT-7) +# Exact date unknown +# 2. Oct 1916: switch to Pacific Standard Time (GMT-8) +# Exact date in October unknown; Sunday October 1 is a reasonable guess. +# 3. June 1918: switch to Pacific Daylight Time (GMT-7) +# Exact date in June unknown; Sunday June 2 is a reasonable guess. +# note#1: +# On Oct 27/1918 when daylight saving ended in the rest of Canada, +# Creston did not change its clocks. +# note#2: +# During WWII when the Federal Government legislated a mandatory clock change, +# Creston did not oblige. +# note#3: +# There is no guarantee that Creston will remain on Mountain Standard Time +# (UTC-7) forever. +# The subject was debated at least once this year by the town Council. +# <a href="http://www.bclocalnews.com/kootenay_rockies/crestonvalleyadvance/news/11676…"> +# http://www.bclocalnews.com/kootenay_rockies/crestonvalleyadvance/news/11676… +# </a> + +# During a period WWII, summer time (Daylight saying) was mandatory in Canada. +# In Creston, that was handled by shifting the area to PST (-8:00) then applying +# summer time to cause the offset to be -7:00, the same as it had been before +# the change. It can be argued that the timezone abbreviation during this +# period should be PDT rather than MST, but that doesn't seem important enough +# (to anyone) to further complicate the rules. + +# The transition dates (and times) are guesses. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Vanc 1918 only - Apr 14 2:00 1:00 D -Rule Vanc 1918 only - Oct 31 2:00 0 S +Rule Vanc 1918 only - Oct 27 2:00 0 S Rule Vanc 1942 only - Feb 9 2:00 1:00 W # War Rule Vanc 1945 only - Aug 14 23:00u 1:00 P # Peace Rule Vanc 1945 only - Sep 30 2:00 0 S @@ -1813,7 +1889,10 @@ -8:00 Canada P%sT 1947 -8:00 Vanc P%sT 1972 Aug 30 2:00 -7:00 - MST - +Zone America/Creston -7:46:04 - LMT 1884 + -7:00 - MST 1916 Oct 1 + -8:00 - PST 1918 Jun 2 + -7:00 - MST # Northwest Territories, Nunavut, Yukon @@ -2704,6 +2783,20 @@ # <a href="http://www.timeanddate.com/news/time/cuba-time-changes-2011.html"> # http://www.timeanddate.com/news/time/cuba-time-changes-2011.html # </a> +# +# From Steffen Thorsen (2012-03-01) +# According to Radio Reloj, Cuba will start DST on Midnight between March +# 31 and April 1. +# +# Radio Reloj has the following info (Spanish): +# <a href="http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529…"> +# http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529… +# </a> +# +# Our info on it: +# <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html"> +# http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html +# </a> # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Cuba 1928 only - Jun 10 0:00 1:00 D @@ -2741,8 +2834,9 @@ Rule Cuba 2009 2010 - Mar Sun>=8 0:00s 1:00 D Rule Cuba 2011 only - Mar Sun>=15 0:00s 1:00 D Rule Cuba 2011 only - Nov 13 0:00s 0 S -Rule Cuba 2012 max - Mar Sun>=8 0:00s 1:00 D +Rule Cuba 2012 only - Apr 1 0:00s 1:00 D Rule Cuba 2012 max - Oct lastSun 0:00s 0 S +Rule Cuba 2013 max - Mar Sun>=8 0:00s 1:00 D # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Havana -5:29:28 - LMT 1890 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/southamerica new/southamerica --- old/southamerica 2011-10-15 05:46:37.000000000 +0200 +++ new/southamerica 2012-03-01 11:50:15.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)southamerica 8.52 +# @(#)southamerica 8.53 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -1218,6 +1218,28 @@ # August, not in October as they have since 1968. This is a pilot plan # which will be reevaluated in 2012. +# From Mauricio Parada (2012-02-22), translated by Glenn Eychaner (2012-02-23): +# As stated in the website of the Chilean Energy Ministry +# http://www.minenergia.cl/ministerio/noticias/generales/gobierno-anuncia-fec… +# The Chilean Government has decided to postpone the entrance into winter time +# (to leave DST) from March 11 2012 to April 28th 2012. The decision has not +# been yet formalized but it will within the next days. +# Quote from the website communication: +# +# 6. For the year 2012, the dates of entry into winter time will be as follows: +# a. Saturday April 28, 2012, clocks should go back 60 minutes; that is, at +# 23:59:59, instead of passing to 0:00, the time should be adjusted to be 23:00 +# of the same day. +# b. Saturday, September 1, 2012, clocks should go forward 60 minutes; that is, +# at 23:59:59, instead of passing to 0:00, the time should be adjusted to be +# 01:00 on September 2. +# +# Note that...this is yet another "temporary" change that will be reevaluated +# AGAIN in 2013. + +# NOTE: ChileAQ rules for Antarctic bases are stored separately in the +# 'antarctica' file. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Chile 1927 1932 - Sep 1 0:00 1:00 S Rule Chile 1928 1932 - Apr 1 0:00 0 - @@ -1248,8 +1270,6 @@ Rule Chile 1998 only - Sep 27 4:00u 1:00 S Rule Chile 1999 only - Apr 4 3:00u 0 - Rule Chile 1999 2010 - Oct Sun>=9 4:00u 1:00 S -Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 S -Rule Chile 2012 max - Oct Sun>=9 4:00u 1:00 S Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 - # N.B.: the end of March 29 in Chile is March 30 in Universal time, # which is used below in specifying the transition. @@ -1257,7 +1277,11 @@ Rule Chile 2009 only - Mar Sun>=9 3:00u 0 - Rule Chile 2010 only - Apr Sun>=1 3:00u 0 - Rule Chile 2011 only - May Sun>=2 3:00u 0 - -Rule Chile 2012 max - Mar Sun>=9 3:00u 0 - +Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 S +Rule Chile 2012 only - Apr Sun>=23 3:00u 0 - +Rule Chile 2012 only - Sep Sun>=2 4:00u 1:00 S +Rule Chile 2013 max - Mar Sun>=9 3:00u 0 - +Rule Chile 2013 max - Oct Sun>=9 4:00u 1:00 S # IATA SSIM anomalies: (1992-02) says 1992-03-14; # (1996-09) says 1998-03-08. Ignore these. # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1403,6 +1427,21 @@ # will not revert to local mean time, but clocks will remain on Summer # time (UTC/GMT - 3 hours) throughout the whole of 2011. Any long term # change to local time following the trial period will be notified. +# +# From Andrew Newman (2012-02-24) +# A letter from Justin McPhee, Chief Executive, +# Cable & Wireless Falkland Islands (dated 2012-02-22) +# states... +# The current Atlantic/Stanley entry under South America expects the +# clocks to go back to standard Falklands Time (FKT) on the 15th April. +# The database entry states that in 2011 Stanley was staying on fixed +# summer time on a trial basis only. FIG need to contact IANA and/or +# the maintainers of the database to inform them we're adopting +# the same policy this year and suggest recommendations for future years. +# +# For now we will assume permanent summer time for the Falklands +# until advised differently (to apply for 2012 and beyond, after the 2011 +# experiment was apparently successful.) # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Falk 1937 1938 - Sep lastSun 0:00 1:00 S Rule Falk 1938 1942 - Mar Sun>=19 0:00 0 - @@ -1415,14 +1454,14 @@ Rule Falk 1985 2000 - Sep Sun>=9 0:00 1:00 S Rule Falk 1986 2000 - Apr Sun>=16 0:00 0 - Rule Falk 2001 2010 - Apr Sun>=15 2:00 0 - -Rule Falk 2012 max - Apr Sun>=15 2:00 0 - -Rule Falk 2001 max - Sep Sun>=1 2:00 1:00 S +Rule Falk 2001 2010 - Sep Sun>=1 2:00 1:00 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Atlantic/Stanley -3:51:24 - LMT 1890 -3:51:24 - SMT 1912 Mar 12 # Stanley Mean Time -4:00 Falk FK%sT 1983 May # Falkland Is Time -3:00 Falk FK%sT 1985 Sep 15 - -4:00 Falk FK%sT + -4:00 Falk FK%sT 2010 Sep 5 02:00 + -3:00 - FKST # French Guiana # Zone NAME GMTOFF RULES FORMAT [UNTIL] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zone.tab new/zone.tab --- old/zone.tab 2011-10-28 11:54:04.000000000 +0200 +++ new/zone.tab 2012-03-02 06:21:33.000000000 +0100 @@ -1,5 +1,5 @@ # <pre> -# @(#)zone.tab 8.52 +# @(#)zone.tab 8.55 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. # @@ -131,6 +131,7 @@ CA +690650-1050310 America/Cambridge_Bay Mountain Time - west Nunavut CA +6227-11421 America/Yellowknife Mountain Time - central Northwest Territories CA +682059-1334300 America/Inuvik Mountain Time - west Northwest Territories +CA +4906-11631 America/Creston Mountain Standard Time - Creston, British Columbia CA +5946-12014 America/Dawson_Creek Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia CA +4916-12307 America/Vancouver Pacific Time - west British Columbia CA +6043-13503 America/Whitehorse Pacific Time - south Yukon @@ -333,7 +334,7 @@ RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad RU +5545+03735 Europe/Moscow Moscow+00 - west Russia RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea -RU +5312+05009 Europe/Samara Moscow - Samara, Udmurtia +RU +5312+05009 Europe/Samara Moscow+00 - Samara, Udmurtia RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit timezone for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package timezone for openSUSE:12.1:Update:Test checked in at 2012-03-05 14:18:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/timezone (Old) and /work/SRC/openSUSE:12.1:Update:Test/.timezone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "timezone", Maintainer is "matz(a)suse.com" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.timezone.new/timezone-java.changes 2012-03-05 14:18:38.000000000 +0100 @@ -0,0 +1,4808 @@ +------------------------------------------------------------------- +Sat Nov 5 13:58:36 CET 2011 - dmueller(a)suse.de + +- update to 2011n: + * Cuba (America/Havana) has extended summer time to end on Nov 13 + * Europe/Tiraspol decided not to split from the rest of Moldova, hence + that zone has been removed + * Fiji end of summer time was moved fromrward from Feb 26 to Jan 22 + +------------------------------------------------------------------- +Tue Oct 25 17:49:32 CEST 2011 - dmueller(a)suse.de + +- fix build failure of timezone-java + +------------------------------------------------------------------- +Tue Oct 25 14:48:15 CEST 2011 - dmueller(a)suse.de + +- apply patches also for timezone-java +- add patch to fix Tiraspol split + +------------------------------------------------------------------- +Mon Oct 24 19:19:45 CEST 2011 - dmueller(a)suse.de + +- update to 2011m (bnc#726162): + * All Ukrainian timezones are going back to winter time + on Oct 30th, 2011 + * Adding Tiraspol to the zone.tab + * America/Bahia switched to DST on Oct 16th, 2011 + +------------------------------------------------------------------- +Fri Oct 14 10:41:30 CEST 2011 - dmueller(a)suse.de + +- update to 2011l: + * West Bank ended DST 2011-09-30 already + * Fiji enters DST on October 23th 2011 + +------------------------------------------------------------------- +Sun Oct 2 16:52:08 CEST 2011 - dmueller(a)suse.de + +- update to 2011k: + * Palestine suspends DST during Ramadan in 2011; + Gaza and Hebron split in 2011, leading to a new + Asia/Hebron zone (thanks to Steffen Thorsen and + Alexander Krivenshev). + * Belarus adopts permanent DST in 2011 + (thanks to Yauhen Kharuzhy, Alexander Bokovoy, + Alexander Krivenyshev, and Kirill A. Shutemov). + * Ukraine adopts permanent DST in 2011 + * "Russia" rules changed to reflect end of use in 2010. + * "FET" used as abbreviation for Belarus, Ukraine, + and western Russia (thanks to Paul Eggert). + +------------------------------------------------------------------- +Tue Sep 13 12:02:42 CEST 2011 - dmueller(a)suse.de + +- update to 2011j: + * Fix past timezones for Kenya, Uganda, and Tanzani + * Samoa uses DST in 2011-2012 starting on September 24th 3am + +------------------------------------------------------------------- +Sun Sep 4 20:58:22 UTC 2011 - dmueller(a)suse.de + +- update to 2011i: + * Add Africa/Juba (South Sudan) zone + * Samoa skips over 2011-12-30 + * Use KALT as abbreviation for Europe/Kalinigrad from spring + 2011 forward + * Newfoundland changes time of day for DST start and end + to 2:00 a.m. starting fall 2011 and forward + * Change America/Resolute use of EST to 2006-2007 only + * iso3166.tab Add SS (South Sudan) entry. + * zone.tab Change America/Resolute entry to Central Standard Time. + +------------------------------------------------------------------- +Mon Jun 27 14:18:10 CEST 2011 - dmueller(a)suse.de + +- update to 2011h (bnc#684181): + * Russia is abolishing daylight saving time. + * iso3166 code for America/Curacao changed from AN to CW + +------------------------------------------------------------------- +Tue May 3 13:38:42 CEST 2011 - dmueller(a)suse.de + +- update to 2011g (bnc#691414): + * Egypt on longer has daylight saving time + * Falkland islands on a trial basis do not observe DST anymore + +------------------------------------------------------------------- +Fri Apr 1 20:39:00 CEST 2011 - dmueller(a)suse.de + +- update to 2011e: + * Southamerica/Chile: Delay DST until May 7th + * Southafrica/Morocco: Updates + +------------------------------------------------------------------- +Mon Mar 14 21:40:14 CET 2011 - dmueller(a)suse.de + +- update to 2011d: + * Pacific/Apia: Move DST from April 3rd to April 2nd + * Europe/Istanbul: Move DST from March 27th to 28th + * America/Cuba: DST starts on March 20th + +------------------------------------------------------------------- +Sat Mar 12 11:09:35 CET 2011 - dmueller(a)suse.de + +- update to 2011c: + * northamerica Replace Juneau with Juneau, Sitka, and Metlakatla. + * southamerica Delay end of DST in 2011 until first Sunday in April. + +------------------------------------------------------------------- +Wed Feb 16 00:48:03 CET 2011 - dmueller(a)suse.de + +- update to 2011b: + * updates for australasia and northamerica + +------------------------------------------------------------------- +Tue Nov 2 11:57:20 CET 2010 - dmueller(a)suse.de + +- update to 2010o: + * fix Pacific/Apia and Austalasia/Fiji + +------------------------------------------------------------------- +Tue Oct 5 15:42:21 CEST 2010 - dmueller(a)suse.de + +- update to 2010m: + * fix historic data of Antarctica/Vostok + +------------------------------------------------------------------- +Tue Sep 21 16:18:24 CEST 2010 - dmueller(a)suse.de + +- change execlp into execl + +------------------------------------------------------------------- +Wed Aug 25 11:59:01 CEST 2010 - ro(a)suse.de + +- add missing sentinel to tzcode-link.diff + +------------------------------------------------------------------- +Tue Aug 24 12:11:51 CEST 2010 - pbaudis(a)suse.cz + +- Make zic -l do a copy when hardlinking fails (e.g. because /usr + being on a separate partition) [bnc#607532] + +------------------------------------------------------------------- +Thu Aug 19 18:12:03 CEST 2010 - ro(a)suse.de + +- un-fuzz patches to fix build + +------------------------------------------------------------------- +Thu Aug 19 01:18:14 CEST 2010 - pbaudis(a)suse.cz + +- update tzdata to 2010l + + * DST changes: Africa/Cairo, Africa/Casablanca, Asia/Gaza, + America/Argentina/San_Luis + * New zones: America/Bahia_Banderas + * Historical changes: Asia/Taipei, Europe/Helsinki + * Spelling changes: Pacific/Chuuk, Pacific/Pohnpei + +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh(a)medozas.de + +- use %_smp_mflags + +------------------------------------------------------------------- +Tue Apr 6 15:55:48 CEST 2010 - pbaudis(a)suse.cz + +- update tzdata to 2010h: + + * DST changes: Asia/Dhaka (again...), Asia/Karachi, Asia/Gaza, + Asia/Damascus, Pacific/Apia, Africa/Tunis + * GMT offset changes: Europe/Samara, Asia/Kamchatka, Asia/Anadyr + * Various Antarctica timezone changes + +------------------------------------------------------------------- +Thu Mar 18 17:07:37 CET 2010 - pbaudis(a)suse.cz + +- cleanup; changes since 2009u are: + * DST changes: Asia/Dhaka (yet again), Pacific/Fiji, Pacific/Apia, + America/Santiago, Pacific/Easter, America/Asuncion + * New zones: America/Matamoros, America/Ojinaga, America/Santa_Isabel + +------------------------------------------------------------------- +Sun Mar 14 13:04:16 UTC 2010 - crrodriguez(a)opensuse.org + +- Update to 2010e, including Chile's emergency DST changes +- Update code to 2010c - mostly just cleanups + +------------------------------------------------------------------- +Tue Jan 5 14:27:27 CET 2010 - pbaudis(a)suse.cz + +- update tzdata to 2009u: + * DST changes: Asia/Damascus, Asia/Dhaka, Pacific/Fiji + * GMT offset changes: some bases in Antartica + * New zones: Asia/Novokuznetsk + * Historical changes: Asia/Hong_Kong +- typo fix in Asia/Dhaka Jun 2009 transition rule ++++ 4611 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.1:Update:Test/.timezone.new/timezone-java.changes New Changes file: timezone.changes: same change New: ---- _link iso3166-uk.diff pre_checkin.sh timezone-java.changes timezone-java.spec timezone-java.spec.in timezone.changes timezone.spec tzcode-ksh.diff tzcode-link.diff tzcode-zic.diff tzcode2011i.tar.gz tzdata-china.diff tzdata2011n.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ timezone-java.spec ++++++ # # spec file for package timezone-java # # Copyright (c) 2011 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/ # # norootforbuild Name: timezone-java BuildRequires: fastjar gcc-gij javazic License: Public Domain, Freeware Summary: Timezone Descriptions Group: System/Base # COMMON-BEGIN # COMMON-BEGIN Version: 2011n Release: 1 Source: ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz Source1: ftp://munnari.oz.au/pub/tzcode2011i.tar.gz Patch0: tzdata-china.diff Patch1: tzcode-zic.diff Patch2: tzcode-ksh.diff Patch3: iso3166-uk.diff Patch4: tzcode-link.diff # COMMON-END # COMMON-END Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils BuildArch: noarch Provides: tzdata-java = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description These are configuration files that describe available time zones - this package is intended for Java Virtual Machine based on OpenJDK. %prep %setup -c -a 1 # COMMON-PREP-BEGIN # COMMON-PREP-BEGIN %patch0 %patch1 %patch2 %patch3 %patch4 # COMMON-PREP-END # COMMON-PREP-END %build gij -jar %{_javadir}/javazic.jar -V %{version} \ -d javazi \ africa antarctica asia australasia europe northamerica pacificnew \ southamerica backward etcetera solar87 solar88 solar89 systemv \ %{_datadir}/javazic/tzdata_jdk/gmt \ %{_datadir}/javazic/tzdata_jdk/jdk11_backward %install install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir} cp -a javazi $RPM_BUILD_ROOT%{_datadir} %files %defattr(-,root,root) %{_datadir}/javazi %changelog ++++++ timezone.spec ++++++ # # spec file for package timezone # # Copyright (c) 2011 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/ # # norootforbuild Name: timezone License: PERMISSIVE-OSI-COMPLIANT(BSD-like ; public domain) Summary: Timezone Descriptions Group: System/Base Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN Version: 2011n Release: 1 Source: ftp://munnari.oz.au/pub/tzdata%{version}.tar.gz Source1: ftp://munnari.oz.au/pub/tzcode2011i.tar.gz Patch0: tzdata-china.diff Patch1: tzcode-zic.diff Patch2: tzcode-ksh.diff Patch3: iso3166-uk.diff Patch4: tzcode-link.diff # COMMON-END BuildRoot: %{_tmppath}/%{name}-%{version}-build %global AREA Etc %global ZONE UTC %description These are configuration files that describe available time zones. You can select an appropriate time zone for your system with YaST. %prep %setup -c -a 1 # COMMON-PREP-BEGIN %patch0 %patch1 %patch2 %patch3 %patch4 # COMMON-PREP-END %build unset ${!LC_*} LANG=POSIX LC_ALL=POSIX AREA=%{AREA} ZONE=%{ZONE} export AREA LANG LC_ALL ZONE make %{?_smp_mflags} TZDIR=%{_prefix}/share/zoneinfo CFLAGS="$RPM_OPT_FLAGS -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"'" AWK=awk make %{?_smp_mflags} TZDIR=zoneinfo AWK=awk zones # Generate posixrules ./zic -y ./yearistype -d zoneinfo -p %{AREA}/%{ZONE} %install mkdir -p %{buildroot}%{_prefix}/share/zoneinfo cp -a zoneinfo %{buildroot}%{_prefix}/share/zoneinfo/posix cp -al %{buildroot}%{_prefix}/share/zoneinfo/posix/. %{buildroot}%{_prefix}/share/zoneinfo cp -a zoneinfo-leaps %{buildroot}%{_prefix}/share/zoneinfo/right mkdir -p %{buildroot}/etc rm -f %{buildroot}/etc/localtime rm -f %{buildroot}%{_prefix}/share/zoneinfo/posixrules cp -fp %{buildroot}%{_prefix}/share/zoneinfo/%{AREA}/%{ZONE} %{buildroot}/etc/localtime ln -sf /etc/localtime %{buildroot}%{_prefix}/share/zoneinfo/posixrules install -m 644 iso3166.tab %{buildroot}%{_prefix}/share/zoneinfo/iso3166.tab install -m 644 zone.tab %{buildroot}%{_prefix}/share/zoneinfo/zone.tab install -D -m 755 tzselect %{buildroot}%{_bindir}/tzselect install -D -m 755 zdump %{buildroot}%{_sbindir}/zdump install -D -m 755 zic %{buildroot}%{_sbindir}/zic %clean rm -rf %{buildroot} %post if [ -f /etc/sysconfig/clock ]; then . /etc/sysconfig/clock if [ -n "$TIMEZONE" -a -f /etc/localtime -a -f /usr/share/zoneinfo/$TIMEZONE ]; then new=$(mktemp /etc/localtime.XXXXXXXX) || exit 1 cp -l /usr/share/zoneinfo/$TIMEZONE $new 2>/dev/null || cp -fp /usr/share/zoneinfo/$TIMEZONE $new mv -f $new /etc/localtime else [ ! -f /etc/localtime ] || echo "WARNING: Not updating /etc/localtime with new zone file" >&2 fi fi %files %defattr(-,root,root) %verify(not link md5 size mtime) %config(missingok,noreplace) /etc/localtime %verify(not link md5 size mtime) %config(missingok,noreplace) %{_prefix}/share/zoneinfo/posixrules %{_prefix}/share/zoneinfo %{_bindir}/tzselect %{_sbindir}/zdump %{_sbindir}/zic %changelog ++++++ _link ++++++ <link project="openSUSE:12.1" baserev="93bdcc049cb359c96997962620e6ba37"> <patches> <branch/> </patches> </link> ++++++ iso3166-uk.diff ++++++ --- iso3166.tab~ 2009-09-15 00:34:18.941351000 +0200 +++ iso3166.tab 2009-09-15 00:34:31.010318000 +0200 @@ -98,7 +98,7 @@ FO Faroe Islands FR France GA Gabon -GB Britain (UK) +GB United Kingdom GD Grenada GE Georgia GF French Guiana ++++++ pre_checkin.sh ++++++ #!/bin/bash # This script is called automatically during autobuild checkin. ln -f timezone.changes timezone-java.changes for spec in timezone-java.spec; do { sed -n -e '1,/COMMON-BEGIN/p' $spec.in sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' timezone.spec sed -n -e '/COMMON-END/,/COMMON-PREP-BEGIN/p' $spec.in sed -n -e '/COMMON-PREP-BEGIN/,/COMMON-PREP-END/p' timezone.spec sed -n -e '/COMMON-PREP-END/,$p' $spec.in; } > $spec.tmp && mv $spec.tmp $spec done ++++++ timezone-java.spec.in ++++++ # # spec file for package timezone-java (Version 2008h) # # Copyright (c) 2008 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/ # # norootforbuild Name: timezone-java BuildRequires: fastjar gcc-gij javazic License: Public Domain, Freeware Summary: Timezone Descriptions Group: System/Base # COMMON-BEGIN # COMMON-END Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils BuildArch: noarch Provides: tzdata-java = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description These are configuration files that describe available time zones - this package is intended for Java Virtual Machine based on OpenJDK. %prep %setup -c -a 1 # COMMON-PREP-BEGIN # COMMON-PREP-END %build gij -jar %{_javadir}/javazic.jar -V %{version} \ -d javazi \ africa antarctica asia australasia europe northamerica pacificnew \ southamerica backward etcetera solar87 solar88 solar89 systemv \ %{_datadir}/javazic/tzdata_jdk/gmt \ %{_datadir}/javazic/tzdata_jdk/jdk11_backward %install install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir} cp -a javazi $RPM_BUILD_ROOT%{_datadir} %files %defattr(-,root,root) %{_datadir}/javazi %changelog * Mon Sep 29 2008 mvyskocil(a)suse.cz - Moved the timezone-java to separate specfile (adrian's request for better bootstrapping of SUSE) ++++++ tzcode-ksh.diff ++++++ Index: Makefile =================================================================== --- Makefile.orig +++ Makefile @@ -357,6 +357,7 @@ date: $(DATEOBJS) tzselect: tzselect.ksh sed \ + -e 's|#! /bin/ksh|#! /bin/sh|g' \ -e 's|AWK=[^}]*|AWK=$(AWK)|g' \ -e 's|TZDIR=[^}]*|TZDIR=$(TZDIR)|' \ <$? >$@ ++++++ tzcode-link.diff ++++++ --- zic.c 2010-01-06 16:21:33.000000000 +0100 +++ zic.c 2010-06-01 01:34:12.000000000 +0200 @@ -614,6 +614,23 @@ return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } +static int +copy(fromname, toname) +const char * const fromname; +const char * const toname; +{ + if (!fork()) { + execl("/bin/cp", "cp", fromname, toname, (char*) NULL); + _exit(1); + } + int s; + if (wait(&s) < 0) + return -1; + if (!WIFEXITED(s)) + return -1; + return -WEXITSTATUS(s); +} + static void dolink(fromfield, tofield) const char * const fromfield; @@ -649,6 +666,8 @@ exit(EXIT_FAILURE); result = link(fromname, toname); + if (result != 0) + result = copy(fromname, toname); #if HAVE_SYMLINK if (result != 0 && access(fromname, F_OK) == 0 && ++++++ tzcode-zic.diff ++++++ Index: zic.c =================================================================== --- zic.c.orig +++ zic.c @@ -665,8 +665,10 @@ const char * const tofield; fromname); result = symlink(symlinkcontents, toname); +#if 0 if (result == 0) warning(_("hard link failed, symbolic link used")); +#endif ifree(symlinkcontents); } #endif /* HAVE_SYMLINK */ ++++++ tzdata-china.diff ++++++ Index: asia =================================================================== --- asia.orig +++ asia @@ -531,6 +531,9 @@ Zone Asia/Kashgar 5:03:56 - LMT 1928 # o # The Japanese surrender of Hong Kong was signed 1945-09-15. # For lack of anything better, use start of those days as the transition times. +# Nowadays, China Standard Time is known as "Beijing Time" +Zone Asia/Beijing 8:00 PRC C%sT + # Hong Kong (Xianggang) # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule HK 1941 only - Apr 1 3:30 1:00 S Index: backward =================================================================== --- backward.orig +++ backward @@ -88,14 +88,13 @@ Link America/Mexico_City Mexico/General Link Pacific/Auckland NZ Link Pacific/Chatham NZ-CHAT Link America/Denver Navajo -Link Asia/Shanghai PRC +Link Asia/Beijing PRC Link Pacific/Pago_Pago Pacific/Samoa Link Pacific/Chuuk Pacific/Yap Link Pacific/Chuuk Pacific/Truk Link Pacific/Pohnpei Pacific/Ponape Link Europe/Warsaw Poland Link Europe/Lisbon Portugal -Link Asia/Taipei ROC Link Asia/Seoul ROK Link Asia/Singapore Singapore Link Europe/Istanbul Turkey Index: zone.tab =================================================================== --- zone.tab.orig +++ zone.tab @@ -146,11 +146,12 @@ CK -2114-15946 Pacific/Rarotonga CL -3327-07040 America/Santiago most locations CL -2709-10926 Pacific/Easter Easter Island & Sala y Gomez CM +0403+00942 Africa/Douala -CN +3114+12128 Asia/Shanghai east China - Beijing, Guangdong, Shanghai, etc. -CN +4545+12641 Asia/Harbin Heilongjiang (except Mohe), Jilin -CN +2934+10635 Asia/Chongqing central China - Sichuan, Yunnan, Guangxi, Shaanxi, Guizhou, etc. -CN +4348+08735 Asia/Urumqi most of Tibet & Xinjiang -CN +3929+07559 Asia/Kashgar west Tibet & Xinjiang +CN +3955+11626 Asia/Beijing China Standard Time +CN +3114+12128 Asia/Shanghai China east +CN +4545+12641 Asia/Harbin China north +CN +2934+10635 Asia/Chongqing China mountains +CN +4348+08735 Asia/Urumqi China Xinjiang-Tibet +CN +3929+07559 Asia/Kashgar China west Xinjiang CO +0436-07405 America/Bogota CR +0956-08405 America/Costa_Rica CU +2308-08222 America/Havana -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sysconfig for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package sysconfig for openSUSE:12.1:Update:Test checked in at 2012-03-05 14:16:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/sysconfig (Old) and /work/SRC/openSUSE:12.1:Update:Test/.sysconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sysconfig", Maintainer is "mt(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/sysconfig/sysconfig.changes 2012-01-11 18:28:44.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.sysconfig.new/sysconfig.changes 2012-03-05 14:16:17.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Feb 29 10:33:28 UTC 2012 - mt(a)suse.com + +- Enabled to always enable the -o boot under systemd, improved + to use PID in log messages and extradebug outputs (bnc#737636). +- Filter out labeled ipv4 addresses in get_ipv4address used + to fetch the 1st address from the TUNNEL_DEVICE interface. + Allows to configure a label for each address that should + be skipped. Updated ifcfg-tunnel.5 man page. (bnc#741453) + Thanks to Jon Nelson for his report with a fix proposal! + +------------------------------------------------------------------ New: ---- 0009-Filter-out-labeled-ipv4-addresses-in-get_ipv4address.patch 0010-network-start-fails-under-systemd.test.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.yY3TMH/_old 2012-03-05 14:16:18.000000000 +0100 +++ /var/tmp/diff_new_pack.yY3TMH/_new 2012-03-05 14:16:18.000000000 +0100 @@ -38,6 +38,8 @@ Patch6: 0006-Fixed-ipv6-dad-link-ready-wait-time-calculation.patch Patch7: 0007-Use-link_ready_wait-instead-of-up-flag-check-loop.patch Patch8: 0008-Disabled-bash-posix-mode-to-allow-bash-features.patch +Patch9: 0009-Filter-out-labeled-ipv4-addresses-in-get_ipv4address.patch +Patch10: 0010-network-start-fails-under-systemd.test.patch %description This package provides the SuSE system configuration scheme and @@ -65,6 +67,8 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 +%patch10 -p1 %build autoreconf --force --install ++++++ 0009-Filter-out-labeled-ipv4-addresses-in-get_ipv4address.patch ++++++ >From 9406966c8f3028c18c21c261a41aa6b386340fee Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <mt(a)suse.com> Date: Wed, 25 Jan 2012 10:59:55 +0100 Subject: [PATCH] Filter out labeled ipv4 addresses in get_ipv4address Filter out labeled ipv4 addresses in get_ipv4address used to fetch the 1st address from the TUNNEL_DEVICE interface. Allows to configure a label for each address that should be skipped. Updated ifcfg-tunnel.5 man page. (bnc#741453) Thanks to Jon Nelson for his report with a fix proposal! Signed-off-by: Marius Tomaschewski <mt(a)suse.com> --- doc/ifcfg-tunnel.5 | 6 ++++-- scripts/functions | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/ifcfg-tunnel.5 b/doc/ifcfg-tunnel.5 index d7aef6c..7064ab9 100644 --- a/doc/ifcfg-tunnel.5 +++ b/doc/ifcfg-tunnel.5 @@ -65,9 +65,11 @@ The address of the local tunnel's end could be directly specified in variable. The address must be present on an existing interface of this host (the TUNNEL_DEVICE). If .B TUNNEL_LOCAL_IPADDR -is empty the first ipv4 address from the interface given in the variable +is empty the first ipv4 address without label from the interface given in the +variable .B TUNNEL_DEVICE -will be used. +will be used. You can configure a label for each additional address on the +interface, that you don't want to use. .TP .B TUNNEL_REMOTE_IPADDR The address of the remote tunnel's end. diff --git a/scripts/functions b/scripts/functions index 9bf48d2..5cb58b8 100644 --- a/scripts/functions +++ b/scripts/functions @@ -374,7 +374,8 @@ get_bonding_slave_hwaddrs() return 1 } -# This will echo the first address listed for the given interface. +# This will echo the first address listed for the given interface +# ignoring all addresses with a label. get_ipv4address () { test -z "$1" && return 1 local a b c @@ -382,7 +383,7 @@ get_ipv4address () { if [ "$a" = inet ] ; then break fi - done < <(LC_ALL=POSIX ip -4 address list "$1" 2>/dev/null) + done < <(LC_ALL=POSIX ip -4 address show dev "$1" label "$1" 2>/dev/null) test -z "$b" && return 1 echo ${b%%/*} } -- 1.7.7 ++++++ 0010-network-start-fails-under-systemd.test.patch ++++++ >From 4ee376fb64ac023cdaa6c78f4c1768e4f0986414 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <mt(a)suse.com> Date: Wed, 15 Feb 2012 18:50:14 +0100 Subject: [PATCH 1/3] Use all args in scripts/extradebug file names Signed-off-by: Marius Tomaschewski <mt(a)suse.com> --- scripts/extradebug | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/scripts/extradebug b/scripts/extradebug index 9a05933..2997a68 100755 --- a/scripts/extradebug +++ b/scripts/extradebug @@ -9,7 +9,8 @@ SCRIPT=${0##*/} { set +vx ; . /etc/sysconfig/network/scripts/functions.common ; } >&2 test -d $RUN_FILES_BASE && dir=$RUN_FILES_BASE || dir=/ -exec 2> $dir/exdeb.${SCRIPT}_$$.$PPID.${SEQNUM}_$1.$2 +args="" ; for arg in "$@" ; do args="$args.$arg" ; done +exec 2> "$dir/exdeb.${SCRIPT}_$$.$PPID.${SEQNUM}_${args}" date +"%F %T.%N" >&2 echo -------------------------------------------------- >&2 -- 1.7.7 >From ee9d2a28663852349bbf8a1eb315bba796f56b35 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <mt(a)suse.com> Date: Wed, 15 Feb 2012 18:51:45 +0100 Subject: [PATCH 2/3] Always enable boot-wait mode under systemd Signed-off-by: Marius Tomaschewski <mt(a)suse.com> --- scripts/network | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/scripts/network b/scripts/network index 77c3b3b..7ccb6ce 100755 --- a/scripts/network +++ b/scripts/network @@ -74,6 +74,9 @@ FS_FILTER="" SD_RUNNING=no SD_BOOTING=no if systemd_running ; then + # systemd never calls status action, + # so always enable boot-wait mode ... + MODE=onboot SD_RUNNING=yes systemd_booting && SD_BOOTING=yes fi -- 1.7.7 >From e52f94ed16596cb123ea7801ceb849c30e483447 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <mt(a)suse.com> Date: Wed, 15 Feb 2012 18:50:58 +0100 Subject: [PATCH 3/3] Include PID in log messages Signed-off-by: Marius Tomaschewski <mt(a)suse.com> --- scripts/functions.common | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/functions.common b/scripts/functions.common index 8542eb7..0b153ce 100644 --- a/scripts/functions.common +++ b/scripts/functions.common @@ -135,11 +135,11 @@ if [ "$USE_SYSLOG" != yes ] ; then else mesg() { echo -e "$@" # >&2 - echo -e "$@" | logger -t "$SCRIPTNAME" + echo -e "$@" | logger -t "$SCRIPTNAME[$$]" } mesg_n() { echo -ne "$@" # >&2 - echo -e "$@" | logger -t "$SCRIPTNAME" + echo -e "$@" | logger -t "$SCRIPTNAME[$$]" } fi @@ -166,10 +166,10 @@ for level in err "#" "#" info debug; do else eval ${level}_mesg \{ echo -e \"\$\@\" 1\>\&2\; \ echo -e \"\$\@\" \ - \| logger -p $nl -t \"$SCRIPTNAME\" \; \} + \| logger -p $nl -t \"$SCRIPTNAME[\$\$]\" \; \} eval ${level}_mesg_n \{ echo -ne \"\$\@\" 1\>\&2\; \ echo -e \"\$\@\" \ - \| logger -p $nl -t \"$SCRIPTNAME\" \; \} + \| logger -p $nl -t \"$SCRIPTNAME[\$\$]\" \; \} fi : $((nl++)) done -- 1.7.7 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit shorewall for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package shorewall for openSUSE:12.1:Update:Test checked in at 2012-03-05 14:14:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/shorewall (Old) and /work/SRC/openSUSE:12.1:Update:Test/.shorewall.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "shorewall", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/shorewall/shorewall.changes 2012-03-05 14:14:56.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.shorewall.new/shorewall.changes 2012-03-05 14:14:59.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 1 00:01:23 UTC 2012 - toganm(a)opensuse.org + +- Add /sbin/shorewall-init (bnc#749724) + +------------------------------------------------------------------- New: ---- shorewall-init ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shorewall.spec ++++++ --- /var/tmp/diff_new_pack.dSBDul/_old 2012-03-05 14:15:00.000000000 +0100 +++ /var/tmp/diff_new_pack.dSBDul/_new 2012-03-05 14:15:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package shorewall # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,14 +16,13 @@ # - Name: shorewall Version: 4.4.24.1 -Release: 1 -License: GPL-2.0 +Release: 0 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems -Url: http://www.shorewall.net/ +License: GPL-2.0 Group: Productivity/Networking/Security +Url: http://www.shorewall.net/ Source0: http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.24/%name-%version.… Source1: http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.24/%name-lite-%ver… Source2: http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.24/%name-init-%ver… @@ -32,6 +31,8 @@ Source5: http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.24/%name-docs-html… Source6: %name-4.4.22.rpmlintrc Source7: README.openSUSE +# PATCH-FIX-UPSTREAM shorewall-init (bnc#749724) teastep(a)shorewall.net --provide /sbin/shorewall-init for systemd +Source8: shorewall-init # PATCH-FIX-UPSTREAM init-4.4.14 toganm(a)opensuse.org -- Required-Stop and Short descriprtion Patch0: init-4.4.14.patch # PATCH-FIX-UPSTREAM shorewall-lite-4.4.14.init.patch toganm(a)opensuse.org Required-Stop and Short descriprtion @@ -55,9 +56,9 @@ PreReq: %fillup_prereq PreReq: %insserv_prereq %endif -Requires: xtables-addons Requires: iproute2 Requires: iptables +Requires: xtables-addons %if 0%{?suse_version} < 1140 Requires: perl = %{perl_version} @@ -83,6 +84,7 @@ %package lite Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems +License: GPL-2.0 Group: Productivity/Networking/Security %if 0%{?suse_version} > 1140 Requires(pre): systemd @@ -111,6 +113,8 @@ %package -n %{name}6 Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems +License: GPL-2.0 +Group: Productivity/Networking/Security %if 0%{?suse_version} > 1140 Requires(pre): systemd Requires(post): systemd @@ -122,7 +126,6 @@ %endif Requires: logrotate Conflicts: SuSEfirewall2 -Group: Productivity/Networking/Security %description -n %{name}6 The Shoreline Firewall 6, more commonly known as "Shorewall6", is a Netfilter @@ -132,6 +135,8 @@ %package -n %{name}6-lite Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems +License: GPL-2.0 +Group: Productivity/Networking/Security %if 0%{?suse_version} > 1140 Requires(pre): systemd Requires(post): systemd @@ -143,7 +148,6 @@ %endif Requires: logrotate Conflicts: SuSEfirewall2 -Group: Productivity/Networking/Security %description -n %{name}6-lite The Shoreline Firewall 6, more commonly known as "Shorewall6", is a Netfilter @@ -156,6 +160,8 @@ %package init Summary: Adds functionality to Shoreline Firewall (Shorewall) +License: GPL-2.0 +Group: Productivity/Networking/Security %if 0%{?suse_version} > 1140 Requires(pre): systemd Requires(post): systemd @@ -165,10 +171,9 @@ PreReq: %fillup_prereq PreReq: %insserv_prereq %endif -Requires: logrotate Requires: %name > 4.4.9 Requires: %{name}6 > 4.4.9 -Group: Productivity/Networking/Security +Requires: logrotate %description init The Shoreline Firewall, more commonly known as "Shorewall", is a Netfilter @@ -181,8 +186,8 @@ %package docs Summary: HTML documentation for shorewall configuration +License: SUSE-GFDL-1.2+ Group: Documentation/Other -License: FDLv1.2+ %description docs HTML documentation for the Shoreline Firewall. Highly recommend to read before @@ -259,6 +264,7 @@ pushd %name-init-%version %__mkdir_p %buildroot%_sysconfdir/NetworkManager/dispatcher.d/ PREFIX=%buildroot DEST=%_initddir %_buildshell install.sh +install -m 755 %{S:8} %buildroot/sbin/shorewall-init popd %pre @@ -574,7 +580,7 @@ %attr(0755,root,root) %_sysconfdir/NetworkManager/dispatcher.d/01-%name %_datadir/%name-init/version %attr(0544,root,root) %_libexecdir/%name-init/ifupdown - +%attr(0755,root,root) /sbin/%{name}-init %attr(0544,root,root) %_sysconfdir/sysconfig/network/if-down.d/%name %attr(0755,root,root) %_sysconfdir/sysconfig/network/if-up.d/%name %_mandir/man8/%name-init.8* ++++++ shorewall-init ++++++ #! /bin/bash # The Shoreline Firewall (Shorewall) Packet Filtering Firewall - V4.5 # # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # # (c) 2012 - Tom Eastep (teastep(a)shorewall.net) # # On most distributions, this file should be called /etc/init.d/shorewall. # # Complete documentation is available at http://shorewall.net # # This program is free software; you can redistribute it and/or modify # it under the terms of Version 2 of the GNU General Public License # as published by the Free Software Foundation. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # 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. # ######################################################################################### if [ "$(id -u)" != "0" ] then echo "You must be root to start, stop or restart \"Shorewall \"." exit 1 fi # check if shorewall-init is configured or not if [ -f "/etc/sysconfig/shorewall-init" ] then . /etc/sysconfig/shorewall-init if [ -z "$PRODUCTS" ] then echo "ERROR: No products configured" >&2 exit 1 fi else echo "ERROR: /etc/sysconfig/shorewall-init not found" >&2 exit 1 fi # Initialize the firewall shorewall_start () { local PRODUCT local VARDIR echo -n "Initializing \"Shorewall-based firewalls\": " for PRODUCT in $PRODUCTS; do VARDIR=/var/lib/$PRODUCT [ -f /etc/$PRODUCT/vardir ] && . /etc/$PRODUCT/vardir if [ -x ${VARDIR}/firewall ]; then if ! /sbin/$PRODUCT status > /dev/null 2>&1; then ${VARDIR}/firewall stop || exit 1 fi fi done if [ -n "$SAVE_IPSETS" -a -f "$SAVE_IPSETS" ]; then ipset -R < "$SAVE_IPSETS" fi return 0 } # Clear the firewall shorewall_stop () { local PRODUCT local VARDIR echo -n "Clearing \"Shorewall-based firewalls\": " for PRODUCT in $PRODUCTS; do VARDIR=/var/lib/$PRODUCT [ -f /etc/$PRODUCT/vardir ] && . /etc/$PRODUCT/vardir if [ -x ${VARDIR}/firewall ]; then ${VARDIR}/firewall clear || exit 1 fi done if [ -n "$SAVE_IPSETS" ]; then mkdir -p $(dirname "$SAVE_IPSETS") if ipset -S > "${SAVE_IPSETS}.tmp"; then grep -qE -- '^(-N|create )' "${SAVE_IPSETS}.tmp" && mv -f "${SAVE_IPSETS}.tmp" "$SAVE_IPSETS" fi fi return 0 } case "$1" in start) shorewall_start ;; stop) shorewall_stop ;; *) echo "Usage: $0 {start|stop}" exit 1 esac exit 0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pm-utils for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package pm-utils for openSUSE:12.1:Update:Test checked in at 2012-03-05 14:14:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/pm-utils (Old) and /work/SRC/openSUSE:12.1:Update:Test/.pm-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pm-utils", Maintainer is "MVyskocil(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/pm-utils/pm-utils.changes 2012-02-13 16:11:45.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.pm-utils.new/pm-utils.changes 2012-03-05 14:14:12.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 28 03:57:13 UTC 2012 - binli(a)opensuse.org + +- Add pm-utils-dhcp-interfaces.patch, fix script 50rcnetwork error + and update savestate/restorestate functions. +- Format pm-utils-1.4.1-vtXX-upower-battery-AC-adapter.patch to + standard, use pushd/popd in spec(bnc#749031,swampid#45819). + +------------------------------------------------------------------- New: ---- pm-utils-dhcp-interfaces.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pm-utils.spec ++++++ --- /var/tmp/diff_new_pack.uZimvL/_old 2012-03-05 14:14:12.000000000 +0100 +++ /var/tmp/diff_new_pack.uZimvL/_new 2012-03-05 14:14:12.000000000 +0100 @@ -47,6 +47,8 @@ Patch5: pm-utils-1.3.0-suse-directfb-ignore-fbmodes.patch #PATCH-FIX-OPENSUSE: Update NetworkManager's Sleep method bnc#735837 Patch6: pm-utils-1.4.1-networkmanager.patch +#PATCH-FIX-OPENSUSE: Fix 50rcnetwork bnc#749031 +Patch10: pm-utils-dhcp-interfaces.patch Patch11: pm-utils-1.4.1-vtXX-upower-battery-AC-adapter.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -96,8 +98,10 @@ %patch4 -p1 -b .suse-logging %patch5 -p1 -b .directfb-ignore-fbmodes %patch6 -p1 -b .networkmanager -cd .. -%patch11 -p0 +pushd ../pm-utils-suse +%patch10 -p2 +%patch11 -p1 +popd %build %{configure} \ ++++++ pm-utils-1.4.1-vtXX-upower-battery-AC-adapter.patch ++++++ --- /var/tmp/diff_new_pack.uZimvL/_old 2012-03-05 14:14:12.000000000 +0100 +++ /var/tmp/diff_new_pack.uZimvL/_new 2012-03-05 14:14:12.000000000 +0100 @@ -1,100 +1,59 @@ -*** pm-utils-suse/bin/powersave 2011-03-01 21:18:38.351062624 +0100 -*** pm-utils-suse/bin/powersave 2011-03-01 21:25:43.213064195 +0100 -*************** -*** 54,60 **** - continue - fi - # type 2 is battery -! if upower_device_get_property "${DEVICE}" String:Type 2>/dev/null | grep -q "2$"; then - echo "${DEVICE}" - fi - done ---- 54,60 ---- - continue - fi - # type 2 is battery -! if upower_device_get_property "${DEVICE}" string:Type 2>/dev/null | grep uint | grep -q "2$"; then - echo "${DEVICE}" - fi - done -*************** -*** 63,69 **** - # print the ac_adapter found on system - # Note: it prints the first match, as it expects only one per machine - function upower_find_ac_adapter() { -! for DEVICE in $(upower_call_method org.freedesktop.UPower.EnumerateDevices); do - # type 1 is Line Power - if upower_device_get_property "${DEVICE}" string:Type 2>/dev/null | grep -q "1$"; then - echo "${DEVICE}" ---- 63,69 ---- - # print the ac_adapter found on system - # Note: it prints the first match, as it expects only one per machine - function upower_find_ac_adapter() { -! for DEVICE in $(upower_call_method org.freedesktop.UPower.EnumerateDevices | grep -o '/org[A-Za-z0-9/_]*'); do - # type 1 is Line Power - if upower_device_get_property "${DEVICE}" string:Type 2>/dev/null | grep -q "1$"; then - echo "${DEVICE}" -*************** -*** 193,212 **** - done - } - - function upower_battery_info { - C=1 - for BATTERY in `upower_enumerate_batteries`; do - -! SEC=`upower_device_get_property "${BATTERY}" TimeToEmpty` - if [ $SEC -ne 0 ]; then - let MIN=SEC/60 - else - MIN=0 - fi - -! PERC=`upower_device_get_property "${BATTERY}" Percentage` - -! case `upower_device_get_property "${BATTERY}" State` in - 1) STATE="Charging" ;; - 2) STATE="Discharging" ;; - 3) STATE="Empty" ;; ---- 193,216 ---- - done - } - -+ function dbus-getv { -+ sed -n "s#.*[ \t]*$1[0-9]*[ \t]*##p" -+ } -+ - function upower_battery_info { - C=1 - for BATTERY in `upower_enumerate_batteries`; do - -! let SEC="`upower_device_get_property "${BATTERY}" string:TimeToEmpty | dbus-getv int`" - if [ $SEC -ne 0 ]; then - let MIN=SEC/60 - else - MIN=0 - fi - -! PERC=`upower_device_get_property "${BATTERY}" string:Percentage | dbus-getv double` - -! case `upower_device_get_property "${BATTERY}" string:State | dbus-getv uint` in - 1) STATE="Charging" ;; - 2) STATE="Discharging" ;; - 3) STATE="Empty" ;; -*************** -*** 217,223 **** - esac - - echo "Battery$C:" -! echo -e "\t Remaining percent: $PERC" - echo -e "\t Remaining minutes: $MIN" - echo -e "\t Charging state: $STATE" - ---- 221,227 ---- - esac - - echo "Battery$C:" -! echo -e "\t Remaining percent: $PERC%" - echo -e "\t Remaining minutes: $MIN" - echo -e "\t Charging state: $STATE" - +Index: pm-utils-suse/bin/powersave +=================================================================== +--- pm-utils-suse.orig/bin/powersave ++++ pm-utils-suse/bin/powersave +@@ -54,7 +54,7 @@ function upower_enumerate_batteries() { + continue + fi + # type 2 is battery +- if upower_device_get_property "${DEVICE}" String:Type 2>/dev/null | grep -q "2$"; then ++ if upower_device_get_property "${DEVICE}" string:Type 2>/dev/null | grep uint | grep -q "2$"; then + echo "${DEVICE}" + fi + done +@@ -63,7 +63,7 @@ function upower_enumerate_batteries() { + # print the ac_adapter found on system + # Note: it prints the first match, as it expects only one per machine + function upower_find_ac_adapter() { +- for DEVICE in $(upower_call_method org.freedesktop.UPower.EnumerateDevices); do ++ for DEVICE in $(upower_call_method org.freedesktop.UPower.EnumerateDevices | grep -o '/org[A-Za-z0-9/_]*'); do + # type 1 is Line Power + if upower_device_get_property "${DEVICE}" string:Type 2>/dev/null | grep -q "1$"; then + echo "${DEVICE}" +@@ -193,20 +193,24 @@ function hal_battery_info { + done + } + ++function dbus-getv { ++ sed -n "s#.*[ \t]*$1[0-9]*[ \t]*##p" ++} ++ + function upower_battery_info { + C=1 + for BATTERY in `upower_enumerate_batteries`; do + +- SEC=`upower_device_get_property "${BATTERY}" TimeToEmpty` ++ let SEC="`upower_device_get_property "${BATTERY}" string:TimeToEmpty | dbus-getv int`" + if [ $SEC -ne 0 ]; then + let MIN=SEC/60 + else + MIN=0 + fi + +- PERC=`upower_device_get_property "${BATTERY}" Percentage` ++ PERC=`upower_device_get_property "${BATTERY}" string:Percentage | dbus-getv double` + +- case `upower_device_get_property "${BATTERY}" State` in ++ case `upower_device_get_property "${BATTERY}" string:State | dbus-getv uint` in + 1) STATE="Charging" ;; + 2) STATE="Discharging" ;; + 3) STATE="Empty" ;; +@@ -217,7 +221,7 @@ function upower_battery_info { + esac + + echo "Battery$C:" +- echo -e "\t Remaining percent: $PERC" ++ echo -e "\t Remaining percent: $PERC%" + echo -e "\t Remaining minutes: $MIN" + echo -e "\t Charging state: $STATE" + ++++++ pm-utils-dhcp-interfaces.patch ++++++ Index: pm-utils/pm-utils-suse/hooks/sleep.d/50rcnetwork =================================================================== --- pm-utils.orig/pm-utils-suse/hooks/sleep.d/50rcnetwork +++ pm-utils/pm-utils-suse/hooks/sleep.d/50rcnetwork @@ -16,21 +16,23 @@ [ -r /etc/sysconfig/network/config ] && . /etc/sysconfig/network/config [ -r /etc/sysconfig/network/scripts/functions ] && . /etc/sysconfig/network/scripts/functions -command_exists dhcp_clients || exit $NA - # NetworkManager is handled by 55NetworkManager, so skip this script if # nm is enabled in sysconfig ... -[ x"${NETWORKMANAGER}" -eq x"yes" ] && exit $NA +[ x"${NETWORKMANAGER}" = x"yes" ] && exit $NA # ... or if is running command_exists nm_running && nm_running && exit $NA +# check network/scripts/function provides dhcp_interfaces() +# function returning a list of interfaces with running dhcp. +command_exists dhcp_interfaces || exit $NA + case "$1" in hibernate|suspend) - save_state "dhcp_clients" "`dhcp_clients`" + savestate "dhcp_interfaces" "`dhcp_interfaces`" service network stop-all-dhcp-clients ;; thaw|resume) - for interface in `restore_state "dhcp_clients"`; do + for interface in `restorestate "dhcp_interfaces"`; do service network restart ${interface} done ;; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit empathy for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package empathy for openSUSE:12.1:Update:Test checked in at 2012-03-05 14:12:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/empathy (Old) and /work/SRC/openSUSE:12.1:Update:Test/.empathy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "empathy", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/empathy/empathy.changes 2012-03-05 14:12:05.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.empathy.new/empathy.changes 2012-03-05 14:12:05.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Nov 17 10:13:08 UTC 2011 - dimstar(a)opensuse.org + +- Update to version 3.2.2: + + This stable release fixes a bunch of memory leaks in the log + viewer and a packing issue in the accounts dialog [bnc#749149] + + Status icon is miss aligned in infobar [bgo#663567] +- Changes from version 3.2.1.2: + + Cannot quit empathy [bgo#662504] + + Fix for misaligned 16x16 app icon [bgo#662995] + + new-call/new-convo dialogs should listen to capabilities + changes [bgo#662727] + +------------------------------------------------------------------- Old: ---- empathy-3.2.1.1.tar.bz2 New: ---- empathy-3.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ empathy.spec ++++++ --- /var/tmp/diff_new_pack.useFeT/_old 2012-03-05 14:12:06.000000000 +0100 +++ /var/tmp/diff_new_pack.useFeT/_new 2012-03-05 14:12:06.000000000 +0100 @@ -18,7 +18,7 @@ Name: empathy -Version: 3.2.1.1 +Version: 3.2.2 Release: 1 # FIXME: add telepathy-fastream BuildRequires when upstream is happy with it (ie, not experimental anymore) License: GPLv2+ ++++++ empathy-3.2.1.1.tar.bz2 -> empathy-3.2.2.tar.bz2 ++++++ ++++ 10667 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit empathy for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package empathy for openSUSE:12.1:Update:Test checked in at 2012-03-05 14:12:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/empathy (Old) and /work/SRC/openSUSE:12.1:Update:Test/.empathy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "empathy", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.empathy.new/empathy.changes 2012-03-05 14:12:05.000000000 +0100 @@ -0,0 +1,1568 @@ +------------------------------------------------------------------- +Fri Oct 28 08:43:30 UTC 2011 - dimstar(a)opensuse.org + +- Update to version 3.2.1.1: + + HTML injection in nicknames [bgo#662035, bnc#727003, + CVE-2011-3635] + + contact_list_store_contact_active_cb may be called after the + destruction of the store [bgo#662211] + + Updated translations. + +------------------------------------------------------------------- +Thu Oct 27 21:27:17 UTC 2011 - badshah400(a)gmail.com + +- Pass -u to %suse_update_desktop_file call for + empathy-accounts.desktop: we don't want to show this item in + the menu as it's quite useless on a standard desktop + +------------------------------------------------------------------- +Mon Oct 17 17:36:32 CEST 2011 - dimstar(a)opensuse.org + +- Update to version 3.2.1: + + bgo#658542: Use new Subject and RoomConfig APIs rather than + Telepathy.Properties + + bgo#660586: setting to third party Adium theme leads to crash + + Updated translations. + +------------------------------------------------------------------- +Mon Oct 10 14:41:50 CEST 2011 - dimstar(a)opensuse.org + +- Update to version 3.2.0.1: + + Fix calling issues when Empathy is built without the + experimental call support. + + Bugs fixed: bgo#660449, bgo#660124, bgo#646630, bgo#659594, + bgo#659816. + + Updated translations. + +------------------------------------------------------------------- +Mon Sep 26 10:39:28 UTC 2011 - vuntz(a)opensuse.org + +- Update to version 3.2.0: + + Bugs fixed: bgo#659118, bgo#659298. + + Updated translations. + +------------------------------------------------------------------- +Wed Sep 21 17:54:47 UTC 2011 - vuntz(a)opensuse.org + +- Update to version 3.1.92: + + Bugs fixed: bgo#580794, bgo#632357, bgo#648315, bgo#652985, + bgo#655270, bgo#655356, bgo#655388, bgo#657335, bgo#657746, + bgo#657818, bgo#658336, bgo#658340, bgo#658341, bgo#658343, + bgo#658573, bgo#658584, bgo#658644, bgo#658785, bgo#658821, + bgo#658857, bgo#658866, bgo#658895, bgo#658909, bgo#659003, + bgo#659053, bgo#659141, bgo#659377, bgo#659439, bgo#659476. + + Updated translations. +- Add explicit pkgconfig(clutter-1.0) BuildRequires: it used to be + implicit. +- Add iso-codes Requires since the iso-codes data is used at + runtime. +- Remove sed hack in %prep to enable champlain 0.12 support: fixed + upstream. + +------------------------------------------------------------------- +Sun Sep 18 17:17:12 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant/obsolete tags/sections from specfile + (cf. packaging guidelines) +- Use %_smp_mflags for parallel build + +------------------------------------------------------------------- +Tue Sep 6 09:44:37 UTC 2011 - vuntz(a)opensuse.org + +- Update to version 3.1.91: + + Add a mission-control plugin providing integration with GNOME's + online accounts service. With this plugin installed, + mission-control will automatically create a Telepathy account + if there is a Google GOA account configured with the 'Chat' + feature enabled. + + Bugs fixed: bgo#652543, bgo#656871, bgo#657087, bgo#657266, + bgo#657842, bgo#657843, bgo#657914, bgo#657954, bgo#657956, + bgo#658254. + + Updated translations. +- Move to libchamplain 0.12: + + Change pkgconfig(champlain-gtk-0.10) BuildRequires to + pkgconfig(champlain-gtk-0.12). + + Add a sed hack in %prep to make configure look for the right + pkg-config file. +- Build the plugin for GNOME online accounts integration: + + Pass --enable-goa to configure. + + Add pkgconfig(goa-1.0) and pkgconfig(mission-control-plugins) + BuildRequires. + + Create a telepathy-mission-control-plugin-goa subpackage. + +------------------------------------------------------------------- +Mon Sep 5 14:00:20 UTC 2011 - vuntz(a)opensuse.org + +- Remove X-GNOME-Settings-Panel from empathy-accounts.desktop, + since it should not appear in gnome-control-center (see + bgo#658254). + +------------------------------------------------------------------- +Thu Sep 1 14:44:05 UTC 2011 - vuntz(a)opensuse.org + +- Update to version 3.1.90.1: + + Do not display a status icon and set your presence to offline + when exiting, if the Shell is running. (bgo#656631, bgo#656632, + bgo#631944) + + Bugs fixed: bgo#656886, bgo#656911, bgo#656889. + + Updated translations. +- Changes from version 3.1.90: + + SIP accounts can now be marked as being able to make PSTN + calls. Such accounts can be used to call landline and mobile + phones of contacts. (bgo##650112, bgo##657220) + + Bugs fixed: bgo#650113, bgo#647124, bgo#657086, bgo#657562, + bgo#657362, bgo#656682, bgo#657166, bgo#657271, bgo#657173, + bgo#657105, bgo#657104, bgo#656829, bgo#642385. + + Updated translations. + +------------------------------------------------------------------- +Mon Aug 22 13:54:14 CEST 2011 - dimstar(a)opensuse.org + +- Update to version 3.1.5.1: + + bgo#656934: Allow to provide a request message when adding + contact + + Other bugs fixed: bgo#653599, bgo#654471, bgo#655799, + bgo#656566, bgo#656573, bgo#656576, bgo#656579, bgo#656673, + bgo#656831, bgo#656866, bgo#656885, bgo#656887, bgo#656888, + bgo#656908. + + Updated translations. + +------------------------------------------------------------------- +Tue Aug 16 17:27:59 CEST 2011 - dimstar(a)opensuse.org + +- Update to version 3.1.5: + + Empathy now has echo cancellation support with PulseAudio. + + New features in experimental call UI (disabled for now). + + Bugs fixed: bgo#590048, bgo#599167, bgo#632874, bgo#654914, + bgo#654958, bgo#655212, bgo#655478, bgo#655788, bgo#655884, + bgo#655959, bgo#656020, bgo#656065, bgo#656150, bgo#656268, + bgo#656415, bgo#656572, bgo#656582 + + Updated translations. +- Add pkgconfig(libpulse) and pkgconfig(libpulse-mainloop-glib) + BuildRequires for the new echo cancellation support. + +------------------------------------------------------------------- +Tue Jul 26 12:13:48 CEST 2011 - vuntz(a)opensuse.org + +- Update to version 3.1.4: + + Add gudev dependency for camera monitoring. + + Add clutter dependencies in empathy-call. + + Bugs fixed: + - bgo#582442: Set video preview on top of remote video + - bgo#558942, bgo#593352, bgo#607557, bgo#611789, bgo#634809, + bgo#639353, bgo#652439, bgo#653116, bgo#653175, bgo#653341, + bgo#653760, bgo#653803, bgo#654015, bgo#654256, bgo#654419, + bgo#654541, bgo#654552, bgo#654611, bgo#654669. + + Updated translations. +- Add new pkgconfig(gudev-1.0) BuildRequires for new dependency. We + do not add pkgconfig(clutter-1.0) and pkgconfig(clutter-gst-1.0) + BuildRequires as empathy-call is still considered experimental. +- Remove pkgconfig(libgnome-control-center) BuildRequires as there + is no pkg-config file for libgnome-control-center anymore. This + means empathy won't install a gnome-control-center panel. See + bgo#655388. + +------------------------------------------------------------------- +Mon Jul 4 18:25:04 CEST 2011 - vuntz(a)opensuse.org + +- Update to version 3.1.3: + + Many issues fixed in the new log viewer. + + Bugs fixed: + - bgo#651205: Support message editing (supersedes header) + - bgo#653057, bgo#653510: Google Talk broken account defaults + - bgo#653650: Blocking contacts dialog should autocomplete when + adding contacts by alias + - bgo#646555, bgo#573652, bgo#630943, bgo#644528, bgo#651055, + bgo#651473, bgo#652265, bgo#652278, bgo#652279, bgo#652345, + bgo#652443, bgo#652496, bgo#652522, bgo#652590, bgo#653090, + bgo#653175, bgo#653551, bgo#653575, bgo#653635, bgo#653730, + bgo#653739, bgo#653760, bgo#653767, bgo#653803. + + Updated translations. + +------------------------------------------------------------------- +Fri Jun 17 05:35:28 CEST 2011 - vuntz(a)opensuse.org + +- Update to version 3.1.2.1: + + Update telepathy-yell code. + + Updated translations. +- Drop libtelepathy-yell0 and libtelepathy-yell-devel subpackages + as the library is now built in statically. + +------------------------------------------------------------------- +Mon Jun 13 14:05:43 CEST 2011 - dimstar(a)opensuse.org + +- Update to version 3.1.2: + + Add brand new log viewer displaying calls as well as chats. + + Support for CSS variants in Adium themes. + + If built with libcheese, Empathy can now use a webcam to create ++++ 1371 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.1:Update:Test/.empathy.new/empathy.changes New: ---- _link empathy-3.2.1.1.tar.bz2 empathy-rpmlintrc empathy.changes empathy.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ empathy.spec ++++++ # # spec file for package empathy # # Copyright (c) 2011 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/ # Name: empathy Version: 3.2.1.1 Release: 1 # FIXME: add telepathy-fastream BuildRequires when upstream is happy with it (ie, not experimental anymore) License: GPLv2+ Summary: Instant Messenger Client for GNOME, based on Telepathy Url: http://live.gnome.org/Empathy Group: Productivity/Networking/Instant Messenger Source: http://download.gnome.org/sources/empathy/3.2/%{name}-%{version}.tar.bz2 Source99: %{name}-rpmlintrc BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: intltool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: pkgconfig(champlain-gtk-0.12) BuildRequires: pkgconfig(cheese-gtk) BuildRequires: pkgconfig(clutter-1.0) >= 1.7.14 BuildRequires: pkgconfig(clutter-gtk-1.0) BuildRequires: pkgconfig(enchant) BuildRequires: pkgconfig(folks-telepathy) >= 0.6.2 BuildRequires: pkgconfig(gcr-3) BuildRequires: pkgconfig(geoclue) BuildRequires: pkgconfig(geocode-glib) BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(goa-1.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.2 BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libebook-1.2) BuildRequires: pkgconfig(libnm-glib) BuildRequires: pkgconfig(libnotify) >= 0.7.0 BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse-mainloop-glib) BuildRequires: pkgconfig(mission-control-plugins) BuildRequires: pkgconfig(nautilus-sendto) BuildRequires: pkgconfig(telepathy-farsight) >= 0.0.14 BuildRequires: pkgconfig(telepathy-glib) >= 0.16.0 BuildRequires: pkgconfig(telepathy-logger-0.2) >= 0.2.10 BuildRequires: pkgconfig(webkitgtk-3.0) >= 1.3.13 Requires: iso-codes Requires: telepathy-gabble Requires: telepathy-logger Requires: telepathy-mission-control Requires: telepathy-salut Recommends: %{name}-lang Recommends: geoclue Recommends: telepathy-butterfly Recommends: telepathy-haze Recommends: telepathy-idle # The applets and the libraries have been removed Obsoletes: empathy-devel < 2.29.1 Obsoletes: gnome-applets-empathy < 2.29.1 Obsoletes: python-empathy < 2.29.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires %description Empathy is a messaging program which supports text, voice, and video chat and file transfers over many different protocols. You can tell it about your accounts on all those services and do all your chatting within one application. Empathy uses Telepathy for protocol support and has a user interface based on Gossip. Empathy is the default chat client in current versions of GNOME, making it easier for other GNOME applications to integrate collaboration functionality using Telepathy. %package -n nautilus-sendto-plugin-empathy License: GPLv2+ Summary: Empathy plugin for nautilus-sendto Group: Productivity/File utilities Requires: %{name} = %{version} Requires: nautilus-sendto Supplements: packageand(empathy:nautilus-sendto) %description -n nautilus-sendto-plugin-empathy This package provides the functionality to the Nautilus file browser to send files over instant messaging protocols via Empathy. %package -n telepathy-mission-control-plugin-goa License: GPLv2+ Summary: Telepathy Mission Control Plugin to use data from GNOME Online Accounts Group: Productivity/Networking/Instant Messenger Requires: gnome-online-accounts Requires: telepathy-mission-control Supplements: packageand(telepathy-mission-control:gnome-online-accounts) %description -n telepathy-mission-control-plugin-goa This plugin for Mission Control provides integration with the GNOME Online Accounts service. Mission Control will automatically create a Telepathy account for GNOME Online Accounts configured with the "Chat" feature enabled. %lang_package %prep %setup -q translation-update-upstream %build %configure --disable-static \ --with-pic \ --disable-scrollkeeper \ --enable-goa make %{?_smp_mflags} V=1 %install %makeinstall %if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif find %{buildroot} -type f -name "*.la" -delete -print # Rename im-xmpp icon to im-jabber, as used by empathy (fixed upstream already) for icon in `ls %{buildroot}%{_datadir}/empathy/icons/hicolor/*/apps/im-xmpp.*`; do mv $icon `echo $icon | sed "s,im-xmpp,im-jabber,g"` done %suse_update_desktop_file -i -N "Empathy" -G "Instant Messenger" empathy InstantMessaging # DesktopSettings is okay upstream, but it makes the item appear misplaced with our menu structure grep -q DesktopSettings %{buildroot}%{_datadir}/applications/empathy-accounts.desktop # Hide empathy-accounts from the desktop menu %suse_update_desktop_file -u empathy-accounts %find_lang %{name} %{?no_lang_C} # create symlinks for man pages %fdupes -s %{buildroot}%{_mandir} # create hardlinks for the rest %fdupes %{buildroot} %post %glib2_gsettings_schema_post %desktop_database_post %icon_theme_cache_post %postun %glib2_gsettings_schema_postun %desktop_database_postun %icon_theme_cache_postun %files %defattr(-,root,root) %doc README TODO %dir %{_datadir}/gnome/ %dir %{_datadir}/gnome/help/ %dir %{_datadir}/gnome/help/%{name}/ %doc %{_datadir}/gnome/help/%{name}/C/ %{_bindir}/empathy %{_bindir}/empathy-accounts %{_bindir}/empathy-debugger %{_datadir}/icons/hicolor/*/apps/empathy.* %{_datadir}/applications/empathy.desktop %{_datadir}/applications/empathy-accounts.desktop %{_datadir}/dbus-1/services/*.service %{_datadir}/empathy/ %{_datadir}/GConf/gsettings/empathy.convert %{_datadir}/glib-2.0/schemas/org.gnome.Empathy.gschema.xml %{_datadir}/telepathy/clients/*.client %{_libexecdir}/empathy-auth-client %{_libexecdir}/empathy-av %{_libexecdir}/empathy-chat %{_mandir}/man1/empathy.1%{?ext_man} %{_mandir}/man1/empathy-accounts.1%{?ext_man} %dir %{_datadir}/telepathy %dir %{_datadir}/telepathy/clients %files -n nautilus-sendto-plugin-empathy %defattr(-, root, root) %{_libdir}/nautilus-sendto/plugins/libnstempathy.so %files -n telepathy-mission-control-plugin-goa %defattr(-, root, root) %{_libdir}/mission-control-plugins.0/mcp-account-manager-goa.so %files lang -f %{name}.lang %changelog ++++++ _link ++++++ <link project="openSUSE:12.1" baserev="7829a1707577485e9b44176bc2bde64b"> <patches> <branch/> </patches> </link> ++++++ empathy-rpmlintrc ++++++ addFilter(".*obsolete-not-provided.*empathy-devel") addFilter(".*obsolete-not-provided.*gnome-applets-empathy") addFilter(".*obsolete-not-provided.*python-empathy") -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sblim-cmpi-devel for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package sblim-cmpi-devel for openSUSE:Factory checked in at 2012-03-05 14:03:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sblim-cmpi-devel (Old) and /work/SRC/openSUSE:Factory/.sblim-cmpi-devel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sblim-cmpi-devel", Maintainer is "bwhiteley(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sblim-cmpi-devel/sblim-cmpi-devel.changes 2011-11-28 12:57:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sblim-cmpi-devel.new/sblim-cmpi-devel.changes 2012-03-05 14:03:08.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 14 12:36:59 UTC 2011 - coolo(a)suse.com + +- fix license to be in spdx.org format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-cmpi-devel.spec ++++++ --- /var/tmp/diff_new_pack.S9gJ0I/_old 2012-03-05 14:03:09.000000000 +0100 +++ /var/tmp/diff_new_pack.S9gJ0I/_new 2012-03-05 14:03:09.000000000 +0100 @@ -15,15 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: sblim-cmpi-devel Version: 2.0.2 -Release: 1 -Group: Development/Libraries/C and C++ +Release: 0 Url: http://sblim.sf.net/ -License: Other uncritical OpenSource License ; "EPL 1.0 ..." ; EPL 1.0 -BuildRequires: doxygen gcc-c++ libtool +BuildRequires: doxygen +BuildRequires: gcc-c++ +BuildRequires: libtool Provides: cmpi-devel Conflicts: tog-pegasus Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 @@ -36,6 +34,8 @@ Patch1: CMPIString-const-char-constructor.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: SBLIM CMPI Provider Development Support +License: EPL-1.0 +Group: Development/Libraries/C and C++ %description This packages provides the C and C++ CMPI header files needed by @@ -46,9 +46,7 @@ %package -n sblim-cmpi-c++-devel -License: "Eclipse Public License 1.0 ..." ; Eclipse Public License 1.0 Summary: SBLIM CMPI Provider Development Support -Group: Development/Libraries/C and C++ Requires: libcmpiCppImpl0 %{name} Conflicts: tog-pegasus @@ -61,9 +59,7 @@ %package -n libcmpiCppImpl0 -License: Other uncritical OpenSource License ; "EPL 1.0 ..." ; EPL 1.0 Summary: SBLIM CMPI Provider Development Support -Group: Development/Libraries/C and C++ Conflicts: tog-pegasus %description -n libcmpiCppImpl0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package python for openSUSE:Factory checked in at 2012-03-05 14:03:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python (Old) and /work/SRC/openSUSE:Factory/.python.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python", Maintainer is "JMatejek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/python/python-base.changes 2011-10-02 10:25:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python.new/python-base.changes 2012-03-05 14:03:05.000000000 +0100 @@ -1,0 +2,18 @@ +Mon Dec 12 13:39:57 UTC 2011 - toddrme2178(a)gmail.com + +- Exclude /usr/bin/2to3 to prevent conflicts with python3-2to3 + +------------------------------------------------------------------- +Thu Dec 8 13:31:01 UTC 2011 - jmatejek(a)suse.com + +- %python_version now correctly refers to %tarversion + +------------------------------------------------------------------- +Mon Nov 28 09:21:32 UTC 2011 - saschpe(a)suse.de + +- Spec file cleanup: + * Run spec-cleaner + * Remove outdated %clean section, AutoReqProv and authors from descr. +- Fix license to Python-2.0 (also SPDX style) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python/python-doc.changes 2011-09-23 12:42:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python.new/python-doc.changes 2012-03-05 14:03:05.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Nov 28 09:21:32 UTC 2011 - saschpe(a)suse.de + +- Spec file cleanup: + * Run spec-cleaner + * Remove outdated %clean section, AutoReqProv and authors from descr. +- Fix license to Python-2.0 (also SPDX style) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python/python.changes 2011-12-02 09:28:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python.new/python.changes 2012-03-05 14:03:05.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Dec 8 13:30:29 UTC 2011 - jmatejek(a)suse.com + +- %python_version now correctly refers to %tarversion + +------------------------------------------------------------------- +Thu Dec 01 09:21:32 UTC 2011 - saschpe(a)suse.de + +- Spec file cleanup: + * Run spec-cleaner + * Remove outdated %clean section, AutoReqProv and authors from descr. +- Fix license to Python-2.0 (also SPDX style) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-base.spec ++++++ --- /var/tmp/diff_new_pack.IdweCR/_old 2012-03-05 14:03:07.000000000 +0100 +++ /var/tmp/diff_new_pack.IdweCR/_new 2012-03-05 14:03:07.000000000 +0100 @@ -18,18 +18,12 @@ Name: python-base -BuildRequires: fdupes pkg-config zlib-devel automake +Version: 2.7.2 +Release: 0 +License: Python-2.0 +Summary: Python Interpreter base package Url: http://www.python.org/ -License: MIT License (or similar) Group: Development/Languages/Python -# bug437293 -%ifarch ppc64 -Obsoletes: python-64bit -%endif -# -Summary: Python Interpreter base package -Version: 2.7.2 -Release: 1 %define tarversion %{version} %define tarname Python-%{tarversion} Source0: %{tarname}.tar.bz2 @@ -54,12 +48,19 @@ Patch13: python-2.7.2-fix_date_time_compiler.patch Patch14: python-2.7.1-urllib-noproxy.patch # COMMON-PATCH-END -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define python_version %(echo %{version} | head -c 3) +%define python_version %(echo %{tarversion} | head -c 3) +BuildRequires: automake +BuildRequires: fdupes +BuildRequires: pkg-config +BuildRequires: zlib-devel +# explicitly, see bnc#697251: +Requires: libpython2_7-1_0 = %{version} Provides: %{name} = %{python_version} - -# explicitly, see bnc#697251 -Requires: libpython2_7-1_0 = %{version}-%{release} +# bug437293 +%ifarch ppc64 +Obsoletes: python-64bit +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Python is an interpreted, object-oriented programming language, and is @@ -70,18 +71,11 @@ This package contains all of stand-alone Python files, minus binary modules that would pull in extra dependencies. - - -Authors: --------- - Guido van Rossum <guido(a)python.org> - %package -n python-devel -License: Python License .. -Requires: python-base = %{version} glibc-devel Summary: Include Files and Libraries Mandatory for Building Python Modules Group: Development/Languages/Python -AutoReqProv: on +Requires: glibc-devel +Requires: python-base = %{version} %description -n python-devel The Python programming language's interpreter can be extended with @@ -91,34 +85,21 @@ tools for building Python modules, extending the Python interpreter or embedding Python in applications. - - -Authors: --------- - Guido van Rossum <guido(a)python.org> - %package -n python-xml -License: Python License .. -Requires: python-base = %{version} Summary: A Python XML Interface Group: Development/Libraries/Python +Requires: python-base = %{version} # pyxml used to live out of tree Provides: pyxml = 0.8.5 Obsoletes: pyxml < 0.8.5 -AutoReqProv: on %description -n python-xml The expat module is a Python interface to the expat XML parser. Since Python2.x, it is part of the core Python distribution. - - %package -n libpython2_7-1_0 -License: MIT License (or similar) Summary: Python Interpreter shared library Group: Development/Languages/Python -AutoReqProv: on -#%description -n libpython%{lib_version} %description -n libpython2_7-1_0 Python is an interpreted, object-oriented programming language, and is @@ -129,12 +110,6 @@ This package contains libpython2.6 shared library for embedding in other applications. - - -Authors: --------- - Guido van Rossum <guido(a)python.org> - %prep %setup -q -n %{tarname} # patching @@ -159,21 +134,18 @@ sed -i 's/^version_required/dnl version_required/' configure.in %build -export OPT="$RPM_OPT_FLAGS" +export OPT="%{optflags}" autoreconf -f -i . # Modules/_ctypes/libffi # provide a stable timestamp -touch -r %{S:0} Makefile.pre.in +touch -r %{SOURCE0} Makefile.pre.in # prevent make from trying to rebuild asdl stuff, which requires existing # python installation touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h -./configure \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ +%configure \ --docdir=%{_docdir}/python \ --with-fpectl \ --enable-ipv6 \ @@ -181,9 +153,7 @@ --enable-unicode=ucs4 LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH \ - make %{?_smp_mflags} \ - DESTDIR=$RPM_BUILD_ROOT \ - profile-opt + make %{?_smp_mflags} profile-opt %check # on hppa, the threading of glibc is quite broken. The tests just stop @@ -219,64 +189,53 @@ ######################################## # install it ######################################## -make \ - OPT="$RPM_OPT_FLAGS -fPIC" \ - DESTDIR=$RPM_BUILD_ROOT \ - install +%make_install OPT="%{optflags} -fPIC" # install site-specific tweaks -ln -s python%{python_version} ${RPM_BUILD_ROOT}%{_bindir}/python2 -install -m 644 %{S:4} ${RPM_BUILD_ROOT}%{_libdir}/python%{python_version}/distutils -install -m 644 %{S:5} ${RPM_BUILD_ROOT}%{_libdir}/python%{python_version}/site-packages -install -d -m 755 ${RPM_BUILD_ROOT}/etc/rpm -install -m 644 %{S:1} ${RPM_BUILD_ROOT}/etc/rpm +ln -s python%{python_version} %{buildroot}%{_bindir}/python2 +install -m 644 %{SOURCE4} %{buildroot}%{_libdir}/python%{python_version}/distutils +install -m 644 %{SOURCE5} %{buildroot}%{_libdir}/python%{python_version}/site-packages +install -d -m 755 %{buildroot}%{_sysconfdir}/rpm +install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm # make sure /usr/lib/python/site-packages exists even on lib64 machines -mkdir -p ${RPM_BUILD_ROOT}/usr/lib/python%{python_version}/site-packages +mkdir -p %{buildroot}%{_prefix}/lib/python%{python_version}/site-packages ######################################## # some cleanups ######################################## # remove hard links and replace them with symlinks for dir in bin include %{_lib} ; do - rm -f $RPM_BUILD_ROOT/%{_prefix}/$dir/python - ln -s python%{python_version} $RPM_BUILD_ROOT/%{_prefix}/$dir/python + rm -f %{buildroot}/%{_prefix}/$dir/python + ln -s python%{python_version} %{buildroot}/%{_prefix}/$dir/python done -CLEANUP_DIR="$RPM_BUILD_ROOT%{_libdir}/python%{python_version}" +CLEANUP_DIR="%{buildroot}%{_libdir}/python%{python_version}" # don't distribute precompiled windows installers (duh) rm -f $CLEANUP_DIR/distutils/command/*.exe # kill imageop.so and audioop.so, they are rarely used and insecure rm -f $CLEANUP_DIR/lib-dynload/imageop.so rm -f $CLEANUP_DIR/lib-dynload/audioop.so # remove various things that don't need to be in python-base -rm $RPM_BUILD_ROOT%{_bindir}/idle +rm %{buildroot}%{_bindir}/idle rm -rf $CLEANUP_DIR/{curses,bsddb,idlelib,lib-tk,sqlite3} rm $CLEANUP_DIR/ssl.py* # does not work without _ssl.so anyway # replace duplicate .pyo/.pyc with hardlinks -%fdupes $RPM_BUILD_ROOT/%{_libdir}/python%{python_version} +%fdupes %{buildroot}/%{_libdir}/python%{python_version} ######################################## # documentation ######################################## -export PDOCS=${RPM_BUILD_ROOT}%{_docdir}/%{name} +export PDOCS=%{buildroot}%{_docdir}/%{name} install -d -m 755 $PDOCS -install -c -m 644 %{S:3} $PDOCS/ +install -c -m 644 %{SOURCE3} $PDOCS/ install -c -m 644 LICENSE $PDOCS/ install -c -m 644 README $PDOCS/ -ln -s python%{python_version}.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/python.1.gz +ln -s python%{python_version}.1.gz %{buildroot}%{_mandir}/man1/python.1.gz ######################################## # devel ######################################## # install Makefile.pre.in and Makefile.pre -cp Makefile Makefile.pre.in Makefile.pre $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/config/ - -%clean -rm -rf $RPM_BUILD_ROOT -#%post -n libpython%{lib_version} - -%post -n libpython2_7-1_0 -%{run_ldconfig} -#%postun -n libpython%{lib_version} +cp Makefile Makefile.pre.in Makefile.pre %{buildroot}%{_libdir}/python%{python_version}/config/ -%postun -n libpython2_7-1_0 -%{run_ldconfig} +%post -n libpython2_7-1_0 -p %{run_ldconfig} +%postun -n libpython2_7-1_0 -p %{run_ldconfig} %files -n python-devel %defattr(-, root, root) @@ -298,7 +257,6 @@ %defattr(644, root, root, 755) %{_libdir}/python%{python_version}/xml %{_libdir}/python%{python_version}/lib-dynload/pyexpat.so -#%files -n libpython%{lib_version} %files -n libpython2_7-1_0 %defattr(644, root, root) @@ -306,7 +264,7 @@ %files %defattr(644, root, root, 755) -%config /etc/rpm/macros.python +%config %{_sysconfdir}/rpm/macros.python %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/README %doc %{_docdir}/%{name}/LICENSE @@ -316,8 +274,8 @@ %dir %{_includedir}/python%{python_version} %{_includedir}/python%{python_version}/pyconfig.h %{_libdir}/python -%dir /usr/lib/python%{python_version} -%dir /usr/lib/python%{python_version}/site-packages +%dir %{_prefix}/lib/python%{python_version} +%dir %{_prefix}/lib/python%{python_version}/site-packages %dir %{_libdir}/python%{python_version} %dir %{_libdir}/python%{python_version}/config %{_libdir}/python%{python_version}/config/Setup @@ -343,13 +301,13 @@ %{_libdir}/python%{python_version}/site-packages/_local.pth %dir %{_libdir}/python%{python_version}/lib-dynload %{_libdir}/python%{python_version}/lib-dynload/_bisect.so -#%{_libdir}/python%{python_version}/lib-dynload/_bytesio.so +#%%{_libdir}/python%%{python_version}/lib-dynload/_bytesio.so %{_libdir}/python%{python_version}/lib-dynload/_csv.so %{_libdir}/python%{python_version}/lib-dynload/_collections.so %{_libdir}/python%{python_version}/lib-dynload/_ctypes.so %{_libdir}/python%{python_version}/lib-dynload/_ctypes_test.so %{_libdir}/python%{python_version}/lib-dynload/_elementtree.so -#%{_libdir}/python%{python_version}/lib-dynload/_fileio.so +#%%{_libdir}/python%%{python_version}/lib-dynload/_fileio.so %{_libdir}/python%{python_version}/lib-dynload/_functools.so %{_libdir}/python%{python_version}/lib-dynload/_heapq.so %{_libdir}/python%{python_version}/lib-dynload/_hotshot.so @@ -396,7 +354,7 @@ %{_libdir}/python%{python_version}/lib-dynload/zlib.so %{_libdir}/python%{python_version}/lib-dynload/_codecs*.so %{_libdir}/python%{python_version}/lib-dynload/_multibytecodec.so -%{_libdir}/python%{python_version}/lib-dynload/Python-%{tarversion}-py%{python_version}.egg-info +%{_libdir}/python%{python_version}/lib-dynload/Python-%{version}-py%{python_version}.egg-info # these modules don't support 64-bit arches (disabled by setup.py) %ifnarch alpha ia64 x86_64 s390x ppc64 sparc64 # requires sizeof(int) == sizeof(long) == sizeof(char*) @@ -404,9 +362,9 @@ %endif %attr(755, root, root) %{_bindir}/pydoc %attr(755, root, root) %{_bindir}/python -%attr(755, root, root) %{_bindir}/2to3 %attr(755, root, root) %{_bindir}/python%{python_version} %attr(755, root, root) %{_bindir}/smtpd.py %{_bindir}/python2 +%exclude %{_bindir}/2to3 %changelog ++++++ python-doc.spec ++++++ --- /var/tmp/diff_new_pack.IdweCR/_old 2012-03-05 14:03:07.000000000 +0100 +++ /var/tmp/diff_new_pack.IdweCR/_new 2012-03-05 14:03:07.000000000 +0100 @@ -18,51 +18,42 @@ Name: python-doc +Version: 2.7 +Release: 0 +License: Python-2.0 +Summary: Additional Package Documentation for Python Url: http://www.python.org/ -License: Python License .. Group: Development/Languages/Python -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Additional Package Documentation for Python. -Version: 2.7 -Release: 5 %define pyver 2.7.2 -BuildArch: noarch %define tarname Python-%{pyver} -%define pyname python -Enhances: %{pyname}=%{pyver} Source0: %{tarname}.tar.bz2 Source1: python-%{version}-docs-html.tar.bz2 Source2: python-%{version}-docs-pdf-a4.tar.bz2 Source3: python-%{version}-docs-pdf-letter.tar.bz2 -Provides: pyth_doc pyth_ps -Obsoletes: pyth_doc pyth_ps +Provides: pyth_doc +Provides: pyth_ps +Obsoletes: pyth_doc +Obsoletes: pyth_ps +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch +Enhances: python = %{pyver} %description Tutorial, Global Module Index, Language Reference, Library Reference, Extending and Embedding Reference, Python/C API Reference, Documenting Python, and Macintosh Module Reference in HTML format. - - %package pdf -License: Python License .. -Provides: pyth_pdf -Obsoletes: pyth_pdf Summary: Python PDF Documentation Group: Development/Languages/Python -AutoReqProv: on +Provides: pyth_pdf +Obsoletes: pyth_pdf %description pdf Tutorial, Global Module Index, Language Reference, Library Reference, Extending and Embedding Reference, Python/C API Reference, Documenting Python, and Macintosh Module Reference in PDF format. - - -Authors: --------- - Guido van Rossum <guido(a)python.org> - %prep %setup -q -n %{tarname} @@ -70,14 +61,14 @@ # nothing to do (...whistles innocently) %install -export PDOCS=${RPM_BUILD_ROOT}%{_docdir}/%{pyname} +export PDOCS=%{buildroot}%{_docdir}/python install -d -m 755 $PDOCS/Misc install -d -m 755 $PDOCS/paper-a4 $PDOCS/paper-letter $PDOCS/html -tar xfj %{S:1} -C $PDOCS/ +tar xfj %{SOURCE1} -C $PDOCS/ mv $PDOCS/python-%{version}-docs-html $PDOCS/html -tar xfj %{S:2} -C $PDOCS +tar xfj %{SOURCE2} -C $PDOCS mv $PDOCS/docs-pdf $PDOCS/paper-a4 -tar xfj %{S:3} -C $PDOCS +tar xfj %{SOURCE3} -C $PDOCS mv $PDOCS/docs-pdf $PDOCS/paper-letter install -c -m 644 Doc/ACKS.txt $PDOCS/ACKS.txt install -c -m 644 README $PDOCS/README @@ -85,20 +76,17 @@ [ -f $i ] && install -c -m 644 $i $PDOCS/Misc/ done -%clean -rm -rf $RPM_BUILD_ROOT - %files -%defattr(644, root, root, 755) -%dir %{_docdir}/%{pyname} -%doc %{_docdir}/%{pyname}/Misc -%doc %{_docdir}/%{pyname}/html -%doc %{_docdir}/%{pyname}/ACKS.txt -%doc %{_docdir}/%{pyname}/README +%defattr(644,root,root,755) +%dir %{_docdir}/python +%doc %{_docdir}/python/Misc +%doc %{_docdir}/python/html +%doc %{_docdir}/python/ACKS.txt +%doc %{_docdir}/python/README %files pdf -%defattr(644, root, root, 755) -%doc %{_docdir}/%{pyname}/paper-a4 -%doc %{_docdir}/%{pyname}/paper-letter +%defattr(644,root,root,755) +%doc %{_docdir}/python/paper-a4 +%doc %{_docdir}/python/paper-letter %changelog ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.IdweCR/_old 2012-03-05 14:03:07.000000000 +0100 +++ /var/tmp/diff_new_pack.IdweCR/_new 2012-03-05 14:03:07.000000000 +0100 @@ -15,23 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: python -BuildRequires: db-devel fdupes gdbm-devel gmp-devel libbz2-devel libopenssl-devel ncurses-devel readline-devel sqlite-devel tk-devel xorg-x11-devel automake -#Requires: openssl >= 0.9.8e +Version: 2.7.2 +Release: 0 +License: Python-2.0 +Summary: Python Interpreter Url: http://www.python.org/ -License: MIT License (or similar) Group: Development/Languages/Python -AutoReqProv: on -# bug437293 -%ifarch ppc64 -Obsoletes: python-64bit -%endif -# -Obsoletes: python-nothreads python21 python-elementtree python-sqlite -Summary: Python Interpreter -Version: 2.7.2 -Release: 5 -Requires: python-base = %{version} %define tarversion %{version} %define tarname Python-%{tarversion} Source0: %{tarname}.tar.bz2 @@ -62,10 +54,31 @@ Patch13: python-2.7.2-fix_date_time_compiler.patch Patch14: python-2.7.1-urllib-noproxy.patch # COMMON-PATCH-END -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define python_version %(echo %{version} | head -c 3) +BuildRequires: automake +BuildRequires: db-devel +BuildRequires: fdupes +BuildRequires: gdbm-devel +BuildRequires: gmp-devel +BuildRequires: libbz2-devel +BuildRequires: libopenssl-devel +BuildRequires: ncurses-devel +BuildRequires: readline-devel +BuildRequires: sqlite-devel +BuildRequires: tk-devel +BuildRequires: xorg-x11-devel +%define python_version %(echo %{tarversion} | head -c 3) %define idle_name idle +Requires: python-base = %{version} Provides: %{name} = %{python_version} +Obsoletes: python-elementtree +Obsoletes: python-nothreads +Obsoletes: python-sqlite +Obsoletes: python21 +# bug437293 +%ifarch ppc64 +Obsoletes: python-64bit +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Python is an interpreted, object-oriented programming language, and is @@ -76,16 +89,11 @@ If you want to install third party modules using distutils, you need to install python-devel package. -Authors: --------- - Guido van Rossum <guido(a)python.org> - %package idle -License: Python License .. -Requires: python-base = %{version} python-tk Summary: An Integrated Development Environment for Python Group: Development/Languages/Python -AutoReqProv: on +Requires: python-base = %{version} +Requires: python-tk %description idle IDLE is a Tkinter based integrated development environment for Python. @@ -93,81 +101,58 @@ colorizing, and many other things, as well as a Python shell window and a debugger. -Authors: --------- - Guido van Rossum <guido(a)python.org> - %package demo -License: Python License .. -Provides: pyth_dmo -Obsoletes: pyth_dmo -Requires: python-base = %{version} Summary: Python Demonstration Scripts Group: Development/Languages/Python -AutoReqProv: on +Requires: python-base = %{version} +Provides: pyth_dmo +Obsoletes: pyth_dmo %description demo Various demonstrations of what you can do with Python and a number of programs that are useful for building or extending Python. -Authors: --------- - Guido van Rossum <guido(a)python.org> - %package tk -License: Python License .. -Provides: pyth_tk python_tkinter_lib pyth_tkl python-tkinter +Summary: TkInter - Python Tk Interface +Group: Development/Libraries/Python +Requires: python-base = %{version} +Provides: pyth_tk +Provides: pyth_tkl +Provides: python-tkinter +Provides: python_tkinter_lib #%ifarch %ix86 #Provides: _tkinter.so #%endif -Obsoletes: pyth_tk pyth_tkl python-tkinter -Requires: python-base = %{version} -Summary: TkInter - Python Tk Interface -Group: Development/Libraries/Python -AutoReqProv: on +Obsoletes: pyth_tk +Obsoletes: pyth_tkl +Obsoletes: python-tkinter %description tk Python interface to Tk. Tk is the GUI toolkit that comes with Tcl. The "xrpm" package uses this Python interface. -Authors: --------- - Guido van Rossum <guido(a)python.org> - %package curses -License: Python License .. +Summary: Python Interface to the (N)Curses Library +Group: Development/Libraries/Python Requires: python-base = %{version} Obsoletes: pyth_cur Provides: pyth_cur -Summary: Python Interface to the (N)Curses Library -Group: Development/Libraries/Python -AutoReqProv: on %description curses An easy to use interface to the (n)curses CUI library. CUI stands for Console User Interface. -Authors: --------- - Guido van Rossum <guido(a)python.org> - %package gdbm -License: MIT License (or similar) +Summary: Python Interface to the GDBM Library +Group: Development/Libraries/Python Requires: python-base = %{version} Obsoletes: pygdmod Provides: pygdmod -Summary: Python Interface to the GDBM Library -Group: Development/Libraries/Python -AutoReqProv: on %description gdbm An easy to use interface for GDBM databases. GDBM is the GNU implementation of the standard Unix DBM databases. -Authors: --------- - Guido van Rossum <guido(a)python.org> - %prep %setup -q -n %{tarname} # COMMON-PREP-BEGIN @@ -197,24 +182,21 @@ # necessary for correct linking with GDBM: export SUSE_ASNEEDED=0 -export OPT="$RPM_OPT_FLAGS" +export OPT="%{optflags}" autoreconf -f -i . # Modules/_ctypes/libffi # prevent make from trying to rebuild asdl stuff, which requires existing # python installation touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h -./configure \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ +%configure \ --docdir=%{_docdir}/python \ --enable-ipv6 \ --with-fpectl \ --enable-shared \ --enable-unicode=ucs4 -make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT +make %{?_smp_mflags} %check # on hppa, the threading of glibc is quite broken. The tests just stop @@ -236,114 +218,111 @@ ######################################## # install it ######################################## -make \ - OPT="$RPM_OPT_FLAGS -fPIC" \ - DESTDIR=$RPM_BUILD_ROOT \ - install +%make_install OPT="%{optflags} -fPIC" ######################################## # some cleanups ######################################## # remove hard links and replace them with symlinks for dir in bin include %{_lib} ; do - rm -f $RPM_BUILD_ROOT/%{_prefix}/$dir/python - ln -s python%{python_version} $RPM_BUILD_ROOT/%{_prefix}/$dir/python + rm -f %{buildroot}/%{_prefix}/$dir/python + ln -s python%{python_version} %{buildroot}/%{_prefix}/$dir/python done # kill imageop.so, it's insecure -rm -f $RPM_BUILD_ROOT/%{_libdir}/python%{python_version}/lib-dynload/imageop.so +rm -f %{buildroot}/%{_libdir}/python%{python_version}/lib-dynload/imageop.so #cleanup for -base -rm $RPM_BUILD_ROOT%{_bindir}/python{,%{python_version}} -rm $RPM_BUILD_ROOT%{_bindir}/smtpd.py -rm $RPM_BUILD_ROOT%{_bindir}/pydoc -rm $RPM_BUILD_ROOT%{_bindir}/2to3 -rm $RPM_BUILD_ROOT%{_mandir}/man1/python* -rm $RPM_BUILD_ROOT%{_libdir}/libpython*.so.* -rm $RPM_BUILD_ROOT%{_libdir}/python -find $RPM_BUILD_ROOT%{_libdir}/python%{python_version} -maxdepth 1 ! $ -name "ssl.py" $ -exec rm {} ";" -rm $RPM_BUILD_ROOT%{_bindir}/python%{python_version}-config -rm $RPM_BUILD_ROOT%{_bindir}/python-config -rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/* -rm -r $RPM_BUILD_ROOT%{_includedir}/python -rm -r $RPM_BUILD_ROOT%{_includedir}/python%{python_version} -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/compiler -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/config -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/ctypes -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/distutils -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/email -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/encodings -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/hotshot -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/importlib -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/json -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib2to3 -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/logging -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/multiprocessing -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/plat-* -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/pydoc_data -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/test -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/unittest -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/wsgiref -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/xml -rm $RPM_BUILD_ROOT%{_libdir}/libpython%{python_version}.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages/README -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_bisect.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_csv.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_collections.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_ctypes.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_ctypes_test.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_elementtree.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_functools.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_heapq.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_hotshot.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_io.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_json.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_locale.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_lsprof.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_multiprocessing.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_random.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_socket.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_struct.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_testcapi.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/array.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/binascii.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/bz2.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/cPickle.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/cStringIO.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/cmath.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/crypt.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/datetime.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/fcntl.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/future_builtins.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/grp.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/itertools.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/linuxaudiodev.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/math.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/mmap.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/nis.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/operator.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/ossaudiodev.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/parser.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/pyexpat.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/resource.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/select.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/spwd.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/strop.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/syslog.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/termios.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/time.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/unicodedata.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/zlib.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_codecs*.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_multibytecodec.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/audioop.so -rm -f $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/dl.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/Python-%{tarversion}-py%{python_version}.egg-info +rm %{buildroot}%{_bindir}/python{,%{python_version}} +rm %{buildroot}%{_bindir}/smtpd.py +rm %{buildroot}%{_bindir}/pydoc +rm %{buildroot}%{_bindir}/2to3 +rm %{buildroot}%{_mandir}/man1/python* +rm %{buildroot}%{_libdir}/libpython*.so.* +rm %{buildroot}%{_libdir}/python +find %{buildroot}%{_libdir}/python%{python_version} -maxdepth 1 ! $ -name "ssl.py" $ -exec rm {} ";" +rm %{buildroot}%{_bindir}/python%{python_version}-config +rm %{buildroot}%{_bindir}/python-config +rm %{buildroot}%{_libdir}/pkgconfig/* +rm -r %{buildroot}%{_includedir}/python +rm -r %{buildroot}%{_includedir}/python%{python_version} +rm -r %{buildroot}%{_libdir}/python%{python_version}/compiler +rm -r %{buildroot}%{_libdir}/python%{python_version}/config +rm -r %{buildroot}%{_libdir}/python%{python_version}/ctypes +rm -r %{buildroot}%{_libdir}/python%{python_version}/distutils +rm -r %{buildroot}%{_libdir}/python%{python_version}/email +rm -r %{buildroot}%{_libdir}/python%{python_version}/encodings +rm -r %{buildroot}%{_libdir}/python%{python_version}/hotshot +rm -r %{buildroot}%{_libdir}/python%{python_version}/importlib +rm -r %{buildroot}%{_libdir}/python%{python_version}/json +rm -r %{buildroot}%{_libdir}/python%{python_version}/lib2to3 +rm -r %{buildroot}%{_libdir}/python%{python_version}/logging +rm -r %{buildroot}%{_libdir}/python%{python_version}/multiprocessing +rm -r %{buildroot}%{_libdir}/python%{python_version}/plat-* +rm -r %{buildroot}%{_libdir}/python%{python_version}/pydoc_data +rm -r %{buildroot}%{_libdir}/python%{python_version}/test +rm -r %{buildroot}%{_libdir}/python%{python_version}/unittest +rm -r %{buildroot}%{_libdir}/python%{python_version}/wsgiref +rm -r %{buildroot}%{_libdir}/python%{python_version}/xml +rm %{buildroot}%{_libdir}/libpython%{python_version}.so +rm %{buildroot}%{_libdir}/python%{python_version}/site-packages/README +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_bisect.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_csv.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_collections.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_ctypes.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_ctypes_test.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_elementtree.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_functools.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_heapq.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_hotshot.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_io.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_json.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_locale.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_lsprof.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_multiprocessing.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_random.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_socket.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_struct.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_testcapi.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/array.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/binascii.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/bz2.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/cPickle.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/cStringIO.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/cmath.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/crypt.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/datetime.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/fcntl.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/future_builtins.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/grp.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/itertools.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/linuxaudiodev.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/math.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/mmap.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/nis.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/operator.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/ossaudiodev.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/parser.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/pyexpat.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/resource.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/select.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/spwd.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/strop.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/syslog.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/termios.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/time.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/unicodedata.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/zlib.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_codecs*.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/_multibytecodec.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/audioop.so +rm -f %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/dl.so +rm %{buildroot}%{_libdir}/python%{python_version}/lib-dynload/Python-%{version}-py%{python_version}.egg-info # replace duplicate .pyo/.pyc with hardlinks -%fdupes $RPM_BUILD_ROOT/%{_libdir}/python%{python_version} +%fdupes %{buildroot}/%{_libdir}/python%{python_version} ######################################## # documentation ######################################## -export PDOCS=${RPM_BUILD_ROOT}%{_docdir}/%{name} +export PDOCS=%{buildroot}%{_docdir}/%{name} install -d -m 755 $PDOCS -install -c -m 644 %{S:1} $PDOCS/ +install -c -m 644 %{SOURCE1} $PDOCS/ install -c -m 644 LICENSE $PDOCS/ install -c -m 644 README $PDOCS/ ######################################## @@ -358,23 +337,20 @@ # idle ######################################## # move idle config into /etc -install -d -m755 ${RPM_BUILD_ROOT}/etc/%{idle_name} +install -d -m755 %{buildroot}%{_sysconfdir}/%{idle_name} ( - cd ${RPM_BUILD_ROOT}/%{_libdir}/python%{python_version}/idlelib/ + cd %{buildroot}/%{_libdir}/python%{python_version}/idlelib/ for file in *.def ; do - mv $file ${RPM_BUILD_ROOT}/etc/%{idle_name}/ - ln -sf /etc/%{idle_name}/$file ${RPM_BUILD_ROOT}/%{_libdir}/python%{python_version}/idlelib/ + mv $file %{buildroot}%{_sysconfdir}/%{idle_name}/ + ln -sf /etc/%{idle_name}/$file %{buildroot}/%{_libdir}/python%{python_version}/idlelib/ done ) ######################################## # startup script ######################################## -install -m 644 %{S:2} $RPM_BUILD_ROOT/etc -install -d -m 755 $RPM_BUILD_ROOT/etc/profile.d -install -m 644 %{S:3} %{S:4} $RPM_BUILD_ROOT/etc/profile.d - -%clean -rm -rf $RPM_BUILD_ROOT +install -m 644 %{SOURCE2} %{buildroot}/etc +install -d -m 755 %{buildroot}%{_sysconfdir}/profile.d +install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d %post -p /sbin/ldconfig @@ -382,8 +358,8 @@ %files idle %defattr(644, root, root, 755) -%dir /etc/%{idle_name} -%config /etc/%{idle_name}/* +%dir %{_sysconfdir}/%{idle_name} +%config %{_sysconfdir}/%{idle_name}/* %doc Lib/idlelib/NEWS.txt %doc Lib/idlelib/README.txt %doc Lib/idlelib/TODO.txt @@ -419,8 +395,8 @@ %doc %{_docdir}/%{name}/README %doc %{_docdir}/%{name}/LICENSE %doc %{_docdir}/%{name}/README.SUSE -%config /etc/pythonstart -%config /etc/profile.d/python.* +%config %{_sysconfdir}/pythonstart +%config %{_sysconfdir}/profile.d/python.* %dir %{_libdir}/python%{python_version} %{_libdir}/python%{python_version}/ssl.py* %{_libdir}/python%{python_version}/bsddb -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit php5-pear-Horde_Core for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package php5-pear-Horde_Core for openSUSE:Factory checked in at 2012-03-05 14:02:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-Horde_Core (Old) and /work/SRC/openSUSE:Factory/.php5-pear-Horde_Core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-Horde_Core", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-Horde_Core/php5-pear-Horde_Core.changes 2011-09-23 12:40:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5-pear-Horde_Core.new/php5-pear-Horde_Core.changes 2012-03-05 14:02:57.000000000 +0100 @@ -1,0 +2,74 @@ +Wed Feb 22 16:00:27 UTC 2012 - Ralf Lang <lang(a)b1-systems.de> + +- version 1.8.4 +- [mjr] Fix issue with autocompletion that would cause it to fail in certain circumstances (Bug #10904). +- [mms] Remove trailing semicolon when replacing @import statements. +- [mjr] Fix issue that could cause failure of ActiveSync due to incorrect packing of binary data. +- [jan] Use separate database connection for SQL session handler (Bug #10906). +- [mms] Fix parsing DB config when using splitread database setup. + +------------------------------------------------------------------- +Tue Jan 10 10:19:35 UTC 2012 - lang(a)b1-systems.de + +- version 1.8.3 +- ships license +- [rla] Add locking routines to Horde_Core_Auth_Application. +- [rla] Add support for Horde_Auth's new locking feature. +- [jan] Fix generating of URLs if both the webroot and the original URL are full URLs. +- [mjr] Support additional GAL fields (Bug #10504). +- [jan] Allow to pass a configuration array to the LDAP factory. +- [mms] Revamp and fix Horde_Registry#removeUserData(); this method should now be the sole access point to delete user data for any/all apps (Bug #10241). +- [mms] Correctly apply value of $conf['session']['timeout'] to PHP environment. +- [mms] Fix cookie timeouts. +- [jan] Fix PostgreSQL DSN when using SQL authentication (Bug #10538). +- [mjr] Add factory for Horde_Service_UrlShortener. +- [mms] Fix minChars behavior in autocomplete javascript code. +- [mms] Allow in-page base64 image encoding to be disabled via Horde configuration. +- [jan] Allow both application and interface names in <configspecial>. +- [jan] Fix resetting authentication credentials (Bug #10228). +- [jan] Correctly render keyval_multienum form field contents. +- [jan] Don't use Xcache in CLI scripts (Bug #10288). +- [mms] Detect @import tags in CSS and add to compressed data. +- [mjr] Add ability to remove temporary files at session shutdown. +- [jan] Fix tests to work with PHPUnit 3.6. +- [mjr] Add Horde_Service_Weather factory. +- [mms] Fix importing CSS data in cache files. +- [gwr] Fixed hiding menu entries that should not be displayed to admin. +- [mjr] Allow separate ActiveSync logs per device. +- [jan] Make the lifetime of cached weather information configurable (Arjen de Korte, Request #10848). +- [gwr] Fixed Kolab anonymous bind. +- [mjr] Fix implementation of SENDMAIL ActiveSync command. Fixes sending of meeting requests from device. +- [mjr] Fix issue that caused ActiveSync failure when using device specific logging in certain cases. +- [mms] Fix merging config data (Bug #10381). + + +------------------------------------------------------------------- +Sat Aug 27 19:27:44 UTC 2011 - lang(a)b1-systems.de + +- version 1.4.0 +- [rla] Display permissions of hidden apps too +- [gwr] Do not fail when no basedn is set for the Horde_Kolab_Server configuration. +- [mms] When reopening sessions, ensure that we don't alter session information if the authentication status changed (Bug #10403). +- [jan] Use 'ident' option of Horde_Log handlers to prefix log messages (Gonçalo Queirós <goncalo.queiros(a)portugalmail.net>, Request #9322). +- [jan] Check applications' authValidate() method if present. +- [mms] Add Horde_Session::isActive(). +- [mjr] Add remove button to image fields (Request #9870). + + +------------------------------------------------------------------- +Sun Aug 14 20:23:59 UTC 2011 - lang(a)b1-systems.de + +- version 1.3.1 +- [jan] Update Latvian translation. +- [jan] Don't set optional integer fields to 0 when automatically updating configuration. +- [mjr] Fix recurring event exception handling for ActiveSync. +- [mms] Fix removing user data from applications (Bug #10241). +- [jan] Update Lithuanian translation. +- [jan] Update Brazilian Portuguese translation. +- [jan] Fix generating database DSN for VFS if the global VFS configuration doesn't use SQL (Bug #10199). +- [jan] Add option to Horde_Themes_Css#getStylesheetUrls() to never use CSS cache. +- [jan] Add Horde_Menu#setMask() (Vilius Sumskas, Request #10078). +- [jan] Allow configuration of split read databases for PostgreSQL (Request #7025). +- [mms] Make sure appinitialized hook gets full application environment. + +------------------------------------------------------------------- @@ -14 +88 @@ -- remove cleaning buildroot in install as suggested by peilicke +- remove cleaning buildroot in install Old: ---- Horde_Core-1.2.1.tgz New: ---- Horde_Core-1.8.4.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-Horde_Core.spec ++++++ --- /var/tmp/diff_new_pack.qr6oSo/_old 2012-03-05 14:02:59.000000000 +0100 +++ /var/tmp/diff_new_pack.qr6oSo/_new 2012-03-05 14:02:59.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package php5-pear-Horde_Core # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -20,13 +20,13 @@ %define xmldir /var/lib/pear %define hordedir /usr/share/php5/PEAR/www/horde -Summary: PEAR: Horde Core Framework libraries +Summary: Horde Core Framework libraries +License: LGPL-2.1 +Group: Development/Libraries/PHP Name: php5-pear-Horde_Core -Version: 1.2.1 -Release: 1 -License: LGPLv3 -Group: Development/Libraries/PHP +Version: 1.8.4 +Release: 0 Source0: http://pear.horde.org/get/Horde_Core-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://pear.horde.org/package/Horde_Core @@ -71,8 +71,8 @@ Requires: php5-pear-Horde_Util < 2.0.0, Requires: php5-pear-Horde_View < 2.0.0 Requires: php5-pear >= 1.7.0 -Conflicts: php5-pear-Horde_ActiveSync = 2.0.0, php5-pear-Horde_Alarm = 2.0.0, php5-pear-Horde_Auth = 2.0.0, php5-pear-Horde_Autoloader = 2.0.0, php5-pear-Horde_Browser = 2.0.0, php5-pear-Horde_Cache = 2.0.0, php5-pear-Horde_Cli = 2.0.0, php5-pear-Horde_Compress = 2.0.0, php5-pear-Horde_Controller = 2.0.0, php5-pear-Horde_Data = 2.0.0, php5-pear-Horde_Date = 2.0.0, php5-pear-Horde_Exception = 2.0.0, php5-pear-Horde_Group = 2.0.0, php5-pear-Horde_History = 2.0.0, php5-pear-Horde_Injector = 2.0.0, php5-pear-Horde_Lock = 2.0.0, php5-pear-Horde_Log = 2.0.0, php5-pear-Horde_LoginTasks = 2.0.0, php5-pear-Horde_Mime = 2.0.0, php5-pear-Horde_Mime_Viewer = 2.0.0, php5-pear-Horde_Notification = 2.0.0, php5-pear-Horde_Perms = 2.0.0, php5-pear-Horde_Prefs = 2.0.0, php5-pear-Horde_Secret = 2.0.0, php5-pear-Horde_Serialize = 2.0.0, php5-pear-Horde_SessionHandler = 2.0.0, php5-pear-Horde_Share = 2.0.0, php5-pear-Horde_Support = 2.0.0, php5-pear-Horde_Translation = 2.0.0, php5-pear-Horde_Template = 2.0.0, php5-pear-Horde_Token = 2.0.0, php5-pear-Horde_Template = 2.0.0, php5-pear-Horde_Translation = 2.0.0, php5-pear-Horde_Url = 2.0.0, php5-pear-Horde_Util = 2.0.0, php5-pear-Horde_View = 2.0.0 -BuildRequires: php5-pear-Horde_Role php5-pear-channel-horde +BuildRequires: php5-pear-Horde_Role +BuildRequires: php5-pear-channel-horde Requires: php5-pear-channel-horde, php5-pear-Horde_Role php5-json BuildArch: noarch %define pear_name Horde_Core @@ -132,5 +132,6 @@ %{xmldir}/Horde_Core.xml %{hordedir}/js/* %dir %{hordedir}/js +%doc %{_docdir}/%{name} %changelog ++++++ Horde_Core-1.2.1.tgz -> Horde_Core-1.8.4.tgz ++++++ ++++ 153943 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-MooseX-Types for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package perl-MooseX-Types for openSUSE:Factory checked in at 2012-03-05 14:02:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-MooseX-Types (Old) and /work/SRC/openSUSE:Factory/.perl-MooseX-Types.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-MooseX-Types", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-MooseX-Types/perl-MooseX-Types.changes 2012-01-04 07:28:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-MooseX-Types.new/perl-MooseX-Types.changes 2012-03-05 14:02:53.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 14 07:46:07 UTC 2012 - coolo(a)suse.com + +- updated to 0.31 + - Add support for qw( :all ) on MooseX::Types::Combine libraries. + +------------------------------------------------------------------- Old: ---- MooseX-Types-0.30.tar.gz New: ---- MooseX-Types-0.31.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-MooseX-Types.spec ++++++ --- /var/tmp/diff_new_pack.xutGPw/_old 2012-03-05 14:02:55.000000000 +0100 +++ /var/tmp/diff_new_pack.xutGPw/_new 2012-03-05 14:02:55.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-MooseX-Types # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -21,10 +21,10 @@ %endif Name: perl-MooseX-Types -Version: 0.30 +Version: 0.31 Release: 0 Summary: Organise your Moose types in libraries -License: Artistic-1.0 or GPL-2.0+ +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Source: ftp://ftp.cpan.org/pub/CPAN/authors/id/D/DR/DROLSKY/MooseX-Types-%{version}… Url: http://search.cpan.org/dist/MooseX-Types @@ -44,14 +44,14 @@ BuildRequires: perl(Scalar::Util) >= 1.19 BuildRequires: perl(Sub::Name) BuildRequires: perl(Carp) -BuildRequires: perl(namespace::clean) >= 0.08 +BuildRequires: perl(namespace::clean) >= 0.19 BuildRequires: perl(Sub::Install) >= 0.924 BuildRequires: perl(Carp::Clan) >= 6.00 BuildRequires: perl(Moose) >= 1.06 Requires: perl(Scalar::Util) >= 1.19 Requires: perl(Sub::Name) Requires: perl(Carp) -Requires: perl(namespace::clean) >= 0.08 +Requires: perl(namespace::clean) >= 0.19 Requires: perl(Sub::Install) >= 0.924 Requires: perl(Carp::Clan) >= 6.00 Requires: perl(Moose) >= 1.06 ++++++ MooseX-Types-0.30.tar.gz -> MooseX-Types-0.31.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Types-0.30/Changes new/MooseX-Types-0.31/Changes --- old/MooseX-Types-0.30/Changes 2011-09-18 04:40:33.000000000 +0200 +++ new/MooseX-Types-0.31/Changes 2011-12-23 00:43:56.000000000 +0100 @@ -1,5 +1,8 @@ Revision history for MooseX-Types +0.31 2011-12-22 + - Add support for qw( :all ) on MooseX::Types::Combine libraries. (kentnl) + 0.30 2011-09-17 - Fix a bug in the tests that caused failures with Moose HEAD. (doy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Types-0.30/META.json new/MooseX-Types-0.31/META.json --- old/MooseX-Types-0.30/META.json 2011-09-18 04:40:33.000000000 +0200 +++ new/MooseX-Types-0.31/META.json 2011-12-23 00:43:56.000000000 +0100 @@ -4,7 +4,7 @@ "Robert \"phaylon\" Sedlacek <rs(a)474.at>" ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 4.300000, CPAN::Meta::Converter version 2.110930", + "generated_by" : "Dist::Zilla version 4.300005, CPAN::Meta::Converter version 2.112150", "license" : [ "perl_5" ], @@ -53,6 +53,6 @@ "web" : "http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo/MooseX-Types.git;a=sum…" } }, - "version" : "0.30" + "version" : "0.31" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Types-0.30/META.yml new/MooseX-Types-0.31/META.yml --- old/MooseX-Types-0.30/META.yml 2011-09-18 04:40:33.000000000 +0200 +++ new/MooseX-Types-0.31/META.yml 2011-12-23 00:43:56.000000000 +0100 @@ -11,7 +11,7 @@ configure_requires: ExtUtils::MakeMaker: 6.30 dynamic_config: 0 -generated_by: 'Dist::Zilla version 4.300000, CPAN::Meta::Converter version 2.110930' +generated_by: 'Dist::Zilla version 4.300005, CPAN::Meta::Converter version 2.112150' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -29,4 +29,4 @@ resources: bugtracker: http://rt.cpan.org/NoAuth/Bugs.html?Dist=MooseX-Types repository: git://git.moose.perl.org/MooseX-Types.git -version: 0.30 +version: 0.31 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Types-0.30/Makefile.PL new/MooseX-Types-0.31/Makefile.PL --- old/MooseX-Types-0.30/Makefile.PL 2011-09-18 04:40:33.000000000 +0200 +++ new/MooseX-Types-0.31/Makefile.PL 2011-12-23 00:43:56.000000000 +0100 @@ -34,7 +34,7 @@ "Sub::Name" => 0, "namespace::clean" => "0.19" }, - "VERSION" => "0.30", + "VERSION" => "0.31", "test" => { "TESTS" => "t/*.t t/regressions/*.t" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Types-0.30/README new/MooseX-Types-0.31/README --- old/MooseX-Types-0.30/README 2011-09-18 04:40:33.000000000 +0200 +++ new/MooseX-Types-0.31/README 2011-12-23 00:43:56.000000000 +0100 @@ -1,7 +1,7 @@ This archive contains the distribution MooseX-Types, -version 0.30: +version 0.31: Organise your Moose types in libraries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Types-0.30/dist.ini new/MooseX-Types-0.31/dist.ini --- old/MooseX-Types-0.30/dist.ini 2011-09-18 04:40:33.000000000 +0200 +++ new/MooseX-Types-0.31/dist.ini 2011-12-23 00:43:56.000000000 +0100 @@ -3,7 +3,7 @@ license = Perl_5 copyright_holder = Robert "phaylon" Sedlacek -version = 0.30 +version = 0.31 [NextRelease] format = %-7v %{yyyy-MM-dd}d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Types-0.30/lib/MooseX/Types/Base.pm new/MooseX-Types-0.31/lib/MooseX/Types/Base.pm --- old/MooseX-Types-0.30/lib/MooseX/Types/Base.pm 2011-09-18 04:40:33.000000000 +0200 +++ new/MooseX-Types-0.31/lib/MooseX/Types/Base.pm 2011-12-23 00:43:56.000000000 +0100 @@ -1,6 +1,6 @@ package MooseX::Types::Base; { - $MooseX::Types::Base::VERSION = '0.30'; + $MooseX::Types::Base::VERSION = '0.31'; } use Moose; @@ -209,7 +209,7 @@ =head1 VERSION -version 0.30 +version 0.31 =head1 DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Types-0.30/lib/MooseX/Types/CheckedUtilExports.pm new/MooseX-Types-0.31/lib/MooseX/Types/CheckedUtilExports.pm --- old/MooseX-Types-0.30/lib/MooseX/Types/CheckedUtilExports.pm 2011-09-18 04:40:33.000000000 +0200 +++ new/MooseX-Types-0.31/lib/MooseX/Types/CheckedUtilExports.pm 2011-12-23 00:43:56.000000000 +0100 @@ -1,6 +1,6 @@ package MooseX::Types::CheckedUtilExports; { - $MooseX::Types::CheckedUtilExports::VERSION = '0.30'; + $MooseX::Types::CheckedUtilExports::VERSION = '0.31'; } #ABSTRACT: Wrap L<Moose::Util::TypeConstraints> to be safer for L<MooseX::Types> @@ -70,7 +70,7 @@ =head1 VERSION -version 0.30 +version 0.31 =head1 DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Types-0.30/lib/MooseX/Types/Combine.pm new/MooseX-Types-0.31/lib/MooseX/Types/Combine.pm --- old/MooseX-Types-0.30/lib/MooseX/Types/Combine.pm 2011-09-18 04:40:33.000000000 +0200 +++ new/MooseX-Types-0.31/lib/MooseX/Types/Combine.pm 2011-12-23 00:43:56.000000000 +0100 @@ -1,6 +1,6 @@ package MooseX::Types::Combine; { - $MooseX::Types::Combine::VERSION = '0.30'; + $MooseX::Types::Combine::VERSION = '0.31'; } # ABSTRACT: Combine type libraries for exporting @@ -16,6 +16,12 @@ my %types = $class->_provided_types; + if ( grep { $_ eq ':all' } @types ) { + $_->import( { -into => $caller }, q{:all} ) + for $class->provide_types_from; + return; + } + my %from; for my $type (@types) { unless ($types{$type}) { @@ -88,7 +94,7 @@ =head1 VERSION -version 0.30 +version 0.31 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Types-0.30/lib/MooseX/Types/Moose.pm new/MooseX-Types-0.31/lib/MooseX/Types/Moose.pm --- old/MooseX-Types-0.30/lib/MooseX/Types/Moose.pm 2011-09-18 04:40:33.000000000 +0200 +++ new/MooseX-Types-0.31/lib/MooseX/Types/Moose.pm 2011-12-23 00:43:56.000000000 +0100 @@ -1,6 +1,6 @@ package MooseX::Types::Moose; { - $MooseX::Types::Moose::VERSION = '0.30'; + $MooseX::Types::Moose::VERSION = '0.31'; } # ABSTRACT: Type exports that match the types shipped with L<Moose> @@ -35,7 +35,7 @@ =head1 VERSION -version 0.30 +version 0.31 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Types-0.30/lib/MooseX/Types/TypeDecorator.pm new/MooseX-Types-0.31/lib/MooseX/Types/TypeDecorator.pm --- old/MooseX-Types-0.30/lib/MooseX/Types/TypeDecorator.pm 2011-09-18 04:40:33.000000000 +0200 +++ new/MooseX-Types-0.31/lib/MooseX/Types/TypeDecorator.pm 2011-12-23 00:43:56.000000000 +0100 @@ -1,6 +1,6 @@ package MooseX::Types::TypeDecorator; { - $MooseX::Types::TypeDecorator::VERSION = '0.30'; + $MooseX::Types::TypeDecorator::VERSION = '0.31'; } #ABSTRACT: Wraps Moose::Meta::TypeConstraint objects with added features @@ -172,7 +172,7 @@ =head1 VERSION -version 0.30 +version 0.31 =head1 DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Types-0.30/lib/MooseX/Types/UndefinedType.pm new/MooseX-Types-0.31/lib/MooseX/Types/UndefinedType.pm --- old/MooseX-Types-0.30/lib/MooseX/Types/UndefinedType.pm 2011-09-18 04:40:33.000000000 +0200 +++ new/MooseX-Types-0.31/lib/MooseX/Types/UndefinedType.pm 2011-12-23 00:43:56.000000000 +0100 @@ -1,6 +1,6 @@ package MooseX::Types::UndefinedType; { - $MooseX::Types::UndefinedType::VERSION = '0.30'; + $MooseX::Types::UndefinedType::VERSION = '0.31'; } use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Types-0.30/lib/MooseX/Types/Util.pm new/MooseX-Types-0.31/lib/MooseX/Types/Util.pm --- old/MooseX-Types-0.30/lib/MooseX/Types/Util.pm 2011-09-18 04:40:33.000000000 +0200 +++ new/MooseX-Types-0.31/lib/MooseX/Types/Util.pm 2011-12-23 00:43:56.000000000 +0100 @@ -1,6 +1,6 @@ package MooseX::Types::Util; { - $MooseX::Types::Util::VERSION = '0.30'; + $MooseX::Types::Util::VERSION = '0.31'; } #ABSTRACT: Common utility functions for the distribution @@ -53,7 +53,7 @@ =head1 VERSION -version 0.30 +version 0.31 =head1 DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Types-0.30/lib/MooseX/Types/Wrapper.pm new/MooseX-Types-0.31/lib/MooseX/Types/Wrapper.pm --- old/MooseX-Types-0.30/lib/MooseX/Types/Wrapper.pm 2011-09-18 04:40:33.000000000 +0200 +++ new/MooseX-Types-0.31/lib/MooseX/Types/Wrapper.pm 2011-12-23 00:43:56.000000000 +0100 @@ -1,6 +1,6 @@ package MooseX::Types::Wrapper; { - $MooseX::Types::Wrapper::VERSION = '0.30'; + $MooseX::Types::Wrapper::VERSION = '0.31'; } #ABSTRACT: Wrap exports from a library @@ -48,7 +48,7 @@ =head1 VERSION -version 0.30 +version 0.31 =head1 DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Types-0.30/lib/MooseX/Types.pm new/MooseX-Types-0.31/lib/MooseX/Types.pm --- old/MooseX-Types-0.30/lib/MooseX/Types.pm 2011-09-18 04:40:33.000000000 +0200 +++ new/MooseX-Types-0.31/lib/MooseX/Types.pm 2011-12-23 00:43:56.000000000 +0100 @@ -1,6 +1,6 @@ package MooseX::Types; { - $MooseX::Types::VERSION = '0.30'; + $MooseX::Types::VERSION = '0.31'; } use Moose; @@ -176,7 +176,7 @@ =head1 VERSION -version 0.30 +version 0.31 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MooseX-Types-0.30/t/18_combined_libs.t new/MooseX-Types-0.31/t/18_combined_libs.t --- old/MooseX-Types-0.30/t/18_combined_libs.t 2011-09-18 04:40:33.000000000 +0200 +++ new/MooseX-Types-0.31/t/18_combined_libs.t 2011-12-23 00:43:56.000000000 +0100 @@ -36,4 +36,6 @@ 'cannot combine types from a package which does not exist'; } +is exception { 'Combined'->import(':all') }, undef, ':all syntax works'; + done_testing(); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-File-Path-Tiny for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package perl-File-Path-Tiny for openSUSE:Factory checked in at 2012-03-05 14:02:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-File-Path-Tiny (Old) and /work/SRC/openSUSE:Factory/.perl-File-Path-Tiny.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-File-Path-Tiny", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-File-Path-Tiny/perl-File-Path-Tiny.changes 2011-12-21 13:07:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-File-Path-Tiny.new/perl-File-Path-Tiny.changes 2012-03-05 14:02:45.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 13 10:51:59 UTC 2012 - coolo(a)suse.com + +- regenerate with cpanspec + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-File-Path-Tiny.spec ++++++ --- /var/tmp/diff_new_pack.4WiKyO/_old 2012-03-05 14:02:46.000000000 +0100 +++ /var/tmp/diff_new_pack.4WiKyO/_new 2012-03-05 14:02:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-File-Path-Tiny # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,57 +16,86 @@ # - Name: perl-File-Path-Tiny Version: 0.1 Release: 0 -Summary: Recursive mkdir and rmdir -Source: http://search.cpan.org/CPAN/authors/id/D/DM/DMUEY/File-Path-Tiny-%{version}… -Url: http://search.cpan.org/dist/File-Path-Tiny +%define cpan_name File-Path-Tiny +Summary: recursive versions of mkdir() and rmdir() without as much overhead as Fi[cut] +License: GPL-1.0+ or Artistic-1.0 Group: Development/Libraries/Perl -License: GNU General Public License version 2 or later or Artistic (GPLv2+ or Artistic) +Url: http://search.cpan.org/dist/File-Path-Tiny/ +Source: http://www.cpan.org/authors/id/D/DM/DMUEY/%{cpan_name}-%{version}.tar.gz +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} +BuildRequires: perl BuildRequires: perl-macros -BuildRequires: make -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(Test::More) -%if 0%{?suse_version} >= 1120 -BuildArch: noarch -%endif +%{perl_requires} %description -The goal here is simply to provide recursive versions of mkdir() and -rmdir() with as little code and overhead as possible. -This module is in no way meant to derogate File::Path and is in no way an -endorsement to go out and replace all use of File::Path with -File::Path::Tiny. +The goal here is simply to provide recursive versions of the mkdir +manpage() and the rmdir manpage() with as little code and overhead as +possible. + +This module is in no way meant to derogate the File::Path manpage and is in +no way an endorsement to go out and replace all use of the File::Path +manpage with the File::Path::Tiny manpage. + +the File::Path manpage is very good at what it does but there's simply a +lot happening that we can do without much of the time. + +Here are some things the File::Path manpage has/does that this module +attempts to do without: + +* * multiple interfaces + + Backwards compatibility brings in a lot of code and logic that we don't + need from here on out. + +* * chdir's + + It does a ton of chdir's which could leave you somewhere you're not + planning on being and requires much more overhead to do. + +* * can croak not allowing you to detect and handle failure + + Just let me handle errors how I want. Don't make my entire app die or + have to wrap it in an eval + +* * A well intentioned output system + + Just let me do the output how I want. (Nothing, As HTML, print to a + filehandle, etc...) + +* * A well intentioned and experimental (IE subject to change) error + handling system. + + Just keep it simple and detect failure via a boolean check and do what I + want with the error. See the /"How can I make/remove multiple paths?" + manpage + +* * According to its POD, removing a tree is apparently not safe unless you + tell it to be with the 'safe' or 'keep_root' attributes. + + Seems like that should just happen, I don't want to worry about + accidentally removing / when I pass it /tmp %prep -%setup -q -n "File-Path-Tiny-%{version}" -%__sed -i '/^auto_install/d' Makefile.PL +%setup -q -n %{cpan_name}-%{version} %build -%__perl Makefile.PL PREFIX="%{_prefix}" -%__make %{?_smp_flags} +%{__perl} Makefile.PL INSTALLDIRS=vendor +%{__make} %{?_smp_mflags} + +%check +%{__make} test %install %perl_make_install %perl_process_packlist +%perl_gen_filelist -%check -%__make test - -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} - -%files -%defattr(-,root,root) +%files -f %{name}.files +%defattr(-,root,root,755) %doc Changes README -%dir %{perl_vendorlib}/File -%dir %{perl_vendorlib}/File/Path -%{perl_vendorlib}/File/Path/Tiny.pm -%doc %{perl_vendorlib}/File/Path/Tiny.pod -%doc %{perl_man3dir}/File::Path::Tiny.%{perl_man3ext}%{ext_man} %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit media-player-info for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package media-player-info for openSUSE:Factory checked in at 2012-03-05 14:02:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/media-player-info (Old) and /work/SRC/openSUSE:Factory/.media-player-info.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "media-player-info", Maintainer is "StShaw(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/media-player-info/media-player-info.changes 2011-10-05 11:09:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.media-player-info.new/media-player-info.changes 2012-03-05 14:02:31.000000000 +0100 @@ -1,0 +2,20 @@ +Tue Feb 14 09:51:28 UTC 2012 - vuntz(a)opensuse.org + +- Add comments to clarify the license of the package (bnc#743602): + while some files in the tarball are GPL-2.0+ or MIT, those are + not shipped in any form in the resulting binary package. + +------------------------------------------------------------------- +Tue Jan 24 10:24:10 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 16: + + Add support for Archos Key, Nokia N950, Sandisk Sansa Clip ZIP, + Sony Walkman NWZ-A800 series, Sony Walkman NWZ-S545, + Sony Walkman NWZ-S76x, Sony Walkman S-750 series. + +------------------------------------------------------------------- +Thu Dec 8 13:42:34 UTC 2011 - coolo(a)suse.com + +- fix license to be in spdx.org format + +------------------------------------------------------------------- Old: ---- media-player-info-15.tar.gz New: ---- media-player-info-16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ media-player-info.spec ++++++ --- /var/tmp/diff_new_pack.d01UM2/_old 2012-03-05 14:02:32.000000000 +0100 +++ /var/tmp/diff_new_pack.d01UM2/_new 2012-03-05 14:02:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package media-player-info # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,14 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: media-player-info -Version: 15 -Release: 1 -License: BSD -Group: System/GUI/Other +Version: 16 +Release: 0 Summary: Media Player Information +License: BSD-3-Clause +Group: System/GUI/Other +# Note on license: some files in the tools subdirectories are GPL-2.0+ (or +# MIT); those files are not shipped at all in the resulting binary package. +# Hence, the binary package is indeed still BSD-3-Clause. Url: http://hal.freedesktop.org/releases/ Source: http://www.freedesktop.org/software/media-player-info/%{name}-%{version}.ta… BuildRequires: pkg-config @@ -54,8 +55,10 @@ %files %defattr(-, root, root) %doc AUTHORS COPYING NEWS README +## WARNING: if adding other files to the package, check their license (see note above License tag) %dir %{_datadir}/media-player-info %{_datadir}/media-player-info/*.mpi /lib/udev/rules.d/40-usb-media-players.rules +## WARNING: if adding other files to the package, check their license (see note above License tag) %changelog ++++++ media-player-info-15.tar.gz -> media-player-info-16.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/media-player-info-15/NEWS new/media-player-info-16/NEWS --- old/media-player-info-15/NEWS 2011-10-04 06:55:34.000000000 +0200 +++ new/media-player-info-16/NEWS 2012-01-24 09:38:58.000000000 +0100 @@ -1,3 +1,18 @@ +media-player-info 16 (2012-01-24) +================================= +Alex Fiestas (1): + Add Nokia N950 + +Martin Pitt (8): + Fix Nokia N950 + Add Sandisk Sansa Clip ZIP + Add Sony Walkman NWZ-S765 + Generalize Sony NWZ-S76x + Add Sony Walkman S-750 series + Add Sony Walkman NWZ-S545 + Add Archos Key + Add Sony Walkman NWZ-A800 series + media-player-info 15 (2011-10-04) ================================= Alejandro Mery (1): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/media-player-info-15/configure new/media-player-info-16/configure --- old/media-player-info-15/configure 2011-10-04 06:56:30.000000000 +0200 +++ new/media-player-info-16/configure 2012-01-24 09:39:59.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for media-player-info 15. +# Generated by GNU Autoconf 2.68 for media-player-info 16. # # Report bugs to <devkit-devel(a)lists.freedesktop.org>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='media-player-info' PACKAGE_TARNAME='media-player-info' -PACKAGE_VERSION='15' -PACKAGE_STRING='media-player-info 15' +PACKAGE_VERSION='16' +PACKAGE_STRING='media-player-info 16' PACKAGE_BUGREPORT='devkit-devel(a)lists.freedesktop.org' PACKAGE_URL='' @@ -1189,7 +1189,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 media-player-info 15 to adapt to many kinds of systems. +\`configure' configures media-player-info 16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1256,7 +1256,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of media-player-info 15:";; + short | recursive ) echo "Configuration of media-player-info 16:";; esac cat <<\_ACEOF @@ -1340,7 +1340,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -media-player-info configure 15 +media-player-info configure 16 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1357,7 +1357,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by media-player-info $as_me 15, which was +It was created by media-player-info $as_me 16, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2172,7 +2172,7 @@ # Define the identity of the package. PACKAGE='media-player-info' - VERSION='15' + VERSION='16' cat >>confdefs.h <<_ACEOF @@ -2999,7 +2999,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by media-player-info $as_me 15, which was +This file was extended by media-player-info $as_me 16, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3052,7 +3052,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -media-player-info config.status 15 +media-player-info config.status 16 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/media-player-info-15/configure.ac new/media-player-info-16/configure.ac --- old/media-player-info-15/configure.ac 2011-10-04 06:56:11.000000000 +0200 +++ new/media-player-info-16/configure.ac 2012-01-24 09:39:06.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT(media-player-info, 15, devkit-devel(a)lists.freedesktop.org) +AC_INIT(media-player-info, 16, devkit-devel(a)lists.freedesktop.org) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([media-players/]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/media-player-info-15/media-players/40-usb-media-players.rules new/media-player-info-16/media-players/40-usb-media-players.rules --- old/media-player-info-15/media-players/40-usb-media-players.rules 2011-10-04 06:56:35.000000000 +0200 +++ new/media-player-info-16/media-players/40-usb-media-players.rules 2012-01-24 09:40:11.000000000 +0100 @@ -18,6 +18,8 @@ # YP-F2R ATTRS{idVendor}=="04e8" , ATTRS{idProduct}=="5051" , ENV{ID_MEDIA_PLAYER}="samsung_yp-f2r" ATTRS{idVendor}=="1011" , ATTRS{idProduct}=="0001" , ENV{ID_MEDIA_PLAYER}="mobile-media_0x0001" +# Walkman NWZ-S750 Series +ATTRS{idVendor}=="054c" , ATTRS{idProduct}=="04cc" , ENV{ID_MEDIA_PLAYER}="sony_walkman-nwz-s750" ATTRS{idVendor}=="045a" , ATTRS{idProduct}=="5042" , ENV{ID_MEDIA_PLAYER}="sonicblue_0x5042" # MP-130 ATTRS{idVendor}=="1332" , ATTRS{idProduct}=="1325" , ENV{ID_MEDIA_PLAYER}="jens-of-sweeden_mp-130" @@ -96,6 +98,8 @@ ATTRS{idVendor}=="0fce" , ATTRS{idProduct}=="e092" , ENV{ID_MEDIA_PLAYER}="sony-ericsson_p1i" # Pre 3 ATTRS{idVendor}=="0830" , ATTRS{idProduct}=="8054|8052" , ENV{ID_MEDIA_PLAYER}="hp_pre3" +# Sansa Clip Zip +ATTRS{idVendor}=="0781" , ATTRS{idProduct}=="74e5" , ENV{ID_MEDIA_PLAYER}="sandisk_sansa-clip-zip" # W910i ATTRS{idVendor}=="0fce" , ATTRS{idProduct}=="e076" , ENV{ID_MEDIA_PLAYER}="sony-ericsson_w910i" # Walkman NWZ-S638F @@ -226,6 +230,8 @@ ATTRS{idVendor}=="0fce" , ATTRS{idProduct}=="e105" , ENV{ID_MEDIA_PLAYER}="sony-ericsson_w705" # Galaxy Reality ATTRS{idVendor}=="04e8" , ATTRS{idProduct}=="68aa" , ENV{ID_MEDIA_PLAYER}="samsung_reality" +# Key +ATTRS{idVendor}=="0402" , ATTRS{idProduct}=="7108" , ENV{ID_MEDIA_PLAYER}="archos_key" # Xperia Play ATTRS{idVendor}=="0fce" , ATTRS{idProduct}=="e15d" , ENV{ID_MEDIA_PLAYER}="sony-ericsson_xperia-play" # CLIQ/DEXT @@ -236,6 +242,8 @@ ATTRS{idVendor}=="4102" , ATTRS{idProduct}=="1023" , ENV{ID_MEDIA_PLAYER}="iriver_s10" # Galaxy ATTRS{idVendor}=="04e8" , ATTRS{idProduct}=="6602|6603|6640|681c|681d|685b|6877" , ENV{ID_MEDIA_PLAYER}="samsung_galaxy" +# Walkman NWZ-A800 Series +ATTRS{idVendor}=="054c" , ATTRS{idProduct}=="0325" , ENV{ID_MEDIA_PLAYER}="sony_walkman-nwz-a800" # T60 ATTRS{idVendor}=="4102" , ATTRS{idProduct}=="1034" , ENV{ID_MEDIA_PLAYER}="iriver_t60" # iAUDIO M3 @@ -269,6 +277,8 @@ ATTRS{idVendor}=="0471" , ATTRS{idProduct}=="2070" , ENV{ID_MEDIA_PLAYER}="philips_gogear-mix" # Music Mediatouch ATTRS{idVendor}=="071b" , ATTRS{idProduct}=="32bb" , ENV{ID_MEDIA_PLAYER}="dane-elec_music-mediatouch" +# N950 +ATTRS{idVendor}=="0421" , ATTRS{idProduct}=="03d1" , ENV{ID_MEDIA_PLAYER}="nokia_n950" # Sansa c250 ATTRS{idVendor}=="0781" , ATTRS{idProduct}=="7451" , ENV{ID_MEDIA_PLAYER}="sandisk_sansa-c250" # Zen X-Fi 2 @@ -340,6 +350,8 @@ ATTRS{idVendor}=="19d2" , ATTRS{idProduct}=="ffe2" , ENV{ID_MEDIA_PLAYER}="micromax_a60" # T7 Volcano ATTRS{idVendor}=="4102" , ATTRS{idProduct}=="1043" , ENV{ID_MEDIA_PLAYER}="iriver_t7-volcano" +# Walkman NWZ-S760 Series +ATTRS{idVendor}=="054c" , ATTRS{idProduct}=="05a8" , ENV{ID_MEDIA_PLAYER}="sony_walkman-nwz-s760" # Nexus One ATTRS{idVendor}=="18d1" , ATTRS{idProduct}=="4e11|4e12" , ENV{ID_MEDIA_PLAYER}="google_nexus-one" # T10 1G, T20 UMS, T30 UMS, T10 UMS,iFP 700/800/900/1000 UMS, H10 20GB/50GB UMS @@ -447,6 +459,8 @@ ATTRS{idVendor}=="22b8" , ATTRS{idProduct}=="7086" , ENV{ID_MEDIA_PLAYER}="motorola_atrix" # DMP-100 ATTRS{idVendor}=="0dda" , ATTRS{idProduct}=="0302" , ENV{ID_MEDIA_PLAYER}="hama_dmp-100" +# Walkman NWZ-S500 Series +ATTRS{idVendor}=="054c" , ATTRS{idProduct}=="03fe" , ENV{ID_MEDIA_PLAYER}="sony_walkman-nwz-s500" # Sansa m200 Series ATTRS{idVendor}=="0781" , ATTRS{idProduct}=="7401" , ENV{ID_MEDIA_PLAYER}="sandisk_sansa-m200-series" # Ideos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/media-player-info-15/media-players/archos_key.mpi new/media-player-info-16/media-players/archos_key.mpi --- old/media-player-info-15/media-players/archos_key.mpi 1970-01-01 01:00:00.000000000 +0100 +++ new/media-player-info-16/media-players/archos_key.mpi 2012-01-18 12:11:57.000000000 +0100 @@ -0,0 +1,18 @@ +[Device] +Product=Key +Vendor=Archos +AccessProtocol=storage +DeviceMatch=usb:0402:7108; + +[Media] +InputFormats=audio/x-wav +OutputFormats=audio/mpeg;audio/x-wav;audio/x-ms-wma + +[Playlist] +Formats=audio/x-mpegurl + +[storage] +PlaylistPath=Playlist/ +AudioFolders=/;/MICIN.DIR;/FMIN.DIR; + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/media-player-info-15/media-players/nokia_n950.mpi new/media-player-info-16/media-players/nokia_n950.mpi --- old/media-player-info-15/media-players/nokia_n950.mpi 1970-01-01 01:00:00.000000000 +0100 +++ new/media-player-info-16/media-players/nokia_n950.mpi 2011-11-23 06:14:13.000000000 +0100 @@ -0,0 +1,13 @@ +[Device] +Product=N950 +Vendor=Nokia +AccessProtocol=storage +DeviceMatch=usb:0421:03d1; +Icon=phone-nokia-n950 + +[Media] +OutputFormats=audio/3gpp;audio/3ga;audio/3gpp2;audio/amr;audio/x-amr;audio/mpa;audio/mp3;audio/x-mp3;audio/x-mpg;audio/mpeg;audio/mpeg3;audio/mpg3;audio/mpg;audio/mp4;audio/m4a;audio/aac;audio/x-aac;audio/mp4a-latm;audio/wav + +[storage] +AudioFolders=Music/ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/media-player-info-15/media-players/sandisk_sansa-clip-zip.mpi new/media-player-info-16/media-players/sandisk_sansa-clip-zip.mpi --- old/media-player-info-15/media-players/sandisk_sansa-clip-zip.mpi 1970-01-01 01:00:00.000000000 +0100 +++ new/media-player-info-16/media-players/sandisk_sansa-clip-zip.mpi 2011-12-09 08:26:40.000000000 +0100 @@ -0,0 +1,18 @@ +[Device] +Product=Sansa Clip Zip +Vendor=SanDisk +AccessProtocol=storage +DeviceMatch=usb:0781:74e5; + +[Media] +InputFormats=audio/x-wav +OutputFormats=audio/mpeg;audio/x-ms-wma;audio/audible;application/ogg;audio/ogg;audio/flac;audio/x-wav;audio/x-pn-audibleaudio;audio/mp4 + +[Playlist] +Formats=audio/x-mpegurl + +[storage] +RequiresEject=true +PlaylistPath= +AudioFolders=MUSIC/;PODCAST/;PODCASTS/;RECORD/FM/;RECORD/VOICE/;AUDIBLE/;AUDIOBOOKS/ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/media-player-info-15/media-players/sony_walkman-nwz-a800.mpi new/media-player-info-16/media-players/sony_walkman-nwz-a800.mpi --- old/media-player-info-15/media-players/sony_walkman-nwz-a800.mpi 1970-01-01 01:00:00.000000000 +0100 +++ new/media-player-info-16/media-players/sony_walkman-nwz-a800.mpi 2012-01-18 18:04:43.000000000 +0100 @@ -0,0 +1,12 @@ +[Device] +Product=Walkman NWZ-A800 Series +Vendor=Sony +AccessProtocol=storage +DeviceMatch=usb:054c:0325; + +[Media] +OutputFormats=audio/mpeg;audio/x-ms-wma;audio/aac;audio/3gpp;audio/mp4;audio/m4a;audio/wma;audio/wav;video/x-ms-wmv;video/mp4;video/mpeg4;video/x-m4v; + +[storage] +AudioFolders=MUSIC/; +PlaylistPath=MUSIC/Playlists/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/media-player-info-15/media-players/sony_walkman-nwz-s500.mpi new/media-player-info-16/media-players/sony_walkman-nwz-s500.mpi --- old/media-player-info-15/media-players/sony_walkman-nwz-s500.mpi 1970-01-01 01:00:00.000000000 +0100 +++ new/media-player-info-16/media-players/sony_walkman-nwz-s500.mpi 2012-01-18 11:39:53.000000000 +0100 @@ -0,0 +1,15 @@ +[Device] +Product=Walkman NWZ-S500 Series +Vendor=Sony +AccessProtocol=storage +DeviceMatch=usb:054c:03fe; + +[Media] +OutputFormats=audio/mpeg;audio/x-aac;audio/x-ms-wma;video/mpeg,video/mp4; + +[Playlist] +Formats=audio/x-mpegurl + +[storage] +AudioFolders=MUSIC/;RECORD/;PODCASTS/ +PlaylistPath=MUSIC/Playlists/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/media-player-info-15/media-players/sony_walkman-nwz-s750.mpi new/media-player-info-16/media-players/sony_walkman-nwz-s750.mpi --- old/media-player-info-15/media-players/sony_walkman-nwz-s750.mpi 1970-01-01 01:00:00.000000000 +0100 +++ new/media-player-info-16/media-players/sony_walkman-nwz-s750.mpi 2012-01-12 08:04:35.000000000 +0100 @@ -0,0 +1,15 @@ +[Device] +Product=Walkman NWZ-S750 Series +Vendor=Sony +AccessProtocol=storage +DeviceMatch=usb:054c:04cc; + +[Media] +OutputFormats=audio/mpeg;audio/x-ms-wma;audio/aac;audio/3gpp;audio/mp4;audio/m4a;audio/wma;audio/wav;video/x-ms-wmv;video/mp4;video/mpeg4;video/x-m4v; + +[Playlist] +Formats=audio/x-mpegurl + +[storage] +AudioFolders=MUSIC/;RECORD/;PODCASTS/ +PlaylistPath=MUSIC/Playlists/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/media-player-info-15/media-players/sony_walkman-nwz-s760.mpi new/media-player-info-16/media-players/sony_walkman-nwz-s760.mpi --- old/media-player-info-15/media-players/sony_walkman-nwz-s760.mpi 1970-01-01 01:00:00.000000000 +0100 +++ new/media-player-info-16/media-players/sony_walkman-nwz-s760.mpi 2012-01-03 08:23:05.000000000 +0100 @@ -0,0 +1,12 @@ +[Device] +Product=Walkman NWZ-S760 Series +Vendor=Sony +AccessProtocol=storage +DeviceMatch=usb:054c:05a8; + +[Media] +OutputFormats=audio/mpeg;audio/x-ms-wma;audio/aac;audio/3gpp;audio/mp4;audio/m4a;audio/wma;audio/wav;video/x-ms-wmv;video/mp4;video/mpeg4;video/x-m4v; + +[storage] +AudioFolders=MUSIC/;RECORD/;PODCASTS/ +PlaylistPath=MUSIC/Playlists/ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit greybird-theme for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package greybird-theme for openSUSE:Factory checked in at 2012-03-05 14:02:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/greybird-theme (Old) and /work/SRC/openSUSE:Factory/.greybird-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "greybird-theme", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-03-04 14:46:25.491534019 +0100 +++ /work/SRC/openSUSE:Factory/.greybird-theme.new/greybird-theme.changes 2012-03-05 14:02:24.000000000 +0100 @@ -0,0 +1,32 @@ +------------------------------------------------------------------- +Wed Feb 8 14:41:44 UTC 2012 - seiler(a)b1-systems.de + +- updated to latest release (4.3-6) +- specfile cleanup fo X11:xfce (last submit was not accepted, old submit without the rpm seperation was included) + +------------------------------------------------------------------- +Fri Feb 3 18:22:07 UTC 2012 - gber(a)opensuse.org + +- specfile cleanup + +------------------------------------------------------------------- +Wed Feb 1 08:34:58 UTC 2012 - seiler(a)b1-systems.de + +- updated to latest source +- added fdupes to symlink duplicate files + +------------------------------------------------------------------- +Tue Dec 6 10:35:34 UTC 2011 - seiler(a)b1-systems.de + +- added gtk3 dependencie for openSUSE 12.1 + +------------------------------------------------------------------- +Tue Dec 6 09:32:17 UTC 2011 - seiler(a)b1-systems.de + +- fixed syntax error in file section +- modified the custom macros +- updated summary +- modified *.spec file to prevent warnings +- cleaned *.spec file +- updated to the current greybird release +- modified SOURCE0 file with custom macros New: ---- greybird-theme.changes greybird-theme.spec shimmerproject-Greybird-v0.4-6-g7915c3e.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ greybird-theme.spec ++++++ # # spec file for package greybird-theme # # Copyright (c) 2012 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 _buildnumber 7915c3e %define _revision 6 %define _name Greybird Name: greybird-theme Version: 0.4 Release: 3 Group: System/GUI/GNOME License: GPL-2.0+ or CC-BY-SA-3.0 URL: http://shimmerproject.org/project/greybird/ Summary: A Clean Minimalistic Theme for GNOME, XFCE, GTK+ 2 and 3 Source: shimmerproject-%{_name}-v%{version}-%{_revision}-g%{_buildnumber}.tar.gz BuildRequires: fdupes BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description This theme for GTK2/3 and xfwm4/emerald/metacity started out on the basis of Bluebird, but aims at reworking the intense blue tone to a more neutral grey-ish look that will be more pleasant to look at in everyday use. %package -n metatheme-greybird-common Summary: A Clean Minimalistic Theme for GNOME, XFCE, GTK+ 2 and 3 -- Common Files Suggests: gtk2-metatheme-greybird Suggests: gtk3-metatheme-greybird %description -n metatheme-greybird-common The Greybird theme for GTK2/3 and xfwm4/emerald/metacity started out on the basis of Bluebird, but aims at reworking the intense blue tone to a more neutral grey-ish look that will be more pleasant to look at in everyday use. This package provides the files common to the GTK+ themes and the window manager themes as well as background images. %package -n gtk2-metatheme-greybird Summary: A Clean Minimalistic Theme for GNOME, XFCE, GTK+ 2 and 3 -- GTK+ 2 Support Requires: metatheme-greybird-common = %{version} Requires: gtk2-engine-murrine Supplements: packageand(metatheme-greybird-common:gtk2) %description -n gtk2-metatheme-greybird The Greybird Theme for GTK2/3 and xfwm4/emerald/metacity started out on the basis of Bluebird, but aims at reworking the intense blue tone to a more neutral grey-ish look that will be more pleasant to look at in everyday use. This package provides the GTK+ 2 support of Greybird. %if 0%{?suse_version} >= 1210 %package -n gtk3-metatheme-greybird Summary: A Clean Minimalistic Theme for GNOME, XFCE, GTK+ 2 and 3 -- GTK+ 3 Support Requires: metatheme-greybird-common = %{version} Requires: gtk3-engine-unico Supplements: packageand(metatheme-greybird-common:gtk3) %description -n gtk3-metatheme-greybird The Greybird Theme for GTK2/3 and xfwm4/emerald/metacity started out on the basis of Bluebird, but aims at reworking the intense blue tone to a more neutral grey-ish look that will be more pleasant to look at in everyday use. This package provides the GTK+ 3 support of Greybird. %endif %prep %setup -q -n shimmerproject-%{_name}-%{_buildnumber} %build -n shimmerproject-%{_name}-%{_buildnumber} %install -n shimmerproject-%{_name}-%{_buildnumber} mkdir -p $RPM_BUILD_ROOT%{_datadir}/themes/%{_name} %if 0%{?suse_version} >= 1210 cp -a gtk-3.0 $RPM_BUILD_ROOT%{_datadir}/themes/%{_name} %endif cp -a backdrops gtk-2.0 metacity-1 xfce-notify-4.0 xfwm4 xfwm4_compact \ Greybird.emerald $RPM_BUILD_ROOT%{_datadir}/themes/%{_name} %fdupes -s $RPM_BUILD_ROOT/%{_datadir}/themes/%{_name} %files -n metatheme-greybird-common %defattr (-, root, root) %doc README LICENSE.CC LICENSE.GPL %dir %{_datadir}/themes/%{_name}/ %{_datadir}/themes/%{_name}/backdrops %{_datadir}/themes/%{_name}/metacity-1 %{_datadir}/themes/%{_name}/xfce-notify-4.0 %{_datadir}/themes/%{_name}/xfwm4 %{_datadir}/themes/%{_name}/xfwm4_compact %{_datadir}/themes/%{_name}/Greybird.emerald %files -n gtk2-metatheme-greybird %defattr (-, root, root) %{_datadir}/themes/%{_name}/gtk-2.0 %if 0%{?suse_version} >= 1210 %files -n gtk3-metatheme-greybird %defattr (-, root, root) %{_datadir}/themes/%{_name}/gtk-3.0 %endif %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-control-center for openSUSE:Factory
by root＠hilbert.suse.de 05 Mar '12

05 Mar '12

Hello community, here is the log from the commit of package gnome-control-center for openSUSE:Factory checked in at 2012-03-05 14:02:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-control-center (Old) and /work/SRC/openSUSE:Factory/.gnome-control-center.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-control-center", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes 2012-02-17 15:03:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-control-center.new/gnome-control-center.changes 2012-03-05 14:02:10.000000000 +0100 @@ -1,0 +2,44 @@ +Thu Feb 23 16:52:46 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.90: + + All: + - Remove use of deprecated widgets + + Shell: + - Force a pixel size for the "All Settings" button + + Color: + - Don't print (null) for virtual printer profiles + - Don't block the UI settings the default profile + + Date & Time: + - Fix crasher when systemd is unavailable + - Respect LINGUAS for timezone translations + + Keyboard: + - Fix description not matching reality for setting shortcuts + - Refuse Shift+unmodified key shortcuts + - Fix crasher setting new custom shortcuts + + Network: + - Add "Forget Network" button + - Remove unused "Unlock" button + + Printers: + - Prevent possible crashes when level, name and color + information are parsed + + Power: + - Redesigned dialogue + - Fix updating not working due to recent gnome-settings-daemon + changes + + User Accounts: + - Port to GDBus + - Fix crasher on startup when compiled with Cheese avatar + capture + - Use new strength bar widget from Power + + Wacom: + - Add simple display mapping dialogue + - Add button mapping dialogue + - Switch to last used stylus automatically + - Loads of small layout fixes +- Add pkgconfig(cheese) BuildRequires: new dependency for the user + accounts panel. +- Change freeglut Requires to a /usr/bin/glxinfo Recommends for + now, as freeglut doesn't exist anymore, and /usr/bin/glxinfo is + not shipped in a package anymore. This should get resolved soon. + +------------------------------------------------------------------- Old: ---- gnome-control-center-3.3.5.tar.xz New: ---- gnome-control-center-3.3.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-control-center.spec ++++++ --- /var/tmp/diff_new_pack.t3RJ2k/_old 2012-03-05 14:02:13.000000000 +0100 +++ /var/tmp/diff_new_pack.t3RJ2k/_new 2012-03-05 14:02:13.000000000 +0100 @@ -21,6 +21,21 @@ %define with_systemd 0 Name: gnome-control-center +Version: 3.3.90 +Release: 0 +# FIXME: change /usr/bin/glxinfo to Recommends to real package name, and to Requires, once we know which package name to use (see bnc#748373) +# FIXME: in 12.2 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833) +Summary: The GNOME Control Center +License: GPL-2.0+ +Group: System/GUI/GNOME +Url: http://www.gnome.org +Source: http://download.gnome.org/sources/gnome-control-center/3.3/%{name}-%{versio… +# PATCH-FEATURE-OPENSUSE gnome-control-center-allow-yast-in-shell.patch vuntz(a)opensuse.org -- Allow the launch of the yast shell from the g-c-c shell; it's quite ugly, but on the other hand, we don't want to change the behavior of the shell except for yast... +Patch0: gnome-control-center-allow-yast-in-shell.patch +# PATCH-HACK-OPENSUSE gnome-control-center-hide-region-system-tab.patch vuntz(a)opensuse.org -- Hide system tab in region panel until we really use the right files for system settings (see bnc#703833) +Patch2: gnome-control-center-hide-region-system-tab.patch +# PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration (was PATCH-FEATURE-OPENSUSE) +Patch14: gnome-control-center-system-proxy-configuration.patch BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -29,6 +44,7 @@ BuildRequires: intltool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +BuildRequires: pkgconfig(cheese) BuildRequires: pkgconfig(cheese-gtk) >= 3.3.5 BuildRequires: pkgconfig(colord) BuildRequires: pkgconfig(dbus-glib-1) @@ -38,7 +54,7 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.31.0 BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.3.4 BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.1.91 -BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.3.4 +BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.3.90 BuildRequires: pkgconfig(goa-1.0) BuildRequires: pkgconfig(goa-backend-1.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.3.0 @@ -68,27 +84,9 @@ BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xi) >= 1.2 -Obsoletes: fontilus themus acme -Provides: fontilus themus acme -Version: 3.3.5 -Release: 0 -# FIXME: in 12.2 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833) -Summary: The GNOME Control Center -License: GPL-2.0+ -Group: System/GUI/GNOME -Source: http://download.gnome.org/sources/gnome-control-center/3.3/%{name}-%{versio… -# PATCH-FEATURE-OPENSUSE gnome-control-center-allow-yast-in-shell.patch vuntz(a)opensuse.org -- Allow the launch of the yast shell from the g-c-c shell; it's quite ugly, but on the other hand, we don't want to change the behavior of the shell except for yast... -Patch0: gnome-control-center-allow-yast-in-shell.patch -# PATCH-HACK-OPENSUSE gnome-control-center-hide-region-system-tab.patch vuntz(a)opensuse.org -- Hide system tab in region panel until we really use the right files for system settings (see bnc#703833) -Patch2: gnome-control-center-hide-region-system-tab.patch -# PATCH-NEEDS-REBASE gnome-control-center-system-proxy-configuration.patch -- this needs to be reimplemented to be more distro-generic before submitting upstream - docs at http://en.opensuse.org/GNOME/Proxy_configuration (was PATCH-FEATURE-OPENSUSE) -Patch14: gnome-control-center-system-proxy-configuration.patch -Url: http://www.gnome.org Requires: %{name}-branding = %{version} # needed for printers panel Requires: cups-pk-helper -# needed for /usr/bin/glxinfo, used by System info panel -Requires: freeglut Requires: gnome-menus Requires: gnome-settings-daemon # needed for universal access panel @@ -101,6 +99,15 @@ Recommends: apg # the printers panel can use the dbus service Recommends: system-config-printer-dbus-service +# /usr/bin/glxinfo is used by System info panel; we're using a path here since +# the xorg-x11 packaging change brought a mess, and this is not packaged +# anymore for now. It will come back, but we don't know in which package... +# (see bnc#748373) +Recommends: /usr/bin/glxinfo +Provides: acme +Provides: fontilus +Provides: themus +Obsoletes: fontilus themus acme Provides: control-center2 = 2.22.1 Obsoletes: control-center2 < 2.22.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python3-distribute for openSUSE:Factory
by root＠hilbert.suse.de 03 Mar '12

03 Mar '12

Hello community, here is the log from the commit of package python3-distribute for openSUSE:Factory checked in at 2012-03-03 08:48:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-distribute (Old) and /work/SRC/openSUSE:Factory/.python3-distribute.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-distribute", Maintainer is "" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='python-distribute' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libvnc for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package libvnc for openSUSE:Factory checked in at 2012-03-02 16:37:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvnc (Old) and /work/SRC/openSUSE:Factory/.libvnc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvnc", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libvnc/libvnc.changes 2012-02-28 19:24:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvnc.new/libvnc.changes 2012-03-02 16:37:54.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 28 11:21:53 UTC 2012 - sndirsch(a)suse.com + +- build vncproto in the same package + +------------------------------------------------------------------- New: ---- vncproto-20070501.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvnc.spec ++++++ --- /var/tmp/diff_new_pack.2BRroQ/_old 2012-03-02 16:37:56.000000000 +0100 +++ /var/tmp/diff_new_pack.2BRroQ/_new 2012-03-02 16:37:56.000000000 +0100 @@ -29,10 +29,11 @@ #CVS-Clone: -d:pserver:anonymous@xf4vnc.cvs.sf.net:/cvsroot/xf4vnc co modular/src/lib/libvnc Source: %name-%version.tar.bz2 Source1: COPYING +Source2: vncproto-20070501.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.57 automake libtool BuildRequires: pkgconfig pkgconfig(x11) pkgconfig(xext) -BuildRequires: pkgconfig(vncproto) pkgconfig(xextproto) +BuildRequires: pkgconfig(xextproto) %description xf4vnc provides two implementations of VNC in an Xserver. Both implementations @@ -95,14 +96,21 @@ in %lname. %prep -%setup -qn %name +%setup -qn %name -b2 %build -./autogen.sh -%configure --disable-static -make %{?_smp_mflags} %install +pushd ../vncproto +autoreconf -fi +%configure +%makeinstall +popd +autoreconf -fi +export PKG_CONFIG_PATH=${RPM_BUILD_ROOT}/%_libdir/pkgconfig +export VNCEXT_CFLAGS=-I${RPM_BUILD_ROOT}/usr/include +%configure --disable-static +make %{?_smp_mflags} %makeinstall rm -f "%buildroot/%_libdir"/*.la cp %{SOURCE1} . @@ -118,7 +126,10 @@ %files devel %defattr(-,root,root) +/usr/include/X11/extensions/vnc.h +/usr/include/X11/extensions/vncstr.h %_libdir/libVncExt.so %_libdir/pkgconfig/vnc.pc +%_libdir/pkgconfig/vncproto.pc %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pm-utils for openSUSE:11.4
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package pm-utils for openSUSE:11.4 checked in at Fri Mar 2 14:08:14 CET 2012. -------- --- old-versions/11.4/UPDATES/all/pm-utils/pm-utils.changes 2012-02-13 11:05:58.000000000 +0100 +++ 11.4/pm-utils/pm-utils.changes 2012-02-29 13:52:57.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Feb 29 12:51:24 UTC 2012 - mvyskocil(a)suse.cz + +- fix bnc#749031: Add pm-utils-dhcp-interfaces.patch, fix script + 50rcnetwork error and update savestate/restorestate functions. +- add pm-utils-1.4.1-vtXX-upower-battery-AC-adapter.patch (bnc#670074) + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- pm-utils-1.4.1-vtXX-upower-battery-AC-adapter.patch pm-utils-dhcp-interfaces.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pm-utils.spec ++++++ --- /var/tmp/diff_new_pack.q3NgFk/_old 2012-03-02 14:01:27.000000000 +0100 +++ /var/tmp/diff_new_pack.q3NgFk/_new 2012-03-02 14:01:27.000000000 +0100 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define pm_libdir %{_prefix}/lib/%{name}/ %define pm_quirkdbdir %{pm_libdir}/video-quirks @@ -23,9 +22,9 @@ Name: pm-utils Version: 1.4.1 -Release: 5.<RELEASE11> +Release: 5.<RELEASE13> Summary: Tools to suspend and hibernate computers -License: GPLv2+ +License: GPL-2.0+ Group: System/Base Url: http://pm-utils.freedesktop.org/wiki/ Source0: %{name}-%{version}.tar.bz2 @@ -47,17 +46,20 @@ Patch5: pm-utils-1.3.0-suse-directfb-ignore-fbmodes.patch #PATCH-FIX-OPENSUSE: Update NetworkManager's Sleep method bnc#735837 Patch6: pm-utils-1.4.1-networkmanager.patch +#PATCH-FIX-OPENSUSE: Fix 50rcnetwork bnc#749031 +Patch7: pm-utils-dhcp-interfaces.patch +Patch8: pm-utils-1.4.1-vtXX-upower-battery-AC-adapter.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq # hooks requires some external tools -Requires: grep -Requires: sed +Requires: coreutils Requires: ethtool Requires: gawk -Requires: coreutils +Requires: grep Requires: module-init-tools +Requires: sed Requires: upower @@ -74,7 +76,7 @@ Richard Hughes <richard(a)hughsie.com> %package ndiswrapper -License: GPLv2+ + Summary: The pm-utils hook for ndiswrapper Group: System/Base Supplements: ndiswrapper @@ -95,6 +97,9 @@ %patch4 -p1 -b .suse-logging %patch5 -p1 -b .directfb-ignore-fbmodes %patch6 -p1 -b .networkmanager +cd .. +%patch7 -p1 +%patch8 -p0 %build %{configure} \ ++++++ pm-utils-1.4.1-vtXX-upower-battery-AC-adapter.patch ++++++ Index: pm-utils-suse/bin/powersave =================================================================== --- pm-utils-suse.orig/bin/powersave +++ pm-utils-suse/bin/powersave @@ -54,7 +54,7 @@ function upower_enumerate_batteries() { continue fi # type 2 is battery - if upower_device_get_property "${DEVICE}" String:Type 2>/dev/null | grep -q "2$"; then + if upower_device_get_property "${DEVICE}" string:Type 2>/dev/null | grep uint | grep -q "2$"; then echo "${DEVICE}" fi done @@ -63,7 +63,7 @@ function upower_enumerate_batteries() { # print the ac_adapter found on system # Note: it prints the first match, as it expects only one per machine function upower_find_ac_adapter() { - for DEVICE in $(upower_call_method org.freedesktop.UPower.EnumerateDevices); do + for DEVICE in $(upower_call_method org.freedesktop.UPower.EnumerateDevices | grep -o '/org[A-Za-z0-9/_]*'); do # type 1 is Line Power if upower_device_get_property "${DEVICE}" string:Type 2>/dev/null | grep -q "1$"; then echo "${DEVICE}" @@ -193,20 +193,24 @@ function hal_battery_info { done } +function dbus-getv { + sed -n "s#.*[ \t]*$1[0-9]*[ \t]*##p" +} + function upower_battery_info { C=1 for BATTERY in `upower_enumerate_batteries`; do - SEC=`upower_device_get_property "${BATTERY}" TimeToEmpty` + let SEC="`upower_device_get_property "${BATTERY}" string:TimeToEmpty | dbus-getv int`" if [ $SEC -ne 0 ]; then let MIN=SEC/60 else MIN=0 fi - PERC=`upower_device_get_property "${BATTERY}" Percentage` + PERC=`upower_device_get_property "${BATTERY}" string:Percentage | dbus-getv double` - case `upower_device_get_property "${BATTERY}" State` in + case `upower_device_get_property "${BATTERY}" string:State | dbus-getv uint` in 1) STATE="Charging" ;; 2) STATE="Discharging" ;; 3) STATE="Empty" ;; @@ -217,7 +221,7 @@ function upower_battery_info { esac echo "Battery$C:" - echo -e "\t Remaining percent: $PERC" + echo -e "\t Remaining percent: $PERC%" echo -e "\t Remaining minutes: $MIN" echo -e "\t Charging state: $STATE" ++++++ pm-utils-dhcp-interfaces.patch ++++++ Index: pm-utils/pm-utils-suse/hooks/sleep.d/50rcnetwork =================================================================== --- pm-utils.orig/pm-utils-suse/hooks/sleep.d/50rcnetwork +++ pm-utils/pm-utils-suse/hooks/sleep.d/50rcnetwork @@ -16,21 +16,23 @@ [ -r /etc/sysconfig/network/config ] && . /etc/sysconfig/network/config [ -r /etc/sysconfig/network/scripts/functions ] && . /etc/sysconfig/network/scripts/functions -command_exists dhcp_clients || exit $NA - # NetworkManager is handled by 55NetworkManager, so skip this script if # nm is enabled in sysconfig ... -[ x"${NETWORKMANAGER}" -eq x"yes" ] && exit $NA +[ x"${NETWORKMANAGER}" = x"yes" ] && exit $NA # ... or if is running command_exists nm_running && nm_running && exit $NA +# check network/scripts/function provides dhcp_interfaces() +# function returning a list of interfaces with running dhcp. +command_exists dhcp_interfaces || exit $NA + case "$1" in hibernate|suspend) - save_state "dhcp_clients" "`dhcp_clients`" + savestate "dhcp_interfaces" "`dhcp_interfaces`" service network stop-all-dhcp-clients ;; thaw|resume) - for interface in `restore_state "dhcp_clients"`; do + for interface in `restorestate "dhcp_interfaces"`; do service network restart ${interface} done ;; continue with "q"... 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-ncurses-pkg for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package yast2-ncurses-pkg for openSUSE:Factory checked in at 2012-03-02 13:50:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ncurses-pkg (Old) and /work/SRC/openSUSE:Factory/.yast2-ncurses-pkg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ncurses-pkg", Maintainer is "gs(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2012-01-19 09:45:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-ncurses-pkg.new/yast2-ncurses-pkg.changes 2012-03-02 13:50:42.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 1 14:34:21 CET 2012 - gs(a)suse.de + +- Better formatting of package and patch descriptions +- 2.22.1 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-pkg-2.22.0.tar.bz2 New: ---- yast2-ncurses-pkg-2.22.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses-pkg.spec ++++++ --- /var/tmp/diff_new_pack.QQtlSJ/_old 2012-03-02 13:50:43.000000000 +0100 +++ /var/tmp/diff_new_pack.QQtlSJ/_new 2012-03-02 13:50:43.000000000 +0100 @@ -18,7 +18,7 @@ Name: yast2-ncurses-pkg -Version: 2.22.0 +Version: 2.22.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-ncurses-pkg-2.22.0.tar.bz2 -> yast2-ncurses-pkg-2.22.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.0/VERSION new/yast2-ncurses-pkg-2.22.1/VERSION --- old/yast2-ncurses-pkg-2.22.0/VERSION 2012-01-17 13:55:23.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.1/VERSION 2012-03-01 14:34:03.000000000 +0100 @@ -1 +1 @@ -2.22.0 +2.22.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.0/configure new/yast2-ncurses-pkg-2.22.1/configure --- old/yast2-ncurses-pkg-2.22.0/configure 2012-01-17 13:57:52.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.1/configure 2012-03-01 14:36:23.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-ncurses-pkg 2.22.0. +# Generated by GNU Autoconf 2.68 for yast2-ncurses-pkg 2.22.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -709,8 +709,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ncurses-pkg' PACKAGE_TARNAME='yast2-ncurses-pkg' -PACKAGE_VERSION='2.22.0' -PACKAGE_STRING='yast2-ncurses-pkg 2.22.0' +PACKAGE_VERSION='2.22.1' +PACKAGE_STRING='yast2-ncurses-pkg 2.22.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1492,7 +1492,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-ncurses-pkg 2.22.0 to adapt to many kinds of systems. +\`configure' configures yast2-ncurses-pkg 2.22.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1564,7 +1564,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ncurses-pkg 2.22.0:";; + short | recursive ) echo "Configuration of yast2-ncurses-pkg 2.22.1:";; esac cat <<\_ACEOF @@ -1680,7 +1680,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ncurses-pkg configure 2.22.0 +yast2-ncurses-pkg configure 2.22.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2224,7 +2224,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-ncurses-pkg $as_me 2.22.0, which was +It was created by yast2-ncurses-pkg $as_me 2.22.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3154,7 +3154,7 @@ # Define the identity of the package. PACKAGE='yast2-ncurses-pkg' - VERSION='2.22.0' + VERSION='2.22.1' cat >>confdefs.h <<_ACEOF @@ -3276,7 +3276,7 @@ -VERSION="2.22.0" +VERSION="2.22.1" RPMNAME="yast2-ncurses-pkg" MAINTAINER="Gabriele Mohr <gs(a)suse.de>" @@ -16076,7 +16076,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ncurses-pkg $as_me 2.22.0, which was +This file was extended by yast2-ncurses-pkg $as_me 2.22.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16142,7 +16142,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-ncurses-pkg config.status 2.22.0 +yast2-ncurses-pkg config.status 2.22.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.0/configure.in new/yast2-ncurses-pkg-2.22.1/configure.in --- old/yast2-ncurses-pkg-2.22.0/configure.in 2012-01-17 13:57:45.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.1/configure.in 2012-03-01 14:36:14.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses-pkg, 2.22.0, http://bugs.opensuse.org/, yast2-ncurses-pkg) +AC_INIT(yast2-ncurses-pkg, 2.22.1, http://bugs.opensuse.org/, yast2-ncurses-pkg) 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.22.0" +VERSION="2.22.1" RPMNAME="yast2-ncurses-pkg" MAINTAINER="Gabriele Mohr <gs(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.0/src/NCPackageSelector.cc new/yast2-ncurses-pkg-2.22.1/src/NCPackageSelector.cc --- old/yast2-ncurses-pkg-2.22.0/src/NCPackageSelector.cc 2012-01-17 13:29:58.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.1/src/NCPackageSelector.cc 2012-02-22 14:10:13.000000000 +0100 @@ -1326,9 +1326,6 @@ // // createLicenseText // - -#define DOCTYPETAG "" // Special doctype for preformatted HTML - bool NCPackageSelector::showLicensePopup( string pkgName, string license ) { string html_text = ""; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.0/src/NCPackageSelector.h new/yast2-ncurses-pkg-2.22.1/src/NCPackageSelector.h --- old/yast2-ncurses-pkg-2.22.0/src/NCPackageSelector.h 2012-01-17 13:25:46.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.1/src/NCPackageSelector.h 2012-02-28 14:59:33.000000000 +0100 @@ -102,6 +102,8 @@ return ( toupper( c1 ) == toupper( c2 ) ); } +#define DOCTYPETAG "" // Special doctype for preformatted HTML + /////////////////////////////////////////////////////////////////// // // CLASS NAME : NCPackageSelector diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.0/src/NCPkgFilterRPMGroups.cc new/yast2-ncurses-pkg-2.22.1/src/NCPkgFilterRPMGroups.cc --- old/yast2-ncurses-pkg-2.22.0/src/NCPkgFilterRPMGroups.cc 2012-01-17 13:30:52.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.1/src/NCPkgFilterRPMGroups.cc 2012-02-22 10:22:05.000000000 +0100 @@ -217,7 +217,7 @@ // is the requested rpm group a prefix of this package's group? if ( pkg->group ().find (group_str) == 0 ) { - yuiError() << slb->name() << endl; + yuiDebug() << slb->name() << endl; packageList->createListEntry( pkg, slb ); return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.0/src/NCPkgPackageDetails.cc new/yast2-ncurses-pkg-2.22.1/src/NCPkgPackageDetails.cc --- old/yast2-ncurses-pkg-2.22.0/src/NCPkgPackageDetails.cc 2012-01-17 13:31:48.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.1/src/NCPkgPackageDetails.cc 2012-03-01 14:32:42.000000000 +0100 @@ -43,6 +43,8 @@ #include "NCPkgPackageDetails.h" #include "NCPackageSelector.h" +#include <boost/algorithm/string.hpp> + using namespace zypp; /* @@ -108,7 +110,11 @@ string NCPkgPackageDetails::commonHeader( ZyppObj pkgPtr ) { - string text; + string text = ""; + + if ( !pkgPtr ) + return text; + text += "<h3>" + pkgPtr->name() + " - "; text += pkgPtr->summary() + "</h3>"; @@ -119,11 +125,14 @@ { string text = ""; + if ( !pkgPtr ) + return; + //text += commonHeader( pkgPtr ); text += pkgPtr->description(); // show the description - setValue( text ); + setValue( createHtmlText(text) ); } void NCPkgPackageDetails::technicalData( ZyppObj pkgPtr, ZyppSel slbPtr ) @@ -132,10 +141,10 @@ string version = ""; string text = ""; + if ( !pkgPtr || !slbPtr ) + return; + text += commonHeader( pkgPtr ); - //text += " - "; - - //text += pkgPtr->summary(); if ( slbPtr->hasBothObjects () ) { @@ -199,10 +208,13 @@ text += package->sourcePkgEdition().asString(); text += "<br>"; - //authors, in one line - text += NCPkgStrings::Authors(); list<string> authors = package->authors(); // zypp::Package - text += createText( authors, true ); + if ( !authors.empty() ) + { + text += NCPkgStrings::Authors(); + //authors, in one line + text += createText( authors, true ); + } } @@ -264,6 +276,94 @@ } +string NCPkgPackageDetails::createHtmlText( string value ) +{ + yuiDebug() << "Description: " << value << endl; + + // check RichText tag + if ( value.find( string(DOCTYPETAG) ) != string::npos ) + { + return value; // input is rich text + } + // escape html + boost::replace_all( value, "&", "&" ); + boost::replace_all( value, "<", "<" ); + boost::replace_all( value, ">", ">" ); + + NCstring input( value ); + NCtext descr( input ); + NCtext html_descr( NCstring("<p>") ); + string description = ""; + bool ul_begin = false; + bool ul_found = false; + list<NCstring>::const_iterator line; + + for ( line = descr.Text().begin(); line != descr.Text().end(); ++line ) + { + NCstring curr_line( *line ); + + if ( curr_line.Str().empty() ) + { + if ( ul_found ) // empty line after list + { + html_descr.append( NCstring("</li></ul><p>") ); + ul_found = false; + ul_begin = false; + } + else + { + html_descr.append( NCstring("</p><p>") ); + } + } + else if ( curr_line.Str().substr(0,2) == "- " + || curr_line.Str().substr(0,2) == "* ") // list item found + { + ul_found = true; + if ( !ul_begin ) + { + html_descr.append( NCstring("</p><ul><li>") ); + ul_begin = true; + } + else + { + html_descr.append( NCstring("</li><li>") ); + } + html_descr.append( NCstring(curr_line.Str().substr(2)) ); + } + else if ( curr_line.Str().substr(0,2) == " " ) // white spaces at begin + { + // just append the line (is added to list item or to paragraph) + html_descr.append( NCstring( curr_line.Str() ) ); + } + else + { + if ( ul_found ) // first line after list + { + html_descr.append( NCstring("</li></ul><p>") ); + ul_found = false; + ul_begin = false; + } + html_descr.append( NCstring(" " + curr_line.Str()) ); + } + } + + if ( ul_found ) + html_descr.append( NCstring("</li></ul>") ); + else + html_descr.append( NCstring("</p>") ); + + // create description + for ( line = html_descr.Text().begin(); line != html_descr.Text().end(); ++line ) + { + NCstring curr_line( *line ); + description += curr_line.Str(); + } + // reduce number of empty lines + boost::replace_all( description, "</p><p></p>", "</p>" ); + + return description; +} + bool NCPkgPackageDetails::patchDescription( ZyppObj objPtr, ZyppSel selectable ) { ZyppPatch patchPtr = tryCastToZyppPatch( objPtr ); @@ -301,9 +401,7 @@ // get and format the patch description string value = patchPtr->description(); - descr += "<p>"; - descr += value; - descr += "</p>"; + descr += createHtmlText( value ); descr += _("References:<br>"); for ( Patch::ReferenceIterator rit = patchPtr->referencesBegin(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.0/src/NCPkgPackageDetails.h new/yast2-ncurses-pkg-2.22.1/src/NCPkgPackageDetails.h --- old/yast2-ncurses-pkg-2.22.0/src/NCPkgPackageDetails.h 2012-01-17 13:28:01.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.1/src/NCPkgPackageDetails.h 2012-02-29 10:45:48.000000000 +0100 @@ -61,6 +61,8 @@ string createText( list <string> info, bool oneline ); + string createHtmlText( string description ); + string createRelLine( const zypp::Capabilities & info ); string commonHeader( ZyppObj pkgPtr ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.0/src/NCPkgTable.cc new/yast2-ncurses-pkg-2.22.1/src/NCPkgTable.cc --- old/yast2-ncurses-pkg-2.22.0/src/NCPkgTable.cc 2012-01-17 13:32:52.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.1/src/NCPkgTable.cc 2012-02-22 09:40:43.000000000 +0100 @@ -755,7 +755,6 @@ // show the patch info if (objPtr && slbPtr ) updateInfo( objPtr, slbPtr, VisibleInfo() ); - //packager->showPatchInformation( objPtr, slbPtr ); break; default: break; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-proto-devel for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package xorg-x11-proto-devel for openSUSE:Factory checked in at 2012-03-02 13:50:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-proto-devel (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-proto-devel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-proto-devel", Maintainer is "sndirsch(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2012-02-10 17:21:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-proto-devel.new/xorg-x11-proto-devel.changes 2012-03-02 13:50:37.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Feb 25 20:55:52 UTC 2012 - giecrilj(a)stegny.2a.pl + +- excluded VNC (no license, no upstream) + It will break libvnc, which is however not needed by any package and also contains bogus attribution. + If in doubt, vncproto could be moved there. +- disabled Provides: pkgconfig; to be reverted if the build loop returns and cannot be broken by other means +- singled out xcb-python, as recommended by policy +- improved metadata and documentation + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-proto-devel.spec ++++++ --- /var/tmp/diff_new_pack.2fvigB/_old 2012-03-02 13:50:40.000000000 +0100 +++ /var/tmp/diff_new_pack.2fvigB/_new 2012-03-02 13:50:40.000000000 +0100 @@ -15,22 +15,28 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# No README, pretending to be from X.Org +%bcond_with VNC +%define xproto xproto-7.0.22 +%define xcbp xcb-proto-1.7 +%define vncp vncproto-20070501 Name: xorg-x11-proto-devel BuildRequires: automake BuildRequires: fdupes BuildRequires: pkg-config BuildRequires: python-base +BuildRequires: pkgconfig(xorg-macros) xmlto # manual provides to avoid dependency loop -Provides: pkgconfig(applewmproto) pkgconfig(bigreqsprot) pkgconfig(compositeproto) pkgconfig(damageproto) pkgconfig(dmxproto) pkgconfig(dri2proto) pkgconfig(evieext) pkgconfig(fixesproto) pkgconfig(fontcacheproto) pkgconfig(fontsproto) pkgconfig(glproto) pkgconfig(inputproto) pkgconfig(kbproto) pkgconfig(libpthread-stubs) pkgconfig(printproto) pkgconfig(randrproto) pkgconfig(recordproto) pkgconfig(renderproto) pkgconfig(resourceproto) pkgconfig(scrnsaveproto) pkgconfig(trapproto) pkgconfig(util-macros) pkgconfig(videoproto) pkgconfig(vncproto) pkgconfig(windowswmproto) pkgconfig(xcb-proto) pkgconfig(xcliplistproto) pkgconfig(xcmiscproto) pkgconfig(x86bigfontproto) pkgconfig(xf86dgaproto) pkgconfig(xf86driproto) pkgconfig(xf86miscproto) pkgconfig(xf86rushproto) pkgconfig(xf86vidmodeproto) pkgconfig(xineramaproto) pkgconfig(xproto) pkgconfig(xproxymanagementprotocol) +# Provides: pkgconfig(applewmproto) pkgconfig(bigreqsprot) pkgconfig(compositeproto) pkgconfig(damageproto) pkgconfig(dmxproto) pkgconfig(dri2proto) pkgconfig(evieext) pkgconfig(fixesproto) pkgconfig(fontcacheproto) pkgconfig(fontsproto) pkgconfig(glproto) pkgconfig(inputproto) pkgconfig(kbproto) pkgconfig(libpthread-stubs) pkgconfig(printproto) pkgconfig(randrproto) pkgconfig(recordproto) pkgconfig(renderproto) pkgconfig(resourceproto) pkgconfig(scrnsaveproto) pkgconfig(trapproto) pkgconfig(util-macros) pkgconfig(videoproto) pkgconfig(vncproto) pkgconfig(windowswmproto) pkgconfig(xcb-proto) pkgconfig(xcliplistproto) pkgconfig(xcmiscproto) pkgconfig(x86bigfontproto) pkgconfig(xf86dgaproto) pkgconfig(xf86driproto) pkgconfig(xf86miscproto) pkgconfig(xf86rushproto) pkgconfig(xf86vidmodeproto) pkgconfig(xineramaproto) pkgconfig(xproto) pkgconfig(xproxymanagementprotocol) Url: http://xorg.freedesktop.org/ Version: 7.6 Release: 0 License: MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/X11 -Summary: Include Files and Libraries mandatory for X11 Development +Summary: Header files and Libraries mandatory for X11 Development Source0: applewmproto-1.4.1.tar.bz2 Source1: bigreqsproto-1.1.1.tar.bz2 Source2: compositeproto-0.4.2.tar.bz2 @@ -61,57 +67,62 @@ Source27: xf86rushproto-X11R7.0-1.1.2.tar.bz2 Source28: xf86vidmodeproto-2.3.tar.bz2 Source29: xineramaproto-1.2.tar.bz2 -Source30: xproto-7.0.22.tar.bz2 +Source30: %{xproto}.tar.bz2 Source31: xproxymanagementprotocol-1.0.3.tar.bz2 Source32: evieext-1.1.0.tar.bz2 -Source33: xcb-proto-1.7.tar.bz2 +Source33: %{xcbp}.tar.bz2 Source34: libpthread-stubs-0.3.tar.bz2 -Source35: vncproto-20070501.tar.bz2 +%if %{with VNC} +Source35: %{vncp}.tar.bz2 +%endif Source36: xcliplistproto-20070501.tar.bz2 Source37: dri2proto-2.6.tar.bz2 -Requires: glibc-devel python-base = %{py_ver} +Requires: glibc-devel python-xcb-proto-devel = %{version} %description -This package contains all necessary include files and libraries needed -to develop X11 applications that require these. - - +Header files and libraries needed +to communicate directly with X server and extensions, +including the XML-XCB extension, a full replacement for the original protocol. + +%package -n python-xcb-proto-devel +Summary: Python libraries mandatory for XML-XCB Development +Requires: python-base = %{py_ver} + +%description -n python-xcb-proto-devel +Language-independent Python +libraries that used to parse an XML description and create objects +used by Python code generators in individual language bindings. -Authors: --------- - - Bob Scheifler - Dave Rosenthal - Jim Gettys - Keith Packard - Phil Karlton - Raymond Drewry - Ron Newman - Scott McGregor - Susan Angebrandt - Todd Newman %prep %setup -T -c %{name} -for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done +for i in "$RPM_SOURCE_DIR"/*.tar.bz2 +do +%if %{without VNC} +[[ "$i" == "$RPM_SOURCE_DIR"/%{vncp}.tar.bz2 ]] || +%endif +tar xjf $i +done +mkdir XML-XCB +ln -tXML-XCB %{xcbp}/COPYING %{xcbp}/README %{xcbp}/NEWS %build - -%install -pushd util-macros-* - #autoreconf -fi - ./configure --prefix=/usr --libdir=%{_libdir} - make - make install DESTDIR=$RPM_BUILD_ROOT -popd -export ACLOCAL="aclocal --force -I /usr/share/aclocal -I $RPM_BUILD_ROOT/usr/share/aclocal" -for dir in $(ls */configure.ac); do - pushd $(dirname $dir) - echo $dir | grep -q -E "vncproto|xcliplistproto|xcb-proto" && autoreconf -fi +export ACLOCAL="aclocal --force -I /usr/share/aclocal" +for ac in */configure.ac +do dir="${ac%/*}" + pushd "${dir}" + [[ "${dir}" = vncproto || "${dir}" = xcliplistproto || "${dir}" = xcb-proto ]] && autoreconf -fi ./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ --prefix=/usr --libdir=%{_libdir} make - make install DESTDIR=$RPM_BUILD_ROOT + popd +done + +%install +for ac in */Makefile +do dir="${ac%/*}" + pushd "${dir}" + make install "DESTDIR=$RPM_BUILD_ROOT" popd done rm -f $RPM_BUILD_ROOT/usr/share/util-macros/INSTALL @@ -144,14 +155,19 @@ /usr/include/X11/dri/*.h /usr/include/X11/extensions/*.h /usr/include/X11/fonts/*.h +/usr/%{_lib}/pkgconfig/*.pc +/usr/share/pkgconfig/*.pc +/usr/share/aclocal/*.m4 +/usr/share/xcb/ +%doc %{xproto}/COPYING %{xproto}/AUTHORS XML-XCB %{xcbp}/doc/xml-xcb.txt + +%files -n python-xcb-proto-devel +%defattr(-,root,root) %if %suse_version > 1110 %python_sitelib/xcbgen/ %else /usr/%{_lib}/python2.6/site-packages/xcbgen/ %endif -/usr/%{_lib}/pkgconfig/*.pc -/usr/share/pkgconfig/*.pc -/usr/share/aclocal/*.m4 -/usr/share/xcb/ +%doc %{xcbp}/COPYING %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xfsdump for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package xfsdump for openSUSE:Factory checked in at 2012-03-02 13:50:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfsdump (Old) and /work/SRC/openSUSE:Factory/.xfsdump.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfsdump", Maintainer is "MMarek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xfsdump/xfsdump.changes 2012-02-23 15:35:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xfsdump.new/xfsdump.changes 2012-03-02 13:50:32.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Mar 1 00:42:18 UTC 2012 - rschweikert(a)suse.com + +- really place the binaries in /usr (UsrMerge project) + The configure and Makefiles do not respect the user settings to + configure for certain binaries. This lead to circular linkage on package + build and improper linkage on package install. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfsdump.spec ++++++ --- /var/tmp/diff_new_pack.Cw8HDu/_old 2012-03-02 13:50:33.000000000 +0100 +++ /var/tmp/diff_new_pack.Cw8HDu/_new 2012-03-02 13:50:33.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xfsdump BuildRequires: e2fsprogs-devel BuildRequires: libattr-devel @@ -68,9 +69,12 @@ %install export DIST_ROOT="$RPM_BUILD_ROOT" make install +# Remove the link created by the make file +rm $RPM_BUILD_ROOT/%{_sbindir}/{xfsdump,xfsrestore} +mv $RPM_BUILD_ROOT/sbin/{xfsdump,xfsrestore} $RPM_BUILD_ROOT/%{_sbindir} #UsrMerge -ln -sf %_sbindir/xfsdump $RPM_BUILD_ROOT/sbin -ln -sf %_sbindir/xfsrestore $RPM_BUILD_ROOT/sbin +ln -s %{_sbindir}/xfsdump $RPM_BUILD_ROOT/sbin +ln -s %{_sbindir}/xfsrestore $RPM_BUILD_ROOT/sbin #EndUsrMerge %clean @@ -78,11 +82,11 @@ %files %defattr(-,root,root,755) - %_sbindir/* +%{_sbindir}/* #UsrMerge /sbin/* #EndUsrMerge -%doc %_defaultdocdir/%name -/usr/share/man/man8/* +%doc %{_defaultdocdir}/%name +%{_mandir}/man8/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tinyxml for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package tinyxml for openSUSE:Factory checked in at 2012-03-02 13:50:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tinyxml (Old) and /work/SRC/openSUSE:Factory/.tinyxml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tinyxml", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/tinyxml/tinyxml.changes 2012-02-16 15:02:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tinyxml.new/tinyxml.changes 2012-03-02 13:50:29.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Mar 2 01:25:08 UTC 2012 - crrodriguez(a)opensuse.org + +- Ensure the generated config.h file gets included + in all C++ files during build... + +------------------------------------------------------------------- +Fri Mar 2 01:18:24 UTC 2012 - crrodriguez(a)opensuse.org + +- Make tinyxml slightly tinier by building it with + -fvisibility-inlines-hidden. +- Also build with full RELRO and bsymbolic-functions + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tinyxml.spec ++++++ --- /var/tmp/diff_new_pack.Y4xBuo/_old 2012-03-02 13:50:30.000000000 +0100 +++ /var/tmp/diff_new_pack.Y4xBuo/_new 2012-03-02 13:50:30.000000000 +0100 @@ -93,7 +93,6 @@ %build autoreconf -fi -export CXXFLAGS="%{optflags}" %configure make %{?_smp_mflags} ++++++ Makefile.am ++++++ --- /var/tmp/diff_new_pack.Y4xBuo/_old 2012-03-02 13:50:30.000000000 +0100 +++ /var/tmp/diff_new_pack.Y4xBuo/_new 2012-03-02 13:50:30.000000000 +0100 @@ -11,8 +11,10 @@ ACLOCAL_AMFLAGS = -I m4 lib_LTLIBRARIES = libtinyxml.la +libtinyxml_la_CXXFLAGS = -fvisibility-inlines-hidden +libtinyxml_la_CPPFLAGS = -include $(top_srcdir)/config.h libtinyxml_la_SOURCES = tinyxml.cpp tinystr.cpp tinyxmlerror.cpp tinyxmlparser.cpp -libtinyxml_la_LDFLAGS = -version-info 0:0:0 +libtinyxml_la_LDFLAGS = -Wl,-Bsymbolic-functions -Wl,-z,relro,-z,now -no-undefined -version-info 0:0:0 include_HEADERS = tinyxml.h tinystr.h check_PROGRAMS = xmltest @@ -35,7 +37,7 @@ endif if TINYXML_USE_STL - libtinyxml_la_CPPFLAGS = -DTIXML_USE_STL=1 + libtinyxml_la_CPPFLAGS += -DTIXML_USE_STL=1 endif EXTRA_DIST = changes.txt readme.txt tinyxml_lib.dsp tinyxmlSTL.dsp tinyXmlTestSTL.vcproj \ ++++++ configure.ac ++++++ --- /var/tmp/diff_new_pack.Y4xBuo/_old 2012-03-02 13:50:30.000000000 +0100 +++ /var/tmp/diff_new_pack.Y4xBuo/_new 2012-03-02 13:50:30.000000000 +0100 @@ -10,8 +10,10 @@ # Checks for programs. AC_PROG_CXX -AC_PROG_CC -LT_INIT([disable-static]) +AC_PROG_CC_STDC +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE +LT_INIT([disable-static pic-only]) AC_LANG(C++) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit texmaker for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package texmaker for openSUSE:Factory checked in at 2012-03-02 13:50:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texmaker (Old) and /work/SRC/openSUSE:Factory/.texmaker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texmaker", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/texmaker/texmaker.changes 2012-02-08 17:21:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.texmaker.new/texmaker.changes 2012-03-02 13:50:25.000000000 +0100 @@ -1,0 +2,28 @@ +Wed Feb 29 18:26:17 UTC 2012 - badshah400(a)gmail.com + +- Update to version 3.3.1: + + Bug fixed: A critical bug about the spelling and grammar + checker of the integrated pdf viewer has been fixed. + + Rebase texmaker-correct-doc-location.patch for version 3.3.1. +- Changes from version 3.3: + + New features: + - Users can now define an unlimited number of tags via a new + panel in the "structure view" + - In the integrated pdf viewer, it's now possible to check + spelling and grammar the text extracted from a pdf page + - Main biblatex entries can now be inserted via the + bibliography menu + - The structure of .Rnw files are now checked like the .tex + documents + - \foo{} is now displayed before \foo*{} in the completion + - Commented structure entries are no more used in the + structure view + - Colors are now more hard coded (dark desktop themes can now + be used) + - Overwrite mode can now be used in the editor. + + Many bug fixes (see http://www.xm1math.net/texmaker/log.html + for a full list) + + Building now requires libpoppler-qt4-devel >= 0.16; hence + does not build for openSUSE < 12.1. + +------------------------------------------------------------------- Old: ---- texmaker-3.2.2.tar.bz2 New: ---- texmaker-3.3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texmaker.spec ++++++ --- /var/tmp/diff_new_pack.qy3Bqu/_old 2012-03-02 13:50:26.000000000 +0100 +++ /var/tmp/diff_new_pack.qy3Bqu/_new 2012-03-02 13:50:26.000000000 +0100 @@ -18,7 +18,7 @@ Name: texmaker -Version: 3.2.2 +Version: 3.3.1 Release: 1 License: GPL-2.0 Summary: Free cross-platform LaTeX editor @@ -29,7 +29,7 @@ Patch1: texmaker-correct-doc-location.patch BuildRequires: fdupes BuildRequires: libQtWebKit-devel -BuildRequires: libpoppler-qt4-devel +BuildRequires: libpoppler-qt4-devel >= 0.16 BuildRequires: libqt4-devel >= 4.6.1 BuildRequires: update-desktop-files Requires: hunspell ++++++ texmaker-3.2.2.tar.bz2 -> texmaker-3.3.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/texmaker/texmaker-3.2.2.tar.bz2 /work/SRC/openSUSE:Factory/.texmaker.new/texmaker-3.3.1.tar.bz2 differ: char 11, line 1 ++++++ texmaker-correct-doc-location.patch ++++++ --- /var/tmp/diff_new_pack.qy3Bqu/_old 2012-03-02 13:50:26.000000000 +0100 +++ /var/tmp/diff_new_pack.qy3Bqu/_new 2012-03-02 13:50:26.000000000 +0100 @@ -1,11 +1,11 @@ -Index: texmaker-3.2/texmaker.pro +Index: texmaker-3.3.1/texmaker.pro =================================================================== ---- texmaker-3.2.orig/texmaker.pro -+++ texmaker-3.2/texmaker.pro -@@ -337,9 +337,6 @@ utilities.files = doc/doc1.png \ - doc/usermanual_fr.html \ - doc/usermanual_ru.html \ - doc/usermanual_hu.html \ +--- texmaker-3.3.1.orig/texmaker.pro ++++ texmaker-3.3.1/texmaker.pro +@@ -345,9 +345,6 @@ utilities.files = doc/doc1.png \ + atd/atd.css \ + atd/csshttprequest.js \ + atd/jquery.atd.textarea.js \ - utilities/AUTHORS \ - utilities/COPYING \ - utilities/CHANGELOG.txt \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tboot for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package tboot for openSUSE:Factory checked in at 2012-03-02 13:50:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tboot (Old) and /work/SRC/openSUSE:Factory/.tboot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tboot", Maintainer is "meissner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/tboot/tboot.changes 2012-01-19 10:35:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tboot.new/tboot.changes 2012-03-02 13:50:19.000000000 +0100 @@ -1,0 +2,53 @@ +Tue Feb 28 14:03:52 UTC 2012 - meissner(a)suse.com + +- updated to 1.7.0 + Print version number while changeset info unavailable + Document DA changes in README + Add event log for PCR extends in tboot + Follow details / authorities PCR mapping style in tboot + Support details / authorities PCR mapping + Support TPM event log + fix build issue for txt-stat in 64 bit environment. + update README for mwait AP wakeup mechanism + tboot: provide a new AP wakeup way for OS/VMM - mwait then memory write + Original txt-stat.c doesn't display TXT heap info by default. Add + command line options to display help info and optionally enable + displaying heap info. + Fix a shutdown issue on heavily throttled large server + Adjust mle_hdr.{mle|cmdline}_{start|end}_off according to CS285,286 + changes to give lcp_mlehash correct info to produce hash value. + Fix boot issue caused by including mle page table into tboot memory + Fix for possible overwritting to mle page table by GRUB2 + Add PAGE_UP() fn that rounds things up/donw to a page. + Update get_mbi_mem_end() with a accurate, safer calculating way + ACPI fix and sanity check + Add some sanity check before using mods_count in a count-down loop + TPM: add waiting on expect==0 before issue tpmGo + txt-stat: Don't show heap info by default. + Exchange definitions for TBOOT_BASE_ADDR & TBOOT_START + Add const qualifier for suibable parms of all possible fns. + fix possible mbi overwrite issue for Linux with grub2 + enhance print_mbi() to print more mbi info for debug purpose + Fix for GRUB2 loading elf image such as Xen. + Move apply_policy() call into txt_post_launch() + Don't zap s3_key in tboot shared page if sealing failed due to tpm + unowned + Update the explanation of signed lists to make it clearer. + tboot: add a fall back for reboot via keyboard reset vector + tboot: revise README to explain how to configure GRUB2 config file for + tboot + tboot: rewrite acpi reg access fns to refer to bit_width instead of + access_width + tboot: change reboot mechanism to use keyboard reset vector + tboot: handle mis-programmed TXT config regs and TXT heap gracefully + tboot: add warning when TPM timeout values are wrong + all PM1_CNT accesses should be 16bit. + Enlarge NR_CPUS from 64 to 256 + Add support for SBIOS policy element type (LCP_SBIOS_ELEMENT) to + lcp_crtpolelt + Fix processor id list matching between platform and acmod + Make lcp_crtpollist support empty lists (i.e. with no elements) + print a bit more error reasons in txt-stat + Fix segmentation fault in txt-stat on some systems + +------------------------------------------------------------------- Old: ---- tboot-20110520.tar.bz2 New: ---- tboot-1.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tboot.spec ++++++ --- /var/tmp/diff_new_pack.o4DKtr/_old 2012-03-02 13:50:21.000000000 +0100 +++ /var/tmp/diff_new_pack.o4DKtr/_new 2012-03-02 13:50:21.000000000 +0100 @@ -15,14 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: tboot -Version: 20110520 +%define ver 1.7.0 +Version: 20120115_1.7.0 Release: 0 Summary: Performs a verified launch using Intel(R) TXT License: BSD-3-Clause Group: Productivity/Security Url: http://sourceforge.net/projects/tboot/ -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{ver}.tar.gz #Patch0: tboot-%{version}-Makefile_typo.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: openssl-devel @@ -37,7 +39,7 @@ %prep -%setup -q +%setup -q -n %name-%ver %build export CFLAGS="$RPM_OPT_FLAGS" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sysvinit for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package sysvinit for openSUSE:Factory checked in at 2012-03-02 13:50:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysvinit (Old) and /work/SRC/openSUSE:Factory/.sysvinit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sysvinit", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes 2012-02-08 17:20:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sysvinit.new/sysvinit.changes 2012-03-02 13:50:12.000000000 +0100 @@ -6,0 +7,6 @@ +Wed Feb 1 12:01:05 UTC 2012 - werner(a)suse.de + +- Avoid useless check for runlevel as access(2) now works on + kernel 3.0 and above, this fixes bnc#744538 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ showconsole-1.16.dif ++++++ --- /var/tmp/diff_new_pack.FDYML1/_old 2012-03-02 13:50:14.000000000 +0100 +++ /var/tmp/diff_new_pack.FDYML1/_new 2012-03-02 13:50:14.000000000 +0100 @@ -1,4 +1,19 @@ ---- .#empty -+++ .#empty 2012-01-30 17:44:30.343145442 +0000 -@@ -0,0 +1 @@ -+Place holder +--- libconsole.c ++++ libconsole.c 2012-03-01 09:49:44.493932912 +0000 +@@ -902,16 +902,6 @@ void safeIO (void) + #ifdef DEBUG_SIGIO + if (nsigio < 0) + goto skip; +-#else +- if (nsigio < 0) { +- /* +- * Maybe access() does lie under kernel 2.6 +- * or the root file system is rw mounted +- */ +- const char *runlevel = getenv("RUNLEVEL"); +- if (runlevel && (*runlevel < '0' || *runlevel > '6')) +- goto skip; +- } + #endif + if (access(BOOT_LOGFILE, W_OK) < 0) { + if (errno != ENOENT && errno != EROFS) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit QtZeitgeist for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package QtZeitgeist for openSUSE:Factory checked in at 2012-03-02 13:50:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/QtZeitgeist (Old) and /work/SRC/openSUSE:Factory/.QtZeitgeist.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "QtZeitgeist", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/QtZeitgeist/QtZeitgeist.changes 2012-02-07 22:13:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.QtZeitgeist.new/QtZeitgeist.changes 2012-03-02 13:50:09.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 2 02:09:30 UTC 2012 - crrodriguez(a)opensuse.org + +- Make build verbose to aid log analysis. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ QtZeitgeist.spec ++++++ --- /var/tmp/diff_new_pack.35AjJt/_old 2012-03-02 13:50:10.000000000 +0100 +++ /var/tmp/diff_new_pack.35AjJt/_new 2012-03-02 13:50:10.000000000 +0100 @@ -59,7 +59,7 @@ %else cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} .. %endif -make %{?_smp_mflags} +make VERBOSE=1 %{?_smp_mflags} %install cd build @@ -93,8 +93,8 @@ Summary: Development files for QtZeitgeist Group: Development/Libraries/KDE Requires: %{libname} = %{version} -Requires: libqt4-devel Requires: libQtWebKit-devel +Requires: libqt4-devel Requires: zeitgeist %description devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qtcurve-gtk2 for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package qtcurve-gtk2 for openSUSE:Factory checked in at 2012-03-02 13:50:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qtcurve-gtk2 (Old) and /work/SRC/openSUSE:Factory/.qtcurve-gtk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qtcurve-gtk2", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/qtcurve-gtk2/qtcurve-gtk2.changes 2012-02-20 16:17:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qtcurve-gtk2.new/qtcurve-gtk2.changes 2012-03-02 13:50:04.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Feb 29 07:07:42 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 1.8.14: + + Fix reading of KDE settings. + + Fix button on editable combos with Gtk 2.24 + +------------------------------------------------------------------- Old: ---- QtCurve-Gtk2-1.8.13.tar.bz2 New: ---- QtCurve-Gtk2-1.8.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.HlWTIZ/_old 2012-03-02 13:50:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HlWTIZ/_new 2012-03-02 13:50:05.000000000 +0100 @@ -17,7 +17,7 @@ Name: qtcurve-gtk2 -Version: 1.8.13 +Version: 1.8.14 Release: 0 Summary: QtCurve style for GTK+ 2 License: GPL-2.0+ ++++++ QtCurve-Gtk2-1.8.13.tar.bz2 -> QtCurve-Gtk2-1.8.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.8.13/CMakeLists.txt new/QtCurve-Gtk2-1.8.14/CMakeLists.txt --- old/QtCurve-Gtk2-1.8.13/CMakeLists.txt 2012-02-15 23:04:53.000000000 +0100 +++ new/QtCurve-Gtk2-1.8.14/CMakeLists.txt 2012-02-28 21:18:36.000000000 +0100 @@ -8,7 +8,7 @@ set(CPACK_SOURCE_GENERATOR "TBZ2") set(CPACK_PACKAGE_VERSION_MAJOR "1") set(CPACK_PACKAGE_VERSION_MINOR "8") -set(CPACK_PACKAGE_VERSION_PATCH "13") +set(CPACK_PACKAGE_VERSION_PATCH "14") set(CPACK_PACKAGE_CONTACT "Craig Drummond <craig.p.drummond(a)gmail.com>") set(QTCURVE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}") set(QTCURVE_VERSION_FULL "${QTCURVE_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.8.13/ChangeLog new/QtCurve-Gtk2-1.8.14/ChangeLog --- old/QtCurve-Gtk2-1.8.13/ChangeLog 2012-02-15 23:04:53.000000000 +0100 +++ new/QtCurve-Gtk2-1.8.14/ChangeLog 2012-02-28 21:18:36.000000000 +0100 @@ -1,3 +1,8 @@ +1.8.14 +------ +1. Fix reading of KDE settings. +2. Fix button on editable combos with Gtk 2.24 + 1.8.13 ------ 1. Fix builing with newer glibs - only glib.h itself can be included. @@ -131,7 +136,7 @@ 1. Allow editable combo-box popup to be rounded. 2. Fix initial treeview highlight. 3. Fix rounded popup border when using compositing. - 4. Add vmware, vmplayer, and gtk to list of app to exclude from opacity settings. + 4. Add vmware, vmplayer, and gtk to list of app to exclude from opacity settings. This also prevents using RGBA for rounded tooltips and popup menus. 5. Fix opacity setting of squared popup menus. 6. Improve group-box label positioning. @@ -396,7 +401,7 @@ 17. Fix calculation of alpha values for square rings. 18. Fix progressbar glow central position. 19. Draw more frames. -20. Fix image/gradient background issues with wxWidgets applications. +20. Fix image/gradient background issues with wxWidgets applications. (Use gtk_widget_translate_coordinates to translate widgets coordinates relative to window.) @@ -474,7 +479,7 @@ bgndImage.file=/path/to/svg/file.svg bgndImage.width=120 bgndImage.height=160 - + (Use menuBgndImage for menus) 28. Added option to add a 'glow' to progressbars. @@ -836,7 +841,7 @@ 3. Improve appearance GtkCombo poup menu (even though this is actually a deprecated widget!) 4. When menubars have a border, adjust the menubar items accordingly. -5. When filling the used part of a slider groove, use the slider colour +5. When filling the used part of a slider groove, use the slider colour if set, otherwise use the highlight colour. 0.62.2 @@ -844,7 +849,7 @@ 1. Improve appearance of progressbars in listviews (such as in d4x) 2. Call kde-config (KDE3) / kde4-config (KDE4) to determine location of system icons for creating icon map. - + 0.62.1 ------ 1. Use highlight colour for unselected focused view items. @@ -876,7 +881,7 @@ Line focus Extra rounded (only applies to Gtk2 and KDE4 variants) 5. Allow all bar flat and raised tabs to bol coloured. - 6. Only save appearance settings if different from default. + 6. Only save appearance settings if different from default. 7. If a gradient does not define the values for positions 0 and 100, then add these. 8. Better colouring of selected tab. 9. Added new focus options - full and line. @@ -910,7 +915,7 @@ ------ 1. Allow QtCurve's colours to be overriden if the style name starts with the application name. Fixes Pidgin's tab labels. - + 0.61.2 ------ 1. Fix setting of options if no qtcurvestylerc is found! @@ -1321,7 +1326,7 @@ 2. If KDE_SESSION_VERSION is set to >=4, then read settings from $XDG_CONFIG_HOME/Trolltech.conf 3. Lighten focus rectangle. -4. Fixed tab shift for GTK 2.10.11. Possibly should be applied to an earlier +4. Fixed tab shift for GTK 2.10.11. Possibly should be applied to an earlier version, but not sure. 5. When run under KDE4, allow radio buttons in menus. 6. Add /usr/share/icons into icon search path @@ -1522,7 +1527,7 @@ 4. Seperate specification of scollbar slider, and range slider, settings. 5. Option to specify menubar text colours. 6. New 'flat' appearance. - 7. Dont create custom gcs per widget class, use globals instead - should + 7. Dont create custom gcs per widget class, use globals instead - should use less resources. 8. Options to use a coloured border for mouse-over. 9. Mouse over for tabs! @@ -1536,7 +1541,7 @@ 3. Fix firefox menu colours when C locale indicates to use a comma as decimal separator - patch supplied by Valentine Sinitsyn 4. Fix striped progressbar bleeding in Mozilla apps. -5. More GIMP dialog hackery if --enable-parentless-dialogs-fix is +5. More GIMP dialog hackery if --enable-parentless-dialogs-fix is specified. 6. Treat SiftFox the same as FireFox @@ -2066,7 +2071,7 @@ 0.13 ---- 1. ALL: New V3 style - has rounded buttons, and uses gradient effect on buttons, tabs, - scrollbars, etc. + scrollbars, etc. 2. ALL: Code clean-up. 0.12 @@ -2112,7 +2117,7 @@ 0.06 ---- 1. GTK: Make combo-boxes thinner. -2. GTK: Allow ussage of GTK1 font substitution file, either +2. GTK: Allow ussage of GTK1 font substitution file, either /etc/X11/qt_gtk_fnt2fntrc or ~/.qt/gtk_fnt2fntrc, and format: <replace from> <with> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.8.13/style/helpers.h new/QtCurve-Gtk2-1.8.14/style/helpers.h --- old/QtCurve-Gtk2-1.8.13/style/helpers.h 2012-02-15 23:04:53.000000000 +0100 +++ new/QtCurve-Gtk2-1.8.14/style/helpers.h 2012-02-28 21:18:36.000000000 +0100 @@ -41,6 +41,9 @@ #if GTK_CHECK_VERSION(2, 90, 0) #define QTC_IS_COMBO(X) GTK_IS_COMBO_BOX_TEXT(X) #define QTC_COMBO_ENTRY(X) GTK_IS_COMBO_BOX_TEXT(X) +#elif GTK_CHECK_VERSION(2, 24, 0) + #define QTC_IS_COMBO(X) (GTK_IS_COMBO(X) || GTK_IS_COMBO_BOX_TEXT(X)) + #define QTC_COMBO_ENTRY(X) (GTK_IS_COMBO_BOX_ENTRY(X) || GTK_IS_COMBO_BOX_TEXT(X)) #else #define QTC_IS_COMBO(X) GTK_IS_COMBO(X) #define QTC_COMBO_ENTRY(X) GTK_IS_COMBO_BOX_ENTRY(X) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.8.13/style/qt_settings.c new/QtCurve-Gtk2-1.8.14/style/qt_settings.c --- old/QtCurve-Gtk2-1.8.13/style/qt_settings.c 2012-02-15 23:04:53.000000000 +0100 +++ new/QtCurve-Gtk2-1.8.14/style/qt_settings.c 2012-02-28 21:18:36.000000000 +0100 @@ -52,8 +52,9 @@ #define MAX_APP_NAME_LEN 32 #define KDE_CFG_DIR "/share/config/" -#define KDEGLOBALS_FILE KDE_CFG_DIR"kdeglobals" -#define KDEGLOBALS_SYS_FILE KDE_CFG_DIR"system.kdeglobals" +#define KDE4_SYS_CFG_DIR "/share/kde4/config/" +#define KDEGLOBALS_FILE "kdeglobals" +#define KDEGLOBALS_SYS_FILE "system.kdeglobals" static char * getKdeHome() { @@ -2027,8 +2028,8 @@ "/etc/kderc", qtSettings.qt4 ? "/etc/kde4/kdeglobals" : "/etc/kde3/kdeglobals", qtSettings.qt4 ? "/etc/kde4rc" : "/etc/kde3rc", - qtSettings.qt4 ? KDE4PREFIX KDEGLOBALS_FILE : KDE3PREFIX KDEGLOBALS_FILE, - qtSettings.qt4 ? KDE4PREFIX KDEGLOBALS_SYS_FILE : KDE3PREFIX KDEGLOBALS_SYS_FILE, + qtSettings.qt4 ? KDE4PREFIX KDE4_SYS_CFG_DIR KDEGLOBALS_FILE : KDE3PREFIX KDE_CFG_DIR KDEGLOBALS_FILE, + qtSettings.qt4 ? KDE4PREFIX KDE4_SYS_CFG_DIR KDEGLOBALS_SYS_FILE : KDE3PREFIX KDE_CFG_DIR KDEGLOBALS_SYS_FILE, kdeGlobals(), 0L}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.8.13/style/qtcurve.c new/QtCurve-Gtk2-1.8.14/style/qtcurve.c --- old/QtCurve-Gtk2-1.8.13/style/qtcurve.c 2012-02-15 23:04:53.000000000 +0100 +++ new/QtCurve-Gtk2-1.8.14/style/qtcurve.c 2012-02-28 21:18:36.000000000 +0100 @@ -125,7 +125,7 @@ // so register ur own error handler, and then unregister afterwards... guint id=g_log_set_handler("Gtk", G_LOG_LEVEL_CRITICAL, qtcLogHandler, NULL); g_object_set_data(G_OBJECT(topLevel), BUTTON_HACK, (gpointer)1); - + gtk_dialog_set_alternative_button_order(GTK_DIALOG(topLevel), GTK_RESPONSE_HELP, GTK_RESPONSE_OK, GTK_RESPONSE_YES, GTK_RESPONSE_ACCEPT, GTK_RESPONSE_APPLY, GTK_RESPONSE_REJECT, GTK_RESPONSE_CLOSE, GTK_RESPONSE_NO, GTK_RESPONSE_CANCEL, -1); @@ -177,11 +177,11 @@ if(opts.windowDrag>WM_DRAG_MENU_AND_TOOLBAR && (DETAIL("base") || DETAIL("eventbox") || DETAIL("viewportbin"))) qtcWMMoveSetup(widget); - + if(widget && ((100!=opts.bgndOpacity && GTK_IS_WINDOW(widget)) || (100!=opts.dlgOpacity && GTK_IS_DIALOG(widget))) && !isFixedWidget(widget) && isRgbaWidget(widget)) enableBlurBehind(widget, TRUE); - + if ((opts.menubarHiding || opts.statusbarHiding || BLEND_TITLEBAR || opts.windowBorder&WINDOW_BORDER_USE_MENUBAR_COLOR_FOR_TITLEBAR) && widget && GTK_IS_WINDOW(widget) && !isFixedWidget(widget) && !isGimpDockable(widget) && !isMenuOrToolTipWindow) { @@ -200,7 +200,7 @@ if(BLEND_TITLEBAR || opts.menubarHiding&HIDE_KWIN || opts.windowBorder&WINDOW_BORDER_USE_MENUBAR_COLOR_FOR_TITLEBAR) qtcMenuEmitSize(menuBar, hiddenMenubar ? 0 : alloc.height); - + if(opts.menubarHiding&HIDE_KWIN) qtcWindowMenuBarDBus(widget, hiddenMenubar ? 0 : alloc.height); } @@ -212,7 +212,7 @@ if(statusBar && gtk_statusbar_get_has_resize_grip(GTK_STATUSBAR(statusBar))) gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(statusBar), FALSE); #endif - + if(opts.statusbarHiding && statusBar) { gboolean hiddenStatusBar=qtcStatusBarHidden(qtSettings.appName); @@ -490,7 +490,7 @@ { if (GTK_STATE_ACTIVE==state) state=GTK_STATE_PRELIGHT; - + { GdkColor *arrowColor=MO_ARROW(false, &qtSettings.colors[GTK_STATE_INSENSITIVE==state ? PAL_DISABLED : PAL_ACTIVE] @@ -630,7 +630,7 @@ if(opts.unifySpin && isSpinButton && !opts.vArrows && GTK_ARROW_DOWN==arrow_type) y--; - + if(GTK_STATE_ACTIVE==state && (sbar || isSpinButton) && MO_GLOW==opts.coloredMouseOver) state=GTK_STATE_PRELIGHT; @@ -649,7 +649,7 @@ col=&qtSettings.colors[PAL_ACTIVE][COLOR_WINDOW_BORDER_TEXT]; else if(opts.customMenuTextColor) col=&opts.customMenuNormTextColor; - else if (SHADE_BLEND_SELECTED==opts.shadeMenubars || SHADE_SELECTED==opts.shadeMenubars || + else if (SHADE_BLEND_SELECTED==opts.shadeMenubars || SHADE_SELECTED==opts.shadeMenubars || (SHADE_CUSTOM==opts.shadeMenubars && TOO_DARK(qtcPalette.menubar[ORIGINAL_SHADE]))) col=&style->text[GTK_STATE_SELECTED]; } @@ -717,7 +717,7 @@ if(menubar && !isFakeGtk() && opts.shadeMenubarOnlyWhenActive) { GtkWindow *topLevel=GTK_WINDOW(gtk_widget_get_toplevel(widget)); - + if(topLevel && GTK_IS_WINDOW(topLevel)) { #define SHADE_ACTIVE_MB_HACK_SET "QTC_SHADE_ACTIVE_MB_HACK_SET" @@ -818,7 +818,7 @@ #endif { GdkRectangle a; - + a.x=x+2, a.y=y, a.width=width-2, a.height=height; setCairoClipping(cr, &a); } @@ -894,7 +894,7 @@ bgnd=4; } #endif - + if(tbar_button && TBTN_JOINED==opts.tbarBtns) { adjustToolbarButtons(widget, &xAdjust, &yAdjust, &wAdjust, &hAdjust, &round, horiz_tbar); @@ -1295,7 +1295,7 @@ int bg=SHADE_DARKEN==opts.comboBtn || (GTK_STATE_INSENSITIVE==state && SHADE_NONE!=opts.comboBtn) ? getFillReal(state, btnDown, true) : bgnd; - + btn.x=vx+(rev ? LARGE_ARR_WIDTH+4 : 0), btn.y=y, btn.width=20+3, btn.height=height; @@ -1376,7 +1376,7 @@ if((menubar && opts.windowDrag || (opts.windowDrag>WM_DRAG_MENUBAR))) qtcWMMoveSetup(widget); - + if(menubar && BLEND_TITLEBAR) { menuBarAdjust=qtcGetWindowBorderSize(FALSE).titleHeight; @@ -1386,7 +1386,7 @@ if(widget && (opacity!=100 || CUSTOM_BGND)) drawWindowBgnd(cr, style, area, window, widget, x, y, width, height); - + if(drawGradient) { drawBevelGradientAlpha(cr, area, x, y-menuBarAdjust, width, height+menuBarAdjust, col, @@ -1460,11 +1460,11 @@ drawWindowBgnd(cr, style, area, window, widget, x, y, width, height); } unsetCairoClipping(cr); - + if(WIDGET_PBAR_TROUGH==wt) drawProgressGroove(cr, style, state, window, widget, area, x, y, width, height, TRUE, TRUE); else - drawBorder(cr, style, state, area, x, y, width, height, NULL, + drawBorder(cr, style, state, area, x, y, width, height, NULL, menuScroll || opts.square&SQUARE_FRAME ? ROUNDED_NONE : ROUNDED_ALL, shadowToBorder(shadow), wt, STD_BORDER); } CAIRO_END @@ -1498,7 +1498,7 @@ composActive=!nonGtk && compositingActive(widget), isAlphaWidget=!nonGtk && composActive && isRgbaWidget(widget), useAlpha=!nonGtk && qtSettings.useAlpha && isAlphaWidget; - + if(/*(composActive && !useAlpha) || */(opts.popupBorder && square)) { drawAreaColor(cr, area, &style->base[state], x, y, width, height); @@ -1567,7 +1567,7 @@ } if(mapped && GTK_STATE_INSENSITIVE!=qtcWidgetGetState(widget)) gtk_widget_queue_draw(mapped); - + qtcWidgetMapSetup(parent, widget, 1); qtcComboBoxSetup(widget, parent); } @@ -1586,7 +1586,7 @@ rev=reverseLayout(widget) || (combo && parent && reverseLayout(parent)); GtkWidget *btn=NULL; GtkStateType savedState=state; - + #if GTK_CHECK_VERSION(2, 16, 0) #if !GTK_CHECK_VERSION(2, 90, 0) /* Gtk3:TODO !!! */ if(isSpin && widget && width==qtcWidgetGetAllocation(widget).width) @@ -1827,20 +1827,20 @@ // static gboolean isHoveredCell(GtkWidget *widget, int x, int y, int width, int height) // { // gboolean hovered=FALSE; -// +// // if(widget && GTK_IS_TREE_VIEW(widget)) // { // GtkTreePath *path=NULL; // GtkTreeViewColumn *column=NULL; -// +// // qtcTreeViewSetup(widget); // qtcTreeViewGetCell(GTK_TREE_VIEW(widget), &path, &column, x, y, width, height); // hovered=path && qtcTreeViewIsCellHovered(widget, path, column); // } -// +// // return hovered; // } - + static void gtkDrawCheck(GtkStyle *style, GdkWindow *window, GtkStateType state, GtkShadowType shadow, GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint x, gint y, gint width, gint height) { @@ -1899,7 +1899,7 @@ if(DETAIL("cellrenderertext") && widget && GTK_STATE_INSENSITIVE==qtcWidgetGetState(widget)) state=GTK_STATE_INSENSITIVE; - + #ifndef READ_INACTIVE_PAL /* If we reead the inactive palette, then there is no need for the following... */ /* The following fixes the text in list views... if not used, when an item is selected it gets the selected text color - but when the window changes focus it gets the normal @@ -1907,7 +1907,7 @@ if(DETAIL("cellrenderertext") && GTK_STATE_ACTIVE==state) state=GTK_STATE_SELECTED; #endif - + if(!isMenuItem && GTK_STATE_PRELIGHT==state) state=GTK_STATE_NORMAL; @@ -1928,7 +1928,7 @@ if(req.height<qtcWidgetGetAllocation(widget).height && req.height%2) y++; } - + but= but || isOnComboBox(widget, 0); if(isOnListViewHeader(widget, 0)) @@ -2176,7 +2176,7 @@ GdkColor newColors[TOTAL_SHADES+1], *btnColors; int min=MIN_SLIDER_SIZE(opts.sliderThumbs); - + #ifdef INCREASE_SB_SLIDER if(scrollbar) lastSlider.widget=NULL; @@ -2223,7 +2223,7 @@ if(scrollbar && GTK_STATE_ACTIVE==state) state=GTK_STATE_PRELIGHT; #endif - + drawBox(style, window, state, shadow, area, widget, !scrollbar ? "qtc-slider" : "slider", x, y, width, height, FALSE); /* Orientation is always vertical with Mozilla, why? Anyway this hack should be OK - as we only draw @@ -2236,7 +2236,7 @@ ? qtcPalette.mouseover : */btnColors; gboolean horiz=GTK_ORIENTATION_HORIZONTAL==orientation; - + if(LINE_SUNKEN==opts.sliderThumbs) if(horiz) y--, height++; @@ -2803,7 +2803,7 @@ switch(token) { default: - g_scanner_get_next_token(scanner); + g_scanner_get_next_token(scanner); token = G_TOKEN_RIGHT_CURLY; } @@ -2910,7 +2910,7 @@ { GdkScreen *screen = gdk_screen_get_default(); GdkColormap *colormap = screen ? gdk_screen_get_rgba_colormap(screen) : NULL; - + if (colormap) { gtk_widget_push_colormap(colormap); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-ssh for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package python-ssh for openSUSE:Factory checked in at 2012-03-02 13:49:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ssh (Old) and /work/SRC/openSUSE:Factory/.python-ssh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-ssh", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-02-28 22:35:32.095577906 +0100 +++ /work/SRC/openSUSE:Factory/.python-ssh.new/python-ssh.changes 2012-03-02 13:49:58.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Mon Feb 20 21:42:29 UTC 2012 - saschpe(a)gmx.de + +- Initial version + New: ---- python-ssh.changes python-ssh.spec ssh-1.7.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ssh.spec ++++++ # # spec file for package python-ssh # # Copyright (c) 2012 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/ # Name: python-ssh Version: 1.7.13 Release: 0 Url: http://pypi.python.org/pypi/ssh Summary: SSH2 protocol library License: LGPL-2.1+ Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/s/ssh/ssh-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-pycrypto Requires: python-pycrypto %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description This is a library for making SSH2 connections (client or server). Emphasis is on using SSH2 as an alternative to SSL for making secure connections between python scripts. All major ciphers and hash methods are supported. SFTP client and server mode are both supported too. %prep %setup -q -n ssh-%{version} mv docs html # Fancier name for HTML documentation %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %check python test.py %files %defattr(-,root,root,-) %doc LICENSE README demos html %{python_sitelib}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit php5-pear-Horde_Rdo for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package php5-pear-Horde_Rdo for openSUSE:Factory checked in at 2012-03-02 13:49:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-Horde_Rdo (Old) and /work/SRC/openSUSE:Factory/.php5-pear-Horde_Rdo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-Horde_Rdo", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-Horde_Rdo/php5-pear-Horde_Rdo.changes 2011-09-23 12:40:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5-pear-Horde_Rdo.new/php5-pear-Horde_Rdo.changes 2012-03-02 13:49:53.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Feb 22 16:07:47 UTC 2012 - Ralf Lang <lang(a)b1-systems.de> + +- version 1.1.1 +- [rla] Fix issue with retrieving lazy fields (Bug #11012). + +------------------------------------------------------------------- +Mon Jan 9 13:57:40 UTC 2012 - lang(a)b1-systems.de + +- version 1.1.0 +- [jan] Add Horde_Rdo_Query#distinct() (Request #10535). + +------------------------------------------------------------------- Old: ---- Horde_Rdo-1.0.1.tgz New: ---- Horde_Rdo-1.1.1.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-Horde_Rdo.spec ++++++ --- /var/tmp/diff_new_pack.iSQRj2/_old 2012-03-02 13:49:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iSQRj2/_new 2012-03-02 13:49:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package php5-pear-Horde_Rdo # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -20,12 +20,12 @@ %define xmldir /var/lib/pear Summary: PEAR: Horde ORM API +License: LGPL-2.1 +Group: Development/Libraries/PHP Name: php5-pear-Horde_Rdo -Version: 1.0.1 -Release: 1 -License: LGPL -Group: Development/Libraries/PHP +Version: 1.1.1 +Release: 0 Source0: http://pear.horde.org/get/Horde_Rdo-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://pear.horde.org/package/Horde_Rdo ++++++ Horde_Rdo-1.0.1.tgz -> Horde_Rdo-1.1.1.tgz ++++++ ++++ 6091 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit php5-pear-Horde_Mime_Viewer for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package php5-pear-Horde_Mime_Viewer for openSUSE:Factory checked in at 2012-03-02 13:49:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-Horde_Mime_Viewer (Old) and /work/SRC/openSUSE:Factory/.php5-pear-Horde_Mime_Viewer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-Horde_Mime_Viewer", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-Horde_Mime_Viewer/php5-pear-Horde_Mime_Viewer.changes 2012-01-25 10:40:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.php5-pear-Horde_Mime_Viewer.new/php5-pear-Horde_Mime_Viewer.changes 2012-03-02 13:49:49.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 28 15:39:25 UTC 2012 - lang(a)b1-systems.de + +- changed license to LGPL-2.1 (for the library) and LGPL-3.0 (for included javascript) (Bug #712306) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-Horde_Mime_Viewer.spec ++++++ --- /var/tmp/diff_new_pack.ZvM3vw/_old 2012-03-02 13:49:50.000000000 +0100 +++ /var/tmp/diff_new_pack.ZvM3vw/_new 2012-03-02 13:49:50.000000000 +0100 @@ -21,7 +21,9 @@ %define hordedir /usr/share/php5/PEAR/www/horde Summary: PEAR: Horde MIME Viewer Library -License: LGPL-2.1 +## Contains javascript with LGPL-3.0 header. +## Actual php code is LGPL-2.1 (not +) +License: LGPL-2.1 and LGPL-3.0 Group: Development/Libraries/PHP Name: php5-pear-Horde_Mime_Viewer -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit php5-pear-Horde_Cache for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package php5-pear-Horde_Cache for openSUSE:Factory checked in at 2012-03-02 13:49:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-Horde_Cache (Old) and /work/SRC/openSUSE:Factory/.php5-pear-Horde_Cache.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-Horde_Cache", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-Horde_Cache/php5-pear-Horde_Cache.changes 2011-09-23 12:40:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5-pear-Horde_Cache.new/php5-pear-Horde_Cache.changes 2012-03-02 13:49:45.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Feb 22 15:46:58 UTC 2012 - Ralf Lang <lang(a)b1-systems.de> + +- spdx license tag +- added downstream license file. Next upstream package version ships its own + +------------------------------------------------------------------- +Wed Jun 1 21:22:25 UTC 2011 - lang(a)b1-systems.de + +- version 1.0.4 +- [mms] Fix memcache duplicate keys (Bug #10072; goncalo.queiros(a)portugalmail.net). + +------------------------------------------------------------------- Old: ---- Horde_Cache-1.0.3.tgz New: ---- COPYING Horde_Cache-1.0.4.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-Horde_Cache.spec ++++++ --- /var/tmp/diff_new_pack.B2MkoQ/_old 2012-03-02 13:49:46.000000000 +0100 +++ /var/tmp/diff_new_pack.B2MkoQ/_new 2012-03-02 13:49:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package php5-pear-Horde_Cache # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Ralf Lang. # # All modifications and additions to the file contributed by third parties @@ -22,11 +22,12 @@ Name: php5-pear-Horde_Cache %define pear_name Horde_Cache %define pear_sname horde_cache -Version: 1.0.3 +Version: 1.0.4 Release: 1 -License: LGPL +License: LGPL-2.1 Group: Development/Libraries/PHP Source0: http://pear.horde.org/get/Horde_Cache-%{version}.tgz +Source1: COPYING BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://pear.horde.org/package/Horde_Cache BuildRequires: php5-pear >= 1.4.7 @@ -73,6 +74,7 @@ install --offline --nodeps -R "%{buildroot}" package.xml %{__install} -D -m 0644 package.xml %{buildroot}%{php_pearxmldir}/%{pear_name}.xml +%{__install} -D -m 0644 %{SOURCE1} %{buildroot}%{_docdir}/%{name}/COPYING %{__rm} -rf %{buildroot}/{doc,tmp} %{__rm} -rf %{buildroot}%{php_peardir}/.{filemap,lock,registry,channels,depdb,depdblock} @@ -99,4 +101,6 @@ %files -f %{name}.files %defattr(-,root,root) +%{_docdir}/%{name} + %changelog ++++++ COPYING ++++++ GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. [This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) The modified work must itself be a software library. b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS ++++++ Horde_Cache-1.0.3.tgz -> Horde_Cache-1.0.4.tgz ++++++ ++++ 3440 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pciutils-ids for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package pciutils-ids for openSUSE:Factory checked in at 2012-03-02 13:49:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pciutils-ids (Old) and /work/SRC/openSUSE:Factory/.pciutils-ids.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pciutils-ids", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pciutils-ids/pciutils-ids.changes 2012-02-24 12:06:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pciutils-ids.new/pciutils-ids.changes 2012-03-02 13:49:32.000000000 +0100 @@ -2 +2 @@ -Fri Feb 24 03:40:09 CET 2012 - autobuild(a)suse.de +Fri Mar 2 03:40:18 CET 2012 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2012-02-24 +- automated update on 2012-03-02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pciutils-ids.spec ++++++ --- /var/tmp/diff_new_pack.2gieBe/_old 2012-03-02 13:49:33.000000000 +0100 +++ /var/tmp/diff_new_pack.2gieBe/_new 2012-03-02 13:49:33.000000000 +0100 @@ -17,7 +17,7 @@ Name: pciutils-ids -Version: 2012.2.24 +Version: 2012.2.27 Release: 0 Summary: PCI-utilities pci.ids database License: GPL-2.0+ ++++++ pci.ids.bz2 ++++++ --- /var/tmp/diff_new_pack.2gieBe/_old 2012-03-02 13:49:33.000000000 +0100 +++ /var/tmp/diff_new_pack.2gieBe/_new 2012-03-02 13:49:33.000000000 +0100 @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2012.02.24 -# Date: 2012-02-24 03:15:01 +# Version: 2012.02.27 +# Date: 2012-02-27 03:15:01 # # Maintained by Martin Mares <mj(a)ucw.cz> and other volunteers from the # PCI ID Project at http://pci-ids.ucw.cz/. @@ -3613,6 +3613,7 @@ 1443 8024 FireBoard Blue 1458 1000 GA-EP45-DS5 Motherboard 8025 TSB82AA2 IEEE-1394b Link Layer Controller + 1043 813c P5P series mainboard 1443 8025 FireBoard800 1458 1000 GA-K8N Ultra-9 Mainboard 1546 8025 FWB-PCI01 @@ -14750,6 +14751,7 @@ 1a78 0037 tachIOn PCIe SSD [rev 3D] 1a78 0038 tachIOn PCIe SSD [rev 4] 1a78 0039 tachIOn PCIe SSD [rev 4D] + 1a78 0040 FlashMAX PCIe SSD [LP Z1] 1a84 Commex Technologies 0001 Vulcan SP HT6210 10-Gigabit Ethernet (rev 02) 1a88 MEN Mikro Elektronik @@ -15592,6 +15594,12 @@ 0372 80333 Segment-B PCI Express-to-PCI Express Bridge 0373 80333 B-Bus IOAPIC 0374 80333 Address Translation Unit + 0402 Haswell Integrated Graphics Controller + 0406 Haswell Integrated Graphics Controller + 040a Haswell Integrated Graphics Controller + 0412 Haswell Integrated Graphics Controller + 0416 Haswell Integrated Graphics Controller + 041a Haswell Integrated Graphics Controller 0436 DH89xxCC Gigabit SGMII Connection 0438 DH8900CC Series Gigabit Network Connection 043a DH8900CC Series Gigabit Fiber Network Connection @@ -15741,17 +15749,11 @@ 0bf7 Atom Processor D2xxx/N2xxx DRAM Controller 0c00 Haswell DRAM Controller 0c01 Haswell PCI Express x16 Controller - 0c02 Haswell Integrated Graphics Controller 0c04 Haswell DRAM Controller 0c05 Haswell PCI Express x8 Controller - 0c06 Haswell Integrated Graphics Controller 0c08 Haswell DRAM Controller 0c09 Haswell PCI Express x4 Controller - 0c0a Haswell Integrated Graphics Controller 0c0c Haswell HD Audio Controller - 0c12 Haswell Integrated Graphics Controller - 0c16 Haswell Integrated Graphics Controller - 0c1a Haswell Integrated Graphics Controller 0c46 Centerton PCI Express Root Port 1 0c47 Centerton PCI Express Root Port 2 0c48 Centerton PCI Express Root Port 3 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit osdlyrics for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package osdlyrics for openSUSE:Factory checked in at 2012-03-02 13:49:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osdlyrics (Old) and /work/SRC/openSUSE:Factory/.osdlyrics.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osdlyrics", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/osdlyrics/osdlyrics.changes 2012-02-14 19:04:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.osdlyrics.new/osdlyrics.changes 2012-03-02 13:49:24.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Mar 01 21:37:17 UTC+8 2012 - hillwood(a)linuxfans.org + +- add xmms2 spport +- split the translations in a lang subpackage +- rename patch file +- fixed some RPMLINT report warnings + +------------------------------------------------------------------- Old: ---- glib.patch New: ---- osdlyrics-glib.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osdlyrics.spec ++++++ --- /var/tmp/diff_new_pack.GuE0H9/_old 2012-03-02 13:49:25.000000000 +0100 +++ /var/tmp/diff_new_pack.GuE0H9/_new 2012-03-02 13:49:25.000000000 +0100 @@ -16,12 +16,13 @@ # + Name: osdlyrics Version: 0.4.2 Release: 0 -Summary: OSDlyrics is a third-party lyrics display program. +Summary: A third-party lyrics display program License: GPL-3.0 -Group: Applications/Multimedia +Group: Productivity/Multimedia/Sound/Visualization Url: http://code.google.com/p/osd-lyrics/ Source0: http://osd-lyrics.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,14 +42,17 @@ BuildRequires: libtool BuildRequires: sqlite3-devel BuildRequires: update-desktop-files -Requires: dbus-1-glib , libglade2, libnotify, sqlite3 +BuildRequires: xmms2-devel +Requires: sqlite3 Requires: gtk2 -Requires: libcurl4 %if 0%{?suse_version} > 1210 -Patch0: glib.patch +Patch0: osdlyrics-glib.patch %endif +# These package are all in home:hillwood Obsoletes: osd-lyrics osdlyrics-beta osdlyrics-git +%lang_package + %description OSD Lyrics ==================== @@ -78,6 +82,7 @@ Rhythmbox Songbird VLC + XMMS2 =================== Authors: @@ -95,7 +100,7 @@ %build %configure --disable-mpd \ - --disable-xmms2 + --enable-xmms2 make %{?_smp_mflags} %install @@ -104,9 +109,6 @@ %find_lang %{name} -%clean -rm -rf $RPM_BUILD_ROOT - %post %if 0%{?suse_version} < 1140 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -131,7 +133,7 @@ %icon_theme_cache_post %endif -%files -f %{name}.lang +%files %defattr(-,root,root,-) %doc AUTHORS ChangeLog README %doc COPYING @@ -140,4 +142,6 @@ %{_datadir}/icons/hicolor/ %{_datadir}/osdlyrics/ +%files lang -f %{name}.lang + %changelog ++++++ osdlyrics-glib.patch ++++++ diff -Nur osdlyrics-0.4.2/src/ol_keybinder.h osdlyrics-0.4.2-new/src/ol_keybinder.h --- osdlyrics-0.4.2/src/ol_keybinder.h 2012-01-19 07:18:00.000000000 +0800 +++ osdlyrics-0.4.2-new/src/ol_keybinder.h 2012-01-19 10:08:36.493909000 +0800 @@ -24,7 +24,7 @@ #ifndef __DO_KEY_BINDER_H__ #define __DO_KEY_BINDER_H__ -#include <glib/gtypes.h> +#include <glib.h> G_BEGIN_DECLS -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit optipng for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package optipng for openSUSE:Factory checked in at 2012-03-02 13:49:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/optipng (Old) and /work/SRC/openSUSE:Factory/.optipng.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "optipng", Maintainer is "PGajdos(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/optipng/optipng.changes 2011-09-23 12:21:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.optipng.new/optipng.changes 2012-03-02 13:49:23.000000000 +0100 @@ -1,0 +2,19 @@ +Fri Mar 2 11:54:06 UTC 2012 - pgajdos(a)suse.com + +- updated to 0.7: + + Added the popularly-requested option -strip. + + Added the option -backup, as an alias of -keep. + + Added the option -silent, as an alias of -quiet. + - Deprecated the option -log. + * Changed the activity display output from STDOUT to STDERR. + + Allowed the option -preserve to save high-resolution timestamps + on Unix, if the POSIX-1.2008 API is available. This feature was + previously available on Windows only. + ! Fixed a minor precision error in the display of file size percents. + ! Fixed a memory leak that occurred when reading broken GIF images. + ! Fixed various build issues. + (Thanks to Sebastian Pipping and Ville Skytta for the fixes.) + * Resolved all remaining compatibility issues with libpng-1.5. + (Thanks in part to Adam Ciarcinski for the contribution.) + +------------------------------------------------------------------- Old: ---- optipng-0.6.5.tar.bz2 optipng-libpng14.patch optipng-suse-paths.diff New: ---- optipng-0.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ optipng.spec ++++++ --- /var/tmp/diff_new_pack.WtRMbI/_old 2012-03-02 13:49:24.000000000 +0100 +++ /var/tmp/diff_new_pack.WtRMbI/_new 2012-03-02 13:49:24.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package optipng # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -23,14 +23,12 @@ License: Zlib Group: Productivity/Archiving/Compression Summary: A PNG File Compressor -Version: 0.6.5 +Version: 0.7 Release: 1 Url: http://optipng.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %name-%{version}.tar.bz2 +Source0: %name-%{version}.tar.gz Source1: macros.optipng -Patch0: %{name}-suse-paths.diff -Patch1: %{name}-libpng14.patch %description OptiPNG is a PNG optimizer that recompresses image files to a smaller @@ -46,13 +44,13 @@ %prep %setup -q -%patch0 -# upstream uses pngpriv.h from libpng, which is not allowed -%patch1 -p1 %build -./configure -with-system-zlib -with-system-libpng -prefix=/usr -make CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="$RPM_OPT_FLAGS" +./configure -with-system-zlib -with-system-libpng -prefix=%{_prefix} -mandir=%{_mandir} +#don't strip binaries +sed -i "s:$LDFLAGS = $-s:\1:" src/optipng/Makefile +make %install %makeinstall @@ -63,7 +61,7 @@ %files %defattr(-,root,root) -#%doc FEATURES HISTORY DESIGN TODO CAVEAT +%doc README.txt doc /usr/bin/optipng /usr/share/man/man1/optipng.1.gz /etc/rpm/macros.optipng -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mutter for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package mutter for openSUSE:Factory checked in at 2012-03-02 13:49:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mutter (Old) and /work/SRC/openSUSE:Factory/.mutter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mutter", Maintainer is "JLee(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mutter/mutter.changes 2012-02-21 12:22:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mutter.new/mutter.changes 2012-03-02 13:49:19.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Feb 23 07:25:31 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.90: + + Update for Cogl API changes + + Bug fixes (including bgo#659643) + + Build fixes + + Updated translations. +- Change clutter-devel and gtk3-devel BuildRequires to + pkgconfig(clutter-1.0) and pkgconfig(gtk+-3.0). +- Add explicit pkgconfig() BuildRequires: cairo, cogl-1.0, gio-2.0, + pango. + +------------------------------------------------------------------- Old: ---- mutter-3.3.5.tar.xz New: ---- mutter-3.3.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutter.spec ++++++ --- /var/tmp/diff_new_pack.GDMYIA/_old 2012-03-02 13:49:22.000000000 +0100 +++ /var/tmp/diff_new_pack.GDMYIA/_new 2012-03-02 13:49:22.000000000 +0100 @@ -17,18 +17,16 @@ Name: mutter -Version: 3.3.5 +Version: 3.3.90 Release: 0 Summary: Window and compositing manager based on Clutter License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org Source: http://download.gnome.org/sources/mutter/3.3/%{name}-%{version}.tar.xz -BuildRequires: clutter-devel BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel -BuildRequires: gobject-introspection-devel -BuildRequires: gtk3-devel >= 3.3.7 +BuildRequires: gobject-introspection-devel >= 0.9.5 BuildRequires: intltool BuildRequires: libSM-devel BuildRequires: libX11-devel @@ -39,8 +37,14 @@ BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: zenity +BuildRequires: pkgconfig(cairo) >= 1.10.0 +BuildRequires: pkgconfig(clutter-1.0) >= 1.9.10 +BuildRequires: pkgconfig(cogl-1.0) >= 1.9.6 +BuildRequires: pkgconfig(gio-2.0) >= 2.25.10 BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.3.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.7 BuildRequires: pkgconfig(libcanberra-gtk3) +BuildRequires: pkgconfig(pango) >= 1.2.0 BuildRequires: pkgconfig(xcomposite) >= 0.2 BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xdamage) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libxml2 for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package libxml2 for openSUSE:Factory checked in at 2012-03-02 13:49:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxml2 (Old) and /work/SRC/openSUSE:Factory/.libxml2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libxml2", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libxml2/libxml2.changes 2012-02-26 10:14:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libxml2.new/libxml2.changes 2012-03-02 13:49:15.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 1 18:36:33 CET 2012 - meissner(a)suse.de + +- fixed a 64bit big endian bug in the file reader. + +------------------------------------------------------------------- New: ---- bigendian64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxml2.spec ++++++ --- /var/tmp/diff_new_pack.jUyqPd/_old 2012-03-02 13:49:18.000000000 +0100 +++ /var/tmp/diff_new_pack.jUyqPd/_new 2012-03-02 13:49:18.000000000 +0100 @@ -28,6 +28,7 @@ # Source ftp://xmlsoft.org/libxml2/libxml2-git-snapshot.tar.gz changes every day Source: libxml2-git-snapshot.tar.gz Source2: baselibs.conf +Patch0: bigendian64.patch BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: xz-devel @@ -127,6 +128,7 @@ %prep %setup -q -n %{name}-2.7.8 +%patch0 -p0 %build %configure --disable-static \ ++++++ bigendian64.patch ++++++ --- xzlib.c.xx 2012-03-01 17:23:54.000000000 +0000 +++ xzlib.c 2012-03-01 17:24:48.000000000 +0000 @@ -228,9 +228,14 @@ if (state->err != LZMA_OK) return -1; if (state->eof == 0) { + /* avail_in is size_t, which is not necessary sizeof(unsigned) */ + unsigned tmp = strm->avail_in; if (xz_load(state, state->in, state->size, - (unsigned *) &(strm->avail_in)) == -1) + &tmp) == -1) { + strm->avail_in = tmp; return -1; + } + strm->avail_in = tmp; strm->next_in = state->in; } return 0; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libprison for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package libprison for openSUSE:Factory checked in at 2012-03-02 13:48:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libprison (Old) and /work/SRC/openSUSE:Factory/.libprison.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libprison", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libprison/libprison.changes 2011-09-23 02:09:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libprison.new/libprison.changes 2012-03-02 13:48:58.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 01:46:58 UTC 2012 - crrodriguez(a)opensuse.org + +- Build with fvisibility-inlines-hidden , in this case + this saves only dozen symbol table entries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libprison.spec ++++++ --- /var/tmp/diff_new_pack.EBfczC/_old 2012-03-02 13:49:00.000000000 +0100 +++ /var/tmp/diff_new_pack.EBfczC/_new 2012-03-02 13:49:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libprison # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,15 +16,14 @@ # - Name: libprison %define rname prison Version: 1.0 -Release: 1 -License: MIT +Release: 0 Summary: Qt api to produce QRCode and DataMatrix barcodes -Url: https://projects.kde.org/projects/prison +License: MIT Group: Development/Libraries/C and C++ +Url: https://projects.kde.org/projects/prison Source: %{rname}-%{version}.tar.bz2 BuildRequires: cmake BuildRequires: kde4-filesystem @@ -38,7 +37,6 @@ barcodes and DataMatrix barcodes, and can easily be made support more. %package -n libprison0 -License: MIT Summary: Qt api to produce QRCode and DataMatrix barcodes Group: Development/Libraries/C and C++ @@ -47,7 +45,6 @@ barcodes and DataMatrix barcodes, and can easily be made support more. %package devel -License: MIT Summary: Qt api to produce QRCode and DataMatrix barcodes Group: Development/Libraries/C and C++ Requires: libprison0 = %{version} @@ -57,9 +54,10 @@ barcodes and DataMatrix barcodes, and can easily be made support more. %prep -%setup -n %{rname}-%{version} +%setup -q -n %{rname}-%{version} %build +export RPM_OPT_FLAGS="%optflags -fvisibility-inlines-hidden" %cmake_kde4 -d build %make_jobs -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libpeas for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package libpeas for openSUSE:Factory checked in at 2012-03-02 13:48:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpeas (Old) and /work/SRC/openSUSE:Factory/.libpeas.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libpeas", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libpeas/libpeas.changes 2012-01-09 15:18:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libpeas.new/libpeas.changes 2012-03-02 13:48:55.000000000 +0100 @@ -1,0 +2,20 @@ +Mon Feb 27 14:30:51 UTC 2012 - vuntz(a)opensuse.org + +- Add libpeas-released-gjs.patch: fix to build with the current + tarball of gjs, instead of requiring some change from git. We'll + drop the patch when we'll get a new gjs release. +- Add gnome-common BuildRequires and call to gnome-autogen.sh, + needed for above patch. + +------------------------------------------------------------------- +Sat Feb 25 21:08:04 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 1.3.0: + + Extensions can now implement multiple interfaces. + + Added GSettings API to PeasPluginInfo. + + Misc improvement and fixes. + + Updated translations. +- Add explicit pkgconfig(gio-2.0) BuildRequires: new dependency + upstream. + +------------------------------------------------------------------- Old: ---- libpeas-1.2.0.tar.bz2 New: ---- libpeas-1.3.0.tar.xz libpeas-released-gjs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpeas.spec ++++++ --- /var/tmp/diff_new_pack.lcEiBI/_old 2012-03-02 13:48:57.000000000 +0100 +++ /var/tmp/diff_new_pack.lcEiBI/_new 2012-03-02 13:48:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libpeas # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,20 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libpeas -Version: 1.2.0 +Version: 1.3.0 Release: 0 Summary: GObject-based Plugin Engine License: LGPL-2.1+ Group: System/Libraries Url: http://live.gnome.org/Libpeas -Source: http://download.gnome.org/sources/libpeas/1.2/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/libpeas/1.3/%{name}-%{version}.tar.xz +## WARNING: when dropping the patch, change back versioned pkgconfig(gjs-internals-1.0) to 1.31.11 +# PATCH-FIX-OPENSUSE libpeas-released-gjs.patch vuntz(a)opensuse.org -- Revert a change that requires gjs from git; we'll drop the patch when we'll get the newer gjs +Patch0: libpeas-released-gjs.patch +# needed for patch0 +BuildRequires: gnome-common BuildRequires: intltool BuildRequires: libseed-gtk3-devel BuildRequires: python-devel +BuildRequires: pkgconfig(gio-2.0) >= 2.31.2 BuildRequires: pkgconfig(gjs-internals-1.0) >= 1.29.16 BuildRequires: pkgconfig(gladeui-2.0) -BuildRequires: pkgconfig(gobject-2.0) >= 2.23.6 +BuildRequires: pkgconfig(gobject-2.0) >= 2.28.0 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.10.1 BuildRequires: pkgconfig(gtk+-3.0) >= 2.91.1 BuildRequires: pkgconfig(pygobject-3.0) >= 3.0.0 @@ -127,8 +134,8 @@ %package -n glade-catalog-libpeas Summary: GObject-based Plugin Engine -- Catalog for Glade Group: Development/Tools/GUI Builders -Requires: libpeas-gtk-1_0-0 = %{version} Requires: glade +Requires: libpeas-gtk-1_0-0 = %{version} Supplements: packageand(glade:%{name}-devel) %description -n glade-catalog-libpeas @@ -153,8 +160,11 @@ %lang_package %prep %setup -q +%patch0 -p1 -R %build +# needed for patch0 +NOCONFIGURE=1 gnome-autogen.sh %configure \ --enable-glade-catalog make %{?_smp_flag} V=1 @@ -182,7 +192,6 @@ %{_libdir}/libpeas-1.0.so.* %dir %{_libdir}/libpeas-1.0 %dir %{_libdir}/libpeas-1.0/loaders -%{_libdir}/libpeas-1.0/loaders/libcloader.so %files -n typelib-1_0-Peas-1_0 %defattr(-,root,root) ++++++ libpeas-released-gjs.patch ++++++ >From 16aace6524345da3d09ed3d80e79487dfcff41f8 Mon Sep 17 00:00:00 2001 From: Evan Nemerson <evan(a)coeus-group.com> Date: Sat, 04 Feb 2012 19:14:41 +0000 Subject: Fix compilation with gjs >= 8cd5e7bd. https://bugzilla.gnome.org/show_bug.cgi?id=669373 --- diff --git a/configure.ac b/configure.ac index 19c023b..198db40 100644 --- a/configure.ac +++ b/configure.ac @@ -272,7 +272,7 @@ dnl ================================================================ dnl GJS Javascript Engine dnl ================================================================ -GJS_REQUIRED=1.29.16 +GJS_REQUIRED=1.31.11 AC_ARG_ENABLE(gjs, AS_HELP_STRING([--enable-gjs],[Enable GJS support]), diff --git a/loaders/gjs/peas-extension-gjs.c b/loaders/gjs/peas-extension-gjs.c index 0e5d652..84ab44a 100644 --- a/loaders/gjs/peas-extension-gjs.c +++ b/loaders/gjs/peas-extension-gjs.c @@ -248,7 +248,7 @@ peas_extension_gjs_call (PeasExtensionWrapper *exten, if (direction == GI_DIRECTION_IN && !gjs_value_from_g_argument (gexten->js_context, &js_args[n_in_args++], &arg_cache[cached_args].type_info, - &args[i])) + &args[i], TRUE)) { g_warning ("Error failed to convert argument '%s'", g_base_info_get_name (&arg_cache[cached_args].arg_info)); @@ -263,7 +263,7 @@ peas_extension_gjs_call (PeasExtensionWrapper *exten, args[i].v_pointer, &arg); if (!gjs_value_from_g_argument (gexten->js_context, &js_args[n_in_args++], - &arg_cache[cached_args].type_info, &arg)) + &arg_cache[cached_args].type_info, &arg, TRUE)) { g_warning ("Error failed to convert argument '%s'", g_base_info_get_name (&arg_cache[cached_args].arg_info)); -- cgit v0.9.0.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libpcap for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package libpcap for openSUSE:Factory checked in at 2012-03-02 13:48:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpcap (Old) and /work/SRC/openSUSE:Factory/.libpcap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libpcap", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libpcap/libpcap.changes 2012-01-11 15:38:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libpcap.new/libpcap.changes 2012-03-02 13:48:53.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 28 14:43:12 CET 2012 - jslaby(a)suse.de + +- make it work also on kernels without netfilter (bnc#746356) + +------------------------------------------------------------------- New: ---- libpcap-1.2.1-netfilter-dont-fail-on-EPROTONOSUPPORT.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpcap.spec ++++++ --- /var/tmp/diff_new_pack.66I2Ar/_old 2012-03-02 13:48:54.000000000 +0100 +++ /var/tmp/diff_new_pack.66I2Ar/_new 2012-03-02 13:48:54.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libpcap Version: 1.2.1 Release: 0 @@ -32,6 +33,7 @@ Patch5: libpcap-1.0.0-man.patch Patch6: libpcap-1.0.0-mac_syntax.patch Patch7: libpcap-1.1.1-scanif.patch +Patch8: libpcap-1.2.1-netfilter-dont-fail-on-EPROTONOSUPPORT.patch BuildRequires: bison BuildRequires: bluez-devel BuildRequires: flex @@ -83,6 +85,7 @@ %patch5 %patch6 %patch7 +%patch8 -p1 %build %ifarch %sparc ++++++ libpcap-1.2.1-netfilter-dont-fail-on-EPROTONOSUPPORT.patch ++++++ >From 5fad270aaa970512fc2aaf8f2ea361b247bb7477 Mon Sep 17 00:00:00 2001 From: Jiri Slaby <jirislaby(a)gmail.com> Date: Tue, 28 Feb 2012 14:36:43 +0100 Subject: [PATCH] netfilter: don't fail on EPROTONOSUPPORT EPROTONOSUPPORT is what I get from the kernel if I don't have netfilter enabled. This bug prevents tcpdump/wireshark to work properly: tcpdump: Can't open netlink socket 93:Protocol not supported --- pcap-netfilter-linux.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pcap-netfilter-linux.c b/pcap-netfilter-linux.c index 225e49f..86235d1 100644 --- a/pcap-netfilter-linux.c +++ b/pcap-netfilter-linux.c @@ -452,8 +452,8 @@ struct my_nfattr { sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER); if (sock < 0) { - /* if netlink is not supported this this is not fatal */ - if (errno == EAFNOSUPPORT) + /* if netlink is not supported, this is not fatal */ + if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT) return 0; snprintf(err_str, PCAP_ERRBUF_SIZE, "Can't open netlink socket %d:%s", errno, pcap_strerror(errno)); -- 1.7.5.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libchamplain for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package libchamplain for openSUSE:Factory checked in at 2012-03-02 13:48:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libchamplain (Old) and /work/SRC/openSUSE:Factory/.libchamplain.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libchamplain", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libchamplain/libchamplain.changes 2012-01-09 15:17:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libchamplain.new/libchamplain.changes 2012-03-02 13:48:51.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 27 14:24:10 UTC 2012 - vuntz(a)opensuse.org + +- Add libchamplain-vapi-cogl-pango.patch: fix build with vala 0.15. +- Add libtool BuildRequires and call to autoreconf, needed for + above patch. + +------------------------------------------------------------------- New: ---- libchamplain-vapi-cogl-pango.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libchamplain.spec ++++++ --- /var/tmp/diff_new_pack.6PVxUj/_old 2012-03-02 13:48:53.000000000 +0100 +++ /var/tmp/diff_new_pack.6PVxUj/_new 2012-03-02 13:48:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libchamplain # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -19,11 +19,14 @@ Name: libchamplain Version: 0.12.1 Release: 0 +# FIXME: on update, check if patch0 is still needed, or if it got fixed in vala Summary: Library to display maps License: LGPL-2.1+ Group: Development/Libraries/GNOME Url: http://projects.gnome.org/libchamplain/ Source0: http://download.gnome.org/sources/libchamplain/0.12/%{name}-%{version}.tar.… +# PATCH-FIX-UPSTREAM libchamplain-vapi-cogl-pango.patch bgo#669378 vuntz(a)opensuse.org -- Fix build with vala 0.15 +Patch0: libchamplain-vapi-cogl-pango.patch BuildRequires: clutter-devel BuildRequires: clutter-gtk-devel BuildRequires: fdupes @@ -31,6 +34,8 @@ BuildRequires: gobject-introspection-devel BuildRequires: gtk3-devel BuildRequires: libsoup-devel +# needed for patch0 +BuildRequires: libtool BuildRequires: memphis-devel BuildRequires: sqlite3-devel BuildRequires: vala @@ -86,12 +91,15 @@ %prep %setup -q +%patch0 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh %endif %build +# needed for patch0 +autoreconf -fi %configure --disable-static --enable-vala %__make %{?_smp_mflags} V=1 ++++++ libchamplain-vapi-cogl-pango.patch ++++++ >From 79062869a18ef70862f5cadb51a53731d3ba5cc1 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev <tetromino(a)gentoo.org> Date: Sat, 4 Feb 2012 16:51:53 -0500 Subject: [PATCH] Call vapigen with --pkg cogl-pango-1.0 https://bugzilla.gnome.org/show_bug.cgi?id=669378 --- champlain-gtk/Makefile.am | 2 +- champlain/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am index 1efeeea..549c197 100644 --- a/champlain-gtk/Makefile.am +++ b/champlain-gtk/Makefile.am @@ -113,7 +113,7 @@ if ENABLE_VALA CLEANFILES += $(dist_vapi_DATA) champlain-gtk-@CHAMPLAIN_API_VERSION@.vapi: GtkChamplain-@CHAMPLAIN_API_VERSION@.gir - $(AM_V_GEN) ( $(VAPIGEN) --library champlain-gtk-@CHAMPLAIN_API_VERSION@ --vapidir=$(top_builddir)/champlain --pkg champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-gtk-1.0 --pkg gtk+-3.0 --pkg atk --pkg pangocairo --girdir=$(top_builddir)/champlain $(builddir)/GtkChamplain-@CHAMPLAIN_API_VERSION@.gir ) + $(AM_V_GEN) ( $(VAPIGEN) --library champlain-gtk-@CHAMPLAIN_API_VERSION@ --vapidir=$(top_builddir)/champlain --pkg champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-gtk-1.0 --pkg cogl-pango-1.0 --pkg gtk+-3.0 --pkg atk --pkg pangocairo --girdir=$(top_builddir)/champlain $(builddir)/GtkChamplain-@CHAMPLAIN_API_VERSION@.gir ) endif diff --git a/champlain/Makefile.am b/champlain/Makefile.am index a4b55a6..f145e9f 100644 --- a/champlain/Makefile.am +++ b/champlain/Makefile.am @@ -206,7 +206,7 @@ if ENABLE_VALA CLEANFILES += $(dist_vapi_DATA) champlain-@CHAMPLAIN_API_VERSION@.vapi: Champlain-@CHAMPLAIN_API_VERSION@.gir - $(AM_V_GEN) ( $(VAPIGEN) --library champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-1.0 --pkg atk --pkg pangocairo $(builddir)/Champlain-@CHAMPLAIN_API_VERSION@.gir ) + $(AM_V_GEN) ( $(VAPIGEN) --library champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-1.0 --pkg cogl-pango-1.0 --pkg atk --pkg pangocairo $(builddir)/Champlain-@CHAMPLAIN_API_VERSION@.gir ) endif -- 1.7.8.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kernel-source for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2012-03-02 13:48:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source", Maintainer is "kernel-maintainers(a)forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes 2012-01-27 15:21:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 2012-03-02 13:48:35.000000000 +0100 @@ -1,0 +2,113 @@ +Wed Feb 29 15:22:34 CET 2012 - jbeulich(a)novell.com + +- Update Xen patches to 3.3-rc5 and c/s 1157. +- config.conf: Re-enable Xen configs. +- Update config files. +- commit f225622 + +------------------------------------------------------------------- +Mon Feb 27 03:38:40 CET 2012 - jeffm(a)suse.com + +- Updated to 3.3-rc5. +- commit 0b7f048 + +------------------------------------------------------------------- +Sun Feb 19 18:00:16 CET 2012 - jeffm(a)suse.com + +- Updated to 3.3-rc4. +- commit 8831dca + +------------------------------------------------------------------- +Mon Feb 13 19:33:57 CET 2012 - trenn(a)suse.de + +- cpufreq/gx: Fix the compile error. +- commit 4ba1d8b + +------------------------------------------------------------------- +Mon Feb 13 17:23:49 CET 2012 - mmarek(a)suse.cz + +- nvme: Mark as broken on x86_32. +- commit 28ad576 + +------------------------------------------------------------------- +Sun Feb 12 18:15:10 CET 2012 - trenn(a)suse.de + +- Add driver auto probing for x86 features v4 + (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html). +- x86/cpu: Fix overrun check in arch_print_cpu_modalias() + (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html). +- crypto: Add support for x86 cpuid + auto loading for x86 crypto drivers + (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html). +- x86/cpu: Clean up modalias feature matching + (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html). +- intel-idle: convert to x86_cpu_id auto probing + (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html). +- intel_idle: Fix ID for Nehalem-EX Xeon in device ID table + (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html). +- HWMON: Convert via-cputemp to x86 cpuid autoprobing + (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html). +- powernow-k7: Fix CPU family number + (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html). +- ACPI: Load acpi-cpufreq from processor driver automatically + (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html). +- intel_idle: Revert change of auto_demotion_flags for Nehalem + (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html). +- HWMON: Convert coretemp to x86 cpuid autoprobing + (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html). +- powernow-k6: Really enable auto-loading + (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html). +- X86: Introduce HW-Pstate scattered cpuid feature + (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html). +- cpufreq: Add support for x86 cpuinfo auto loading v4 + (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html). +- x86: autoload microcode driver on Intel and AMD systems v2 + (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html). +- CPU: Introduce ARCH_HAS_CPU_AUTOPROBE and X86 parts + (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html). +- ACPI: remove duplicated lines of merging + problems with acpi_processor_start + (http://lists.opensuse.org/opensuse-kernel/2011-11/msg00075.html). +- Update config files. +- commit 6efe9b5 + +------------------------------------------------------------------- +Fri Feb 10 12:03:36 CET 2012 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: Build x86 packages as i686, except for +-default (bnc#745632). KMPs are still built as i586. +- commit 88a632b + +------------------------------------------------------------------- +Thu Feb 9 15:57:54 CET 2012 - jeffm(a)suse.com + +- Update to 3.3-rc3. +- commit 07ec27c + +------------------------------------------------------------------- +Thu Feb 9 12:53:26 CET 2012 - agraf(a)suse.de + +- armv7l: Update config files. +- commit d223353 + +------------------------------------------------------------------- +Thu Feb 9 12:48:21 CET 2012 - agraf(a)suse.de + +- armv7l: config: integrate bmwiedemann's updates to make it usable +- commit 76d12ed + +------------------------------------------------------------------- +Tue Feb 7 18:28:41 CET 2012 - jeffm(a)suse.com + +- Update vanilla config files. +- commit fd3673f + +------------------------------------------------------------------- +Tue Feb 7 18:12:40 CET 2012 - jeffm(a)suse.com + +- Update to 3.3-rc2. + - Eliminated 5 patches. + - Xen is disabled. +- commit d017ea1 + +------------------------------------------------------------------- kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-imx51.changes: same change kernel-omap2plus.changes: same change kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-tegra.changes: same change kernel-trace.changes: same change kernel-u8500.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change Old: ---- linux-3.2.tar.bz2 New: ---- linux-3.3-rc5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:48.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:48.000000000 +0100 @@ -17,14 +17,15 @@ # norootforbuild -%define srcversion 3.2 -%define patchversion 3.2.0 +%define srcversion 3.3-rc5 +%define patchversion 3.3.0-rc5 %define variant %{nil} %define vanilla_only 0 %include %_sourcedir/kernel-spec-macros %define build_flavor debug +%define build_default (%build_flavor == "default") %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") @@ -56,7 +57,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -Version: 3.2.0 +Version: 3.3.rc5 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -135,7 +136,7 @@ Obsoletes: kernel-kdump %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.b… Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -196,6 +197,17 @@ Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 ppc64 x86_64 +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif # These files are found in the kernel-source package: NoSource: 0 @@ -627,9 +639,9 @@ # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. - if [ ! -e %rpm_install_dir/%_target_cpu ]; then - ln -sf %cpu_arch %rpm_install_dir/%_target_cpu - ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu + if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then + ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu + ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu fi # We were building in %my_builddir/linux-%srcversion, but the sources will @@ -906,9 +918,9 @@ %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor -%if %_target_cpu != %cpu_arch -%obj_install_dir/%_target_cpu -/usr/src/linux-obj/%_target_cpu +%if %kmp_target_cpu != %cpu_arch +%obj_install_dir/%kmp_target_cpu +/usr/src/linux-obj/%kmp_target_cpu %endif %endif ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:48.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:48.000000000 +0100 @@ -17,14 +17,15 @@ # norootforbuild -%define srcversion 3.2 -%define patchversion 3.2.0 +%define srcversion 3.3-rc5 +%define patchversion 3.3.0-rc5 %define variant %{nil} %define vanilla_only 0 %include %_sourcedir/kernel-spec-macros %define build_flavor default +%define build_default (%build_flavor == "default") %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") @@ -56,7 +57,7 @@ Name: kernel-default Summary: The Standard Kernel -Version: 3.2.0 +Version: 3.3.rc5 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -151,7 +152,7 @@ Obsoletes: smp kernel-smp %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.b… Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -212,6 +213,17 @@ Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: armv7l %ix86 ia64 ppc ppc64 s390x x86_64 +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif # These files are found in the kernel-source package: NoSource: 0 @@ -642,9 +654,9 @@ # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. - if [ ! -e %rpm_install_dir/%_target_cpu ]; then - ln -sf %cpu_arch %rpm_install_dir/%_target_cpu - ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu + if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then + ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu + ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu fi # We were building in %my_builddir/linux-%srcversion, but the sources will @@ -919,9 +931,9 @@ %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor -%if %_target_cpu != %cpu_arch -%obj_install_dir/%_target_cpu -/usr/src/linux-obj/%_target_cpu +%if %kmp_target_cpu != %cpu_arch +%obj_install_dir/%kmp_target_cpu +/usr/src/linux-obj/%kmp_target_cpu %endif %endif ++++++ kernel-desktop.spec ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:48.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:48.000000000 +0100 @@ -17,14 +17,15 @@ # norootforbuild -%define srcversion 3.2 -%define patchversion 3.2.0 +%define srcversion 3.3-rc5 +%define patchversion 3.3.0-rc5 %define variant %{nil} %define vanilla_only 0 %include %_sourcedir/kernel-spec-macros %define build_flavor desktop +%define build_default (%build_flavor == "default") %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") @@ -56,7 +57,7 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop -Version: 3.2.0 +Version: 3.3.rc5 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -132,7 +133,7 @@ Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.b… Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -193,6 +194,17 @@ Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif # These files are found in the kernel-source package: NoSource: 0 @@ -636,9 +648,9 @@ # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. - if [ ! -e %rpm_install_dir/%_target_cpu ]; then - ln -sf %cpu_arch %rpm_install_dir/%_target_cpu - ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu + if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then + ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu + ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu fi # We were building in %my_builddir/linux-%srcversion, but the sources will @@ -939,9 +951,9 @@ %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor -%if %_target_cpu != %cpu_arch -%obj_install_dir/%_target_cpu -/usr/src/linux-obj/%_target_cpu +%if %kmp_target_cpu != %cpu_arch +%obj_install_dir/%kmp_target_cpu +/usr/src/linux-obj/%kmp_target_cpu %endif %endif ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:48.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:48.000000000 +0100 @@ -17,14 +17,14 @@ # norootforbuild -%define patchversion 3.2.0 +%define patchversion 3.3.0-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-docs Summary: Kernel Documentation -Version: 3.2.0 +Version: 3.3.rc5 Release: 0 BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source%variant ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:48.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:48.000000000 +0100 @@ -17,14 +17,15 @@ # norootforbuild -%define srcversion 3.2 -%define patchversion 3.2.0 +%define srcversion 3.3-rc5 +%define patchversion 3.3.0-rc5 %define variant %{nil} %define vanilla_only 0 %include %_sourcedir/kernel-spec-macros %define build_flavor ec2 +%define build_default (%build_flavor == "default") %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") @@ -56,7 +57,7 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel -Version: 3.2.0 +Version: 3.3.rc5 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -132,7 +133,7 @@ Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.b… Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -193,6 +194,17 @@ Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif # These files are found in the kernel-source package: NoSource: 0 @@ -626,9 +638,9 @@ # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. - if [ ! -e %rpm_install_dir/%_target_cpu ]; then - ln -sf %cpu_arch %rpm_install_dir/%_target_cpu - ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu + if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then + ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu + ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu fi # We were building in %my_builddir/linux-%srcversion, but the sources will @@ -909,9 +921,9 @@ %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor -%if %_target_cpu != %cpu_arch -%obj_install_dir/%_target_cpu -/usr/src/linux-obj/%_target_cpu +%if %kmp_target_cpu != %cpu_arch +%obj_install_dir/%kmp_target_cpu +/usr/src/linux-obj/%kmp_target_cpu %endif %endif ++++++ kernel-imx51.spec ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:48.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:48.000000000 +0100 @@ -17,14 +17,15 @@ # norootforbuild -%define srcversion 3.2 -%define patchversion 3.2.0 +%define srcversion 3.3-rc5 +%define patchversion 3.3.0-rc5 %define variant %{nil} %define vanilla_only 0 %include %_sourcedir/kernel-spec-macros %define build_flavor imx51 +%define build_default (%build_flavor == "default") %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") @@ -56,7 +57,7 @@ Name: kernel-imx51 Summary: Kernel for Freescale's iMX SoC -Version: 3.2.0 +Version: 3.3.rc5 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -132,7 +133,7 @@ Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.b… Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -193,6 +194,17 @@ Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: armv7l +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif # These files are found in the kernel-source package: NoSource: 0 @@ -624,9 +636,9 @@ # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. - if [ ! -e %rpm_install_dir/%_target_cpu ]; then - ln -sf %cpu_arch %rpm_install_dir/%_target_cpu - ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu + if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then + ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu + ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu fi # We were building in %my_builddir/linux-%srcversion, but the sources will @@ -903,9 +915,9 @@ %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor -%if %_target_cpu != %cpu_arch -%obj_install_dir/%_target_cpu -/usr/src/linux-obj/%_target_cpu +%if %kmp_target_cpu != %cpu_arch +%obj_install_dir/%kmp_target_cpu +/usr/src/linux-obj/%kmp_target_cpu %endif %endif ++++++ kernel-omap2plus.spec ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:48.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:48.000000000 +0100 @@ -17,14 +17,15 @@ # norootforbuild -%define srcversion 3.2 -%define patchversion 3.2.0 +%define srcversion 3.3-rc5 +%define patchversion 3.3.0-rc5 %define variant %{nil} %define vanilla_only 0 %include %_sourcedir/kernel-spec-macros %define build_flavor omap2plus +%define build_default (%build_flavor == "default") %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") @@ -56,7 +57,7 @@ Name: kernel-omap2plus Summary: Kernel for Texas instrument's OMAP SoC -Version: 3.2.0 +Version: 3.3.rc5 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -132,7 +133,7 @@ Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.b… Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -193,6 +194,17 @@ Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: armv7l +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif # These files are found in the kernel-source package: NoSource: 0 @@ -624,9 +636,9 @@ # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. - if [ ! -e %rpm_install_dir/%_target_cpu ]; then - ln -sf %cpu_arch %rpm_install_dir/%_target_cpu - ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu + if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then + ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu + ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu fi # We were building in %my_builddir/linux-%srcversion, but the sources will @@ -903,9 +915,9 @@ %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor -%if %_target_cpu != %cpu_arch -%obj_install_dir/%_target_cpu -/usr/src/linux-obj/%_target_cpu +%if %kmp_target_cpu != %cpu_arch +%obj_install_dir/%kmp_target_cpu +/usr/src/linux-obj/%kmp_target_cpu %endif %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:48.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:48.000000000 +0100 @@ -17,14 +17,15 @@ # norootforbuild -%define srcversion 3.2 -%define patchversion 3.2.0 +%define srcversion 3.3-rc5 +%define patchversion 3.3.0-rc5 %define variant %{nil} %define vanilla_only 0 %include %_sourcedir/kernel-spec-macros %define build_flavor pae +%define build_default (%build_flavor == "default") %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") @@ -56,7 +57,7 @@ Name: kernel-pae Summary: Kernel with PAE Support -Version: 3.2.0 +Version: 3.3.rc5 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -135,7 +136,7 @@ Obsoletes: kernel-bigsmp %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.b… Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -196,6 +197,17 @@ Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif # These files are found in the kernel-source package: NoSource: 0 @@ -633,9 +645,9 @@ # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. - if [ ! -e %rpm_install_dir/%_target_cpu ]; then - ln -sf %cpu_arch %rpm_install_dir/%_target_cpu - ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu + if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then + ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu + ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu fi # We were building in %my_builddir/linux-%srcversion, but the sources will @@ -924,9 +936,9 @@ %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor -%if %_target_cpu != %cpu_arch -%obj_install_dir/%_target_cpu -/usr/src/linux-obj/%_target_cpu +%if %kmp_target_cpu != %cpu_arch +%obj_install_dir/%kmp_target_cpu +/usr/src/linux-obj/%kmp_target_cpu %endif %endif ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100 @@ -17,14 +17,15 @@ # norootforbuild -%define srcversion 3.2 -%define patchversion 3.2.0 +%define srcversion 3.3-rc5 +%define patchversion 3.3.0-rc5 %define variant %{nil} %define vanilla_only 0 %include %_sourcedir/kernel-spec-macros %define build_flavor ppc64 +%define build_default (%build_flavor == "default") %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") @@ -56,7 +57,7 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems -Version: 3.2.0 +Version: 3.3.rc5 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -139,7 +140,7 @@ Obsoletes: kernel-kdump %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.b… Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -200,6 +201,17 @@ Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc ppc64 +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif # These files are found in the kernel-source package: NoSource: 0 @@ -637,9 +649,9 @@ # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. - if [ ! -e %rpm_install_dir/%_target_cpu ]; then - ln -sf %cpu_arch %rpm_install_dir/%_target_cpu - ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu + if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then + ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu + ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu fi # We were building in %my_builddir/linux-%srcversion, but the sources will @@ -928,9 +940,9 @@ %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor -%if %_target_cpu != %cpu_arch -%obj_install_dir/%_target_cpu -/usr/src/linux-obj/%_target_cpu +%if %kmp_target_cpu != %cpu_arch +%obj_install_dir/%kmp_target_cpu +/usr/src/linux-obj/%kmp_target_cpu %endif %endif ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100 @@ -17,14 +17,15 @@ # norootforbuild -%define srcversion 3.2 -%define patchversion 3.2.0 +%define srcversion 3.3-rc5 +%define patchversion 3.3.0-rc5 %define variant %{nil} %define vanilla_only 0 %include %_sourcedir/kernel-spec-macros %define build_flavor s390 +%define build_default (%build_flavor == "default") %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") @@ -56,7 +57,7 @@ Name: kernel-s390 Summary: The Standard Kernel -Version: 3.2.0 +Version: 3.3.rc5 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -135,7 +136,7 @@ Obsoletes: kernel-32bit %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.b… Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -196,6 +197,17 @@ Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: s390 +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif # These files are found in the kernel-source package: NoSource: 0 @@ -626,9 +638,9 @@ # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. - if [ ! -e %rpm_install_dir/%_target_cpu ]; then - ln -sf %cpu_arch %rpm_install_dir/%_target_cpu - ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu + if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then + ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu + ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu fi # We were building in %my_builddir/linux-%srcversion, but the sources will @@ -903,9 +915,9 @@ %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor -%if %_target_cpu != %cpu_arch -%obj_install_dir/%_target_cpu -/usr/src/linux-obj/%_target_cpu +%if %kmp_target_cpu != %cpu_arch +%obj_install_dir/%kmp_target_cpu +/usr/src/linux-obj/%kmp_target_cpu %endif %endif ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100 @@ -18,8 +18,8 @@ # norootforbuild # icecream 0 -%define srcversion 3.2 -%define patchversion 3.2.0 +%define srcversion 3.3-rc5 +%define patchversion 3.3.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -29,7 +29,7 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 3.2.0 +Version: 3.3.rc5 Release: 0 License: GPL-2.0 Group: Development/Sources @@ -41,7 +41,7 @@ Provides: multiversion(kernel) Provides: linux Provides: %name = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.b… Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100 @@ -23,7 +23,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 3.2.0 +Version: 3.3.rc5 %if %using_buildservice Release: 0 %else ++++++ kernel-tegra.spec ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100 @@ -17,14 +17,15 @@ # norootforbuild -%define srcversion 3.2 -%define patchversion 3.2.0 +%define srcversion 3.3-rc5 +%define patchversion 3.3.0-rc5 %define variant %{nil} %define vanilla_only 0 %include %_sourcedir/kernel-spec-macros %define build_flavor tegra +%define build_default (%build_flavor == "default") %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") @@ -56,7 +57,7 @@ Name: kernel-tegra Summary: Kernel for Nvidia's Tegra SoC -Version: 3.2.0 +Version: 3.3.rc5 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -132,7 +133,7 @@ Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.b… Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -193,6 +194,17 @@ Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: armv7l +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif # These files are found in the kernel-source package: NoSource: 0 @@ -624,9 +636,9 @@ # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. - if [ ! -e %rpm_install_dir/%_target_cpu ]; then - ln -sf %cpu_arch %rpm_install_dir/%_target_cpu - ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu + if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then + ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu + ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu fi # We were building in %my_builddir/linux-%srcversion, but the sources will @@ -903,9 +915,9 @@ %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor -%if %_target_cpu != %cpu_arch -%obj_install_dir/%_target_cpu -/usr/src/linux-obj/%_target_cpu +%if %kmp_target_cpu != %cpu_arch +%obj_install_dir/%kmp_target_cpu +/usr/src/linux-obj/%kmp_target_cpu %endif %endif ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100 @@ -17,14 +17,15 @@ # norootforbuild -%define srcversion 3.2 -%define patchversion 3.2.0 +%define srcversion 3.3-rc5 +%define patchversion 3.3.0-rc5 %define variant %{nil} %define vanilla_only 0 %include %_sourcedir/kernel-spec-macros %define build_flavor trace +%define build_default (%build_flavor == "default") %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") @@ -56,7 +57,7 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features -Version: 3.2.0 +Version: 3.3.rc5 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -143,7 +144,7 @@ Obsoletes: kernel-64bit %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.b… Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -204,6 +205,17 @@ Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 ppc64 s390 s390x x86_64 +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif # These files are found in the kernel-source package: NoSource: 0 @@ -634,9 +646,9 @@ # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. - if [ ! -e %rpm_install_dir/%_target_cpu ]; then - ln -sf %cpu_arch %rpm_install_dir/%_target_cpu - ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu + if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then + ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu + ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu fi # We were building in %my_builddir/linux-%srcversion, but the sources will @@ -911,9 +923,9 @@ %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor -%if %_target_cpu != %cpu_arch -%obj_install_dir/%_target_cpu -/usr/src/linux-obj/%_target_cpu +%if %kmp_target_cpu != %cpu_arch +%obj_install_dir/%kmp_target_cpu +/usr/src/linux-obj/%kmp_target_cpu %endif %endif ++++++ kernel-u8500.spec ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100 @@ -17,14 +17,15 @@ # norootforbuild -%define srcversion 3.2 -%define patchversion 3.2.0 +%define srcversion 3.3-rc5 +%define patchversion 3.3.0-rc5 %define variant %{nil} %define vanilla_only 0 %include %_sourcedir/kernel-spec-macros %define build_flavor u8500 +%define build_default (%build_flavor == "default") %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") @@ -56,7 +57,7 @@ Name: kernel-u8500 Summary: Kernel for ST-Ericsson's Nova SoC -Version: 3.2.0 +Version: 3.3.rc5 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -132,7 +133,7 @@ Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.b… Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -193,6 +194,17 @@ Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: armv7l +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif # These files are found in the kernel-source package: NoSource: 0 @@ -624,9 +636,9 @@ # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. - if [ ! -e %rpm_install_dir/%_target_cpu ]; then - ln -sf %cpu_arch %rpm_install_dir/%_target_cpu - ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu + if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then + ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu + ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu fi # We were building in %my_builddir/linux-%srcversion, but the sources will @@ -903,9 +915,9 @@ %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor -%if %_target_cpu != %cpu_arch -%obj_install_dir/%_target_cpu -/usr/src/linux-obj/%_target_cpu +%if %kmp_target_cpu != %cpu_arch +%obj_install_dir/%kmp_target_cpu +/usr/src/linux-obj/%kmp_target_cpu %endif %endif ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100 @@ -17,14 +17,15 @@ # norootforbuild -%define srcversion 3.2 -%define patchversion 3.2.0 +%define srcversion 3.3-rc5 +%define patchversion 3.3.0-rc5 %define variant %{nil} %define vanilla_only 0 %include %_sourcedir/kernel-spec-macros %define build_flavor vanilla +%define build_default (%build_flavor == "default") %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") @@ -56,7 +57,7 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches -Version: 3.2.0 +Version: 3.3.rc5 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -139,7 +140,7 @@ Obsoletes: kernel-64bit %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.b… Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -200,6 +201,17 @@ Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 ppc ppc64 s390 s390x x86_64 +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif # These files are found in the kernel-source package: NoSource: 0 @@ -630,9 +642,9 @@ # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. - if [ ! -e %rpm_install_dir/%_target_cpu ]; then - ln -sf %cpu_arch %rpm_install_dir/%_target_cpu - ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu + if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then + ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu + ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu fi # We were building in %my_builddir/linux-%srcversion, but the sources will @@ -907,9 +919,9 @@ %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor -%if %_target_cpu != %cpu_arch -%obj_install_dir/%_target_cpu -/usr/src/linux-obj/%_target_cpu +%if %kmp_target_cpu != %cpu_arch +%obj_install_dir/%kmp_target_cpu +/usr/src/linux-obj/%kmp_target_cpu %endif %endif ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100 @@ -17,14 +17,15 @@ # norootforbuild -%define srcversion 3.2 -%define patchversion 3.2.0 +%define srcversion 3.3-rc5 +%define patchversion 3.3.0-rc5 %define variant %{nil} %define vanilla_only 0 %include %_sourcedir/kernel-spec-macros %define build_flavor xen +%define build_default (%build_flavor == "default") %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") @@ -56,7 +57,7 @@ Name: kernel-xen Summary: The Xen Kernel -Version: 3.2.0 +Version: 3.3.rc5 Release: 0 License: GPL-2.0 Group: System/Kernel @@ -132,7 +133,7 @@ Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.b… Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -193,6 +194,17 @@ Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif # These files are found in the kernel-source package: NoSource: 0 @@ -626,9 +638,9 @@ # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. - if [ ! -e %rpm_install_dir/%_target_cpu ]; then - ln -sf %cpu_arch %rpm_install_dir/%_target_cpu - ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu + if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then + ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu + ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu fi # We were building in %my_builddir/linux-%srcversion, but the sources will @@ -909,9 +921,9 @@ %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor -%if %_target_cpu != %cpu_arch -%obj_install_dir/%_target_cpu -/usr/src/linux-obj/%_target_cpu +%if %kmp_target_cpu != %cpu_arch +%obj_install_dir/%kmp_target_cpu +/usr/src/linux-obj/%kmp_target_cpu %endif %endif ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=3.2 +SRCVERSION=3.3-rc5 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against ++++++ config.tar.bz2 ++++++ ++++ 32014 lines of diff (skipped) ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:49.000000000 +0100 @@ -25,6 +25,7 @@ %include %_sourcedir/kernel-spec-macros %define build_flavor @FLAVOR@ +%define build_default (%build_flavor == "default") %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") @@ -134,6 +135,17 @@ @SOURCES@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: @ARCHS@ +%define kmp_target_cpu %_target_cpu +%ifarch %ix86 +# Only i386/default supports i586, mark other flavors' packages as i686 +%if ! %build_default +BuildArch: i686 +# KMPs are always built as i586, because rpm does not allow to build +# subpackages for different architectures. Therefore, we change the +# /usr/src/linux-obj/<arch> symlink to i586. +%define kmp_target_cpu i586 +%endif +%endif # These files are found in the kernel-source package: @NOSOURCE@ @@ -548,9 +560,9 @@ # Some architecture's $(uname -m) output is different from the ARCH # parameter that needs to be passed to kbuild. Create symlinks from # $(uname -m) to the ARCH directory. - if [ ! -e %rpm_install_dir/%_target_cpu ]; then - ln -sf %cpu_arch %rpm_install_dir/%_target_cpu - ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu + if [ ! -e %rpm_install_dir/%kmp_target_cpu ]; then + ln -sf %cpu_arch %rpm_install_dir/%kmp_target_cpu + ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%kmp_target_cpu fi # We were building in %my_builddir/linux-%srcversion, but the sources will @@ -825,9 +837,9 @@ %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor %obj_install_dir/%cpu_arch_flavor -%if %_target_cpu != %cpu_arch -%obj_install_dir/%_target_cpu -/usr/src/linux-obj/%_target_cpu +%if %kmp_target_cpu != %cpu_arch +%obj_install_dir/%kmp_target_cpu +/usr/src/linux-obj/%kmp_target_cpu %endif %endif ++++++ patches.arch.tar.bz2 ++++++ ++++ 2417 lines of diff (skipped) ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/elousb.patch new/patches.drivers/elousb.patch --- old/patches.drivers/elousb.patch 2011-11-16 06:32:19.000000000 +0100 +++ new/patches.drivers/elousb.patch 2012-02-07 18:12:40.000000000 +0100 @@ -19,9 +19,9 @@ --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1643,6 +1643,8 @@ static const struct hid_device_id hid_ig - { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) }, { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) }, { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x0004) }, + { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x000a) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_4000U) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_4500U) }, { HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) }, @@ -68,9 +68,9 @@ obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o +obj-$(CONFIG_TOUCHSCREEN_ELOUSB) += elousb.o + obj-$(CONFIG_TOUCHSCREEN_EGALAX) += egalax_ts.o obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o - obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o --- /dev/null +++ b/drivers/input/touchscreen/elousb.c @@ -0,0 +1,305 @@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/input-Add-LED-support-to-Synaptics-device new/patches.drivers/input-Add-LED-support-to-Synaptics-device --- old/patches.drivers/input-Add-LED-support-to-Synaptics-device 2011-11-16 06:32:19.000000000 +0100 +++ new/patches.drivers/input-Add-LED-support-to-Synaptics-device 2012-02-07 18:12:40.000000000 +0100 @@ -34,7 +34,7 @@ help Say Y here if you have a PS/2 mouse connected to your system. This includes the standard 2 or 3-button PS/2 mouse, as well as PS/2 -@@ -67,6 +68,14 @@ config MOUSE_PS2_SYNAPTICS +@@ -68,6 +69,14 @@ config MOUSE_PS2_SYNAPTICS If unsure, say Y. @@ -51,7 +51,7 @@ default y --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c -@@ -28,6 +28,7 @@ +@@ -29,6 +29,7 @@ #include <linux/input/mt.h> #include <linux/serio.h> #include <linux/libps2.h> @@ -59,7 +59,7 @@ #include <linux/slab.h> #include "psmouse.h" #include "synaptics.h" -@@ -353,6 +354,110 @@ static void synaptics_pt_create(struct p +@@ -430,6 +431,110 @@ static void synaptics_pt_create(struct p serio_register_port(serio); } @@ -170,15 +170,15 @@ /***************************************************************************** * Functions to interpret the absolute mode packets ****************************************************************************/ -@@ -647,6 +752,7 @@ static void set_input_params(struct inpu +@@ -1275,6 +1380,7 @@ static void synaptics_disconnect(struct + device_remove_file(&psmouse->ps2dev.serio->dev, + &psmouse_attr_disable_gesture.dattr); - static void synaptics_disconnect(struct psmouse *psmouse) - { + synaptics_free_led(psmouse); synaptics_reset(psmouse); - kfree(psmouse->private); + kfree(priv); psmouse->private = NULL; -@@ -678,6 +784,8 @@ static int synaptics_reconnect(struct ps +@@ -1331,6 +1437,8 @@ static int synaptics_reconnect(struct ps return -1; } @@ -187,9 +187,9 @@ return 0; } -@@ -752,6 +860,9 @@ int synaptics_init(struct psmouse *psmou - priv->model_id, - priv->capabilities, priv->ext_cap, priv->ext_cap_0c); +@@ -1440,6 +1548,9 @@ static int __synaptics_init(struct psmou + priv->model_id, + priv->capabilities, priv->ext_cap, priv->ext_cap_0c); + if (synaptics_init_led(psmouse) < 0) + goto init_fail; @@ -199,8 +199,8 @@ /* --- a/drivers/input/mouse/synaptics.h +++ b/drivers/input/mouse/synaptics.h -@@ -97,6 +97,8 @@ struct synaptics_hw_state { - struct synaptics_mt_state mt_state; +@@ -145,6 +145,8 @@ struct synaptics_hw_state { + struct synaptics_mt_state mt_state; }; +struct synaptics_led; @@ -208,10 +208,10 @@ struct synaptics_data { /* Data read from the touchpad */ unsigned long int model_id; /* Model-ID */ -@@ -110,6 +112,7 @@ struct synaptics_data { - */ - struct synaptics_hw_state agm; - bool agm_pending; /* new AGM packet received */ +@@ -174,6 +176,7 @@ struct synaptics_data { + */ + struct synaptics_hw_state agm; + bool agm_pending; /* new AGM packet received */ + struct synaptics_led *led; }; ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/fs-partitions-efi-c-corrupted-guid-partition-tables-can-cause-kernel-oops new/patches.fixes/fs-partitions-efi-c-corrupted-guid-partition-tables-can-cause-kernel-oops --- old/patches.fixes/fs-partitions-efi-c-corrupted-guid-partition-tables-can-cause-kernel-oops 2012-01-25 11:51:08.000000000 +0100 +++ new/patches.fixes/fs-partitions-efi-c-corrupted-guid-partition-tables-can-cause-kernel-oops 2012-02-09 15:57:54.000000000 +0100 @@ -34,8 +34,8 @@ fs/partitions/efi.c | 9 +++++++++ 1 file changed, 9 insertions(+) ---- a/fs/partitions/efi.c -+++ b/fs/partitions/efi.c +--- a/block/partitions/efi.c ++++ b/block/partitions/efi.c @@ -310,6 +310,15 @@ static int is_gpt_valid(struct parsed_pa goto fail; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/kvm-macos.patch new/patches.fixes/kvm-macos.patch --- old/patches.fixes/kvm-macos.patch 2012-01-25 11:51:08.000000000 +0100 +++ new/patches.fixes/kvm-macos.patch 2012-02-09 15:57:54.000000000 +0100 @@ -61,7 +61,9 @@ + case MSR_NHM_SNB_PKG_CST_CFG_CTL: /* 0xe2 */ data = 0; break; - case MSR_IA32_UCODE_REV: + case MSR_P6_PERFCTR0: +--- a/arch/x86/kvm/cpuid.c ++++ b/arch/x86/kvm/cpuid.c @@ -1985,7 +1987,7 @@ static void do_cpuid_ent(struct kvm_cpui 0 /* Reserved */ | f_lm | F(3DNOWEXT) | F(3DNOW); /* cpuid 1.ecx */ @@ -70,4 +72,4 @@ + F(XMM3) | F(PCLMULQDQ) | 0 /* DTES64 */ | F(MWAIT) | 0 /* DS-CPL, VMX, SMX, EST */ | 0 /* TM2 */ | F(SSSE3) | 0 /* CNXT-ID */ | 0 /* Reserved */ | - 0 /* Reserved */ | F(CX16) | 0 /* xTPR Update, PDCM */ | + F(FMA) | F(CX16) | 0 /* xTPR Update, PDCM */ | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/proc-mem-security-fix new/patches.fixes/proc-mem-security-fix --- old/patches.fixes/proc-mem-security-fix 2012-01-25 11:51:08.000000000 +0100 +++ new/patches.fixes/proc-mem-security-fix 1970-01-01 01:00:00.000000000 +0100 @@ -1,263 +0,0 @@ -From e2b4ed67f8ce25ba0347746a65e288735352aaf8 Mon Sep 17 00:00:00 2001 -From: Linus Torvalds <torvalds(a)linux-foundation.org> -Date: Tue, 17 Jan 2012 15:21:19 -0800 -Subject: [PATCH] proc: clean up and fix /proc/<pid>/mem handling -Patch-mainline: v3.3-rc1 -Git-commit: e268337dfe26dfc7efd422a804dbb27977a3cccc -References: bnc#742279, CVE-2012-0056 - -Jüri Aedla reported that the /proc/<pid>/mem handling really isn't very -robust, and it also doesn't match the permission checking of any of the -other related files. - -This changes it to do the permission checks at open time, and instead of -tracking the process, it tracks the VM at the time of the open. That -simplifies the code a lot, but does mean that if you hold the file -descriptor open over an execve(), you'll continue to read from the _old_ -VM. - -That is different from our previous behavior, but much simpler. If -somebody actually finds a load where this matters, we'll need to revert -this commit. - -I suspect that nobody will ever notice - because the process mapping -addresses will also have changed as part of the execve. So you cannot -actually usefully access the fd across a VM change simply because all -the offsets for IO would have changed too. - -Reported-by: Jüri Aedla <asd(a)ut.ee> -Cc: Al Viro <viro(a)zeniv.linux.org.uk> -Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> -Acked-by: Michal Marek <mmarek(a)suse.cz> - -diff --git a/fs/proc/base.c b/fs/proc/base.c -index 851ba3d..1fc1dca 100644 ---- a/fs/proc/base.c -+++ b/fs/proc/base.c -@@ -194,65 +194,7 @@ static int proc_root_link(struct inode *inode, struct path *path) - return result; - } - --static struct mm_struct *__check_mem_permission(struct task_struct *task) --{ -- struct mm_struct *mm; -- -- mm = get_task_mm(task); -- if (!mm) -- return ERR_PTR(-EINVAL); -- -- /* -- * A task can always look at itself, in case it chooses -- * to use system calls instead of load instructions. -- */ -- if (task == current) -- return mm; -- -- /* -- * If current is actively ptrace'ing, and would also be -- * permitted to freshly attach with ptrace now, permit it. -- */ -- if (task_is_stopped_or_traced(task)) { -- int match; -- rcu_read_lock(); -- match = (ptrace_parent(task) == current); -- rcu_read_unlock(); -- if (match && ptrace_may_access(task, PTRACE_MODE_ATTACH)) -- return mm; -- } -- -- /* -- * No one else is allowed. -- */ -- mmput(mm); -- return ERR_PTR(-EPERM); --} -- --/* -- * If current may access user memory in @task return a reference to the -- * corresponding mm, otherwise ERR_PTR. -- */ --static struct mm_struct *check_mem_permission(struct task_struct *task) --{ -- struct mm_struct *mm; -- int err; -- -- /* -- * Avoid racing if task exec's as we might get a new mm but validate -- * against old credentials. -- */ -- err = mutex_lock_killable(&task->signal->cred_guard_mutex); -- if (err) -- return ERR_PTR(err); -- -- mm = __check_mem_permission(task); -- mutex_unlock(&task->signal->cred_guard_mutex); -- -- return mm; --} -- --struct mm_struct *mm_for_maps(struct task_struct *task) -+static struct mm_struct *mm_access(struct task_struct *task, unsigned int mode) - { - struct mm_struct *mm; - int err; -@@ -263,7 +205,7 @@ struct mm_struct *mm_for_maps(struct task_struct *task) - - mm = get_task_mm(task); - if (mm && mm != current->mm && -- !ptrace_may_access(task, PTRACE_MODE_READ)) { -+ !ptrace_may_access(task, mode)) { - mmput(mm); - mm = ERR_PTR(-EACCES); - } -@@ -272,6 +214,11 @@ struct mm_struct *mm_for_maps(struct task_struct *task) - return mm; - } - -+struct mm_struct *mm_for_maps(struct task_struct *task) -+{ -+ return mm_access(task, PTRACE_MODE_READ); -+} -+ - static int proc_pid_cmdline(struct task_struct *task, char * buffer) - { - int res = 0; -@@ -816,38 +763,39 @@ static const struct file_operations proc_single_file_operations = { - - static int mem_open(struct inode* inode, struct file* file) - { -- file->private_data = (void*)((long)current->self_exec_id); -+ struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode); -+ struct mm_struct *mm; -+ -+ if (!task) -+ return -ESRCH; -+ -+ mm = mm_access(task, PTRACE_MODE_ATTACH); -+ put_task_struct(task); -+ -+ if (IS_ERR(mm)) -+ return PTR_ERR(mm); -+ - /* OK to pass negative loff_t, we can catch out-of-range */ - file->f_mode |= FMODE_UNSIGNED_OFFSET; -+ file->private_data = mm; -+ - return 0; - } - - static ssize_t mem_read(struct file * file, char __user * buf, - size_t count, loff_t *ppos) - { -- struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode); -+ int ret; - char *page; - unsigned long src = *ppos; -- int ret = -ESRCH; -- struct mm_struct *mm; -+ struct mm_struct *mm = file->private_data; - -- if (!task) -- goto out_no_task; -+ if (!mm) -+ return 0; - -- ret = -ENOMEM; - page = (char *)__get_free_page(GFP_TEMPORARY); - if (!page) -- goto out; -- -- mm = check_mem_permission(task); -- ret = PTR_ERR(mm); -- if (IS_ERR(mm)) -- goto out_free; -- -- ret = -EIO; -- -- if (file->private_data != (void*)((long)current->self_exec_id)) -- goto out_put; -+ return -ENOMEM; - - ret = 0; - -@@ -874,13 +822,7 @@ static ssize_t mem_read(struct file * file, char __user * buf, - } - *ppos = src; - --out_put: -- mmput(mm); --out_free: - free_page((unsigned long) page); --out: -- put_task_struct(task); --out_no_task: - return ret; - } - -@@ -889,27 +831,15 @@ static ssize_t mem_write(struct file * file, const char __user *buf, - { - int copied; - char *page; -- struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode); - unsigned long dst = *ppos; -- struct mm_struct *mm; -+ struct mm_struct *mm = file->private_data; - -- copied = -ESRCH; -- if (!task) -- goto out_no_task; -+ if (!mm) -+ return 0; - -- copied = -ENOMEM; - page = (char *)__get_free_page(GFP_TEMPORARY); - if (!page) -- goto out_task; -- -- mm = check_mem_permission(task); -- copied = PTR_ERR(mm); -- if (IS_ERR(mm)) -- goto out_free; -- -- copied = -EIO; -- if (file->private_data != (void *)((long)current->self_exec_id)) -- goto out_mm; -+ return -ENOMEM; - - copied = 0; - while (count > 0) { -@@ -933,13 +863,7 @@ static ssize_t mem_write(struct file * file, const char __user *buf, - } - *ppos = dst; - --out_mm: -- mmput(mm); --out_free: - free_page((unsigned long) page); --out_task: -- put_task_struct(task); --out_no_task: - return copied; - } - -@@ -959,11 +883,20 @@ loff_t mem_lseek(struct file *file, loff_t offset, int orig) - return file->f_pos; - } - -+static int mem_release(struct inode *inode, struct file *file) -+{ -+ struct mm_struct *mm = file->private_data; -+ -+ mmput(mm); -+ return 0; -+} -+ - static const struct file_operations proc_mem_operations = { - .llseek = mem_lseek, - .read = mem_read, - .write = mem_write, - .open = mem_open, -+ .release = mem_release, - }; - - static ssize_t environ_read(struct file *file, char __user *buf, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/reiserfs-force-inode-evictions-before-umount-to-avoid-crash new/patches.fixes/reiserfs-force-inode-evictions-before-umount-to-avoid-crash --- old/patches.fixes/reiserfs-force-inode-evictions-before-umount-to-avoid-crash 2012-01-25 11:51:08.000000000 +0100 +++ new/patches.fixes/reiserfs-force-inode-evictions-before-umount-to-avoid-crash 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -From: Jeff Mahoney <jeffm(a)suse.com> -Subject: reiserfs: Force inode evictions before umount to avoid crash -References: bnc#610598 bnc#680073 bnc#684112 -Patch-mainline: Submitted to reiserfs-devel Apr 6 2011 - - This patch fixes a crash in reiserfs_delete_xattrs during umount. - - When shrink_dcache_for_umount clears the dcache from - generic_shutdown_super, delayed evictions are forced to disk. If an - evicted inode has extended attributes associated with it, it will - need to walk the xattr tree to locate and remove them. - - But since shrink_dcache_for_umount will BUG if it encounters active - dentries, the xattr tree must be released before it's called or it will - crash during every umount. - - This patch forces the evictions to occur before generic_shutdown_super - by calling shrink_dcache_sb first. The additional evictions caused - by the removal of each associated xattr file and dir will be automatically - handled as they're added to the LRU list. - -Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> -Acked-by: Jeff Mahoney <jeffm(a)suse.com> ---- - fs/reiserfs/super.c | 24 ++++++++++++++---------- - 1 file changed, 14 insertions(+), 10 deletions(-) - ---- a/fs/reiserfs/super.c -+++ b/fs/reiserfs/super.c -@@ -453,16 +453,20 @@ int remove_save_link(struct inode *inode - static void reiserfs_kill_sb(struct super_block *s) - { - if (REISERFS_SB(s)) { -- if (REISERFS_SB(s)->xattr_root) { -- d_invalidate(REISERFS_SB(s)->xattr_root); -- dput(REISERFS_SB(s)->xattr_root); -- REISERFS_SB(s)->xattr_root = NULL; -- } -- if (REISERFS_SB(s)->priv_root) { -- d_invalidate(REISERFS_SB(s)->priv_root); -- dput(REISERFS_SB(s)->priv_root); -- REISERFS_SB(s)->priv_root = NULL; -- } -+ /* -+ * Force any pending inode evictions to occur now. Any -+ * inodes to be removed that have extended attributes -+ * associated with them need to clean them up before -+ * we can release the extended attribute root dentries. -+ * shrink_dcache_for_umount will BUG if we don't release -+ * those before it's called so ->put_super is too late. -+ */ -+ shrink_dcache_sb(s); -+ -+ dput(REISERFS_SB(s)->xattr_root); -+ REISERFS_SB(s)->xattr_root = NULL; -+ dput(REISERFS_SB(s)->priv_root); -+ REISERFS_SB(s)->priv_root = NULL; - } - - kill_block_super(s); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/remount-no-shrink-dcache new/patches.fixes/remount-no-shrink-dcache --- old/patches.fixes/remount-no-shrink-dcache 2012-01-25 11:51:08.000000000 +0100 +++ new/patches.fixes/remount-no-shrink-dcache 2012-02-09 15:57:54.000000000 +0100 @@ -51,22 +51,22 @@ /* If we are remounting RDONLY and current sb is read/write, make sure there are no rw files opened */ if (remount_ro) { -- if (force) -+ if (rflags & REMOUNT_FORCE) - mark_files_ro(sb); - else if (!fs_may_remount_ro(sb)) - return -EBUSY; +- if (force) { ++ if (rflags & REMOUNT_FORCE) { + mark_files_ro(sb); + } else { + retval = sb_prepare_remount_readonly(sb); @@ -728,7 +723,7 @@ int do_remount_sb(struct super_block *sb if (sb->s_op->remount_fs) { retval = sb->s_op->remount_fs(sb, &flags, data); if (retval) { - if (!force) + if (!(rflags & REMOUNT_FORCE)) - return retval; + goto cancel_readonly; /* If forced remount, go ahead despite any errors */ WARN(1, "forced remount of a %s fs returned %i\n", @@ -750,6 +745,21 @@ int do_remount_sb(struct super_block *sb - return 0; + return retval; } +/** ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/nvme-broken new/patches.rpmify/nvme-broken --- old/patches.rpmify/nvme-broken 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/nvme-broken 2012-02-13 17:23:49.000000000 +0100 @@ -0,0 +1,35 @@ +From 06cfb415c425f66f7c87b611b1b786afa82331ab Mon Sep 17 00:00:00 2001 +From: Michal Marek <mmarek(a)suse.cz> +Date: Mon, 13 Feb 2012 17:21:14 +0100 +Subject: [PATCH] nvme: Mark as broken on x86_32 +Patch-mainline: never + +I did it as a patch instead of changing the config files, in the hope +that the patch would be removed once the 64bit io issue is resolved. + +Signed-off-by: Michal Marek <mmarek(a)suse.cz> + +diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig +index 4e4c8a4..6829483 100644 +--- a/drivers/block/Kconfig ++++ b/drivers/block/Kconfig +@@ -320,6 +320,7 @@ config BLK_DEV_NBD + config BLK_DEV_NVME + tristate "NVM Express block device" + depends on PCI ++ depends on BROKEN || !X86_32 + ---help--- + The NVM Express driver is for solid state drives directly + connected to the PCI or PCI Express bus. If you know you +diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c +index c1dc4d8..5ddee61 100644 +--- a/drivers/block/nvme.c ++++ b/drivers/block/nvme.c +@@ -996,6 +996,7 @@ static int __devinit nvme_configure_admin_queue(struct nvme_dev *dev) + + writel(0, &dev->bar->cc); + writel(aqa, &dev->bar->aqa); ++ /* These are not defined on all archs */ + writeq(nvmeq->sq_dma_addr, &dev->bar->asq); + writeq(nvmeq->cq_dma_addr, &dev->bar->acq); + writel(dev->ctrl_config, &dev->bar->cc); ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch new/patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch --- old/patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch 2012-01-13 17:43:09.000000000 +0100 +++ new/patches.suse/0001-vfs-Hooks-for-more-fine-grained-directory-permission.patch 2012-02-09 15:57:54.000000000 +0100 @@ -126,7 +126,7 @@ /* @@ -1395,7 +1443,7 @@ void unlock_rename(struct dentry *p1, st - int vfs_create(struct inode *dir, struct dentry *dentry, int mode, + int vfs_create(struct inode *dir, struct dentry *dentry, umode_t mode, struct nameidata *nd) { - int error = may_create(dir, dentry); @@ -136,7 +136,7 @@ return error; @@ -1957,7 +2005,7 @@ EXPORT_SYMBOL_GPL(lookup_create); - int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev) + int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev) { - int error = may_create(dir, dentry); + int error = may_create(dir, dentry, 0); @@ -145,7 +145,7 @@ return error; @@ -2061,7 +2109,7 @@ SYSCALL_DEFINE3(mknod, const char __user - int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) + int vfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) { - int error = may_create(dir, dentry); + int error = may_create(dir, dentry, 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0002-vfs-Add-generic-IS_ACL-test-for-acl-support.patch new/patches.suse/0002-vfs-Add-generic-IS_ACL-test-for-acl-support.patch --- old/patches.suse/0002-vfs-Add-generic-IS_ACL-test-for-acl-support.patch 2012-01-13 17:43:09.000000000 +0100 +++ new/patches.suse/0002-vfs-Add-generic-IS_ACL-test-for-acl-support.patch 2012-02-09 15:57:54.000000000 +0100 @@ -23,7 +23,7 @@ @@ -2215,7 +2215,7 @@ static int __open_namei_create(struct na /* Negative dentry, just create the file */ if (!dentry->d_inode) { - int mode = op->mode; + umode_t mode = op->mode; - if (!IS_POSIXACL(dir->d_inode)) + if (!IS_ACL(dir->d_inode)) mode &= ~current_umask(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/8250-sysrq-ctrl_o.patch new/patches.suse/8250-sysrq-ctrl_o.patch --- old/patches.suse/8250-sysrq-ctrl_o.patch 2012-01-13 17:43:09.000000000 +0100 +++ new/patches.suse/8250-sysrq-ctrl_o.patch 2012-02-09 15:57:54.000000000 +0100 @@ -110,8 +110,8 @@ of_node_put(prom_stdout); DBG("Found serial console at ttyS%d\n", offset); ---- a/drivers/tty/serial/8250.c -+++ b/drivers/tty/serial/8250.c +--- a/drivers/tty/serial/8250/8250.c ++++ b/drivers/tty/serial/8250/8250.c @@ -102,6 +102,8 @@ static unsigned int skip_txen_test; /* f #define CONFIG_SERIAL_MANY_PORTS 1 #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/SUSE-bootsplash new/patches.suse/SUSE-bootsplash --- old/patches.suse/SUSE-bootsplash 2012-01-13 17:43:09.000000000 +0100 +++ new/patches.suse/SUSE-bootsplash 2012-02-09 15:57:54.000000000 +0100 @@ -157,7 +157,7 @@ @@ -14,6 +14,7 @@ obj-$(CONFIG_VT) += console/ obj-$(CONFIG_LOGO) += logo/ - obj-y += backlight/ display/ + obj-y += backlight/ +obj-$(CONFIG_BOOTSPLASH) += bootsplash/ obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/kconfig-automate-kernel-desktop new/patches.suse/kconfig-automate-kernel-desktop --- old/patches.suse/kconfig-automate-kernel-desktop 2012-01-13 17:43:09.000000000 +0100 +++ new/patches.suse/kconfig-automate-kernel-desktop 2012-02-09 15:57:54.000000000 +0100 @@ -37,9 +37,9 @@ This option adds support for grouping sets of processes together, for use with process control subsystems such as Cpusets, CFS, memory @@ -651,7 +653,7 @@ config CGROUP_MEM_RES_CTLR_SWAP + menuconfig CGROUP_SCHED bool "Group CPU scheduler" - depends on EXPERIMENTAL - default n + default !KERNEL_DESKTOP help diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/s390-Kerntypes.diff new/patches.suse/s390-Kerntypes.diff --- old/patches.suse/s390-Kerntypes.diff 2012-01-13 17:43:09.000000000 +0100 +++ new/patches.suse/s390-Kerntypes.diff 2012-02-09 15:57:54.000000000 +0100 @@ -69,7 +69,7 @@ install: $(CONFIGURE) $(obj)/image sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/image \ -- System.map Kerntypes "$(INSTALL_PATH)" +- System.map "$(INSTALL_PATH)" + System.map "$(INSTALL_PATH)" --- /dev/null +++ b/arch/s390/boot/kerntypes.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/stack-unwind new/patches.suse/stack-unwind --- old/patches.suse/stack-unwind 2012-01-13 17:43:09.000000000 +0100 +++ new/patches.suse/stack-unwind 2012-02-09 15:57:54.000000000 +0100 @@ -738,8 +738,8 @@ */ + unwind_init(); lockdep_init(); + smp_setup_processor_id(); debug_objects_early_init(); - @@ -576,6 +578,7 @@ asmlinkage void __init start_kernel(void mm_init_owner(&init_mm, &init_task); mm_init_cpumask(&init_mm); @@ -755,9 +755,9 @@ obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_KALLSYMS) += kallsyms.o +obj-$(CONFIG_STACK_UNWIND) += unwind.o - obj-$(CONFIG_PM) += power/ - obj-$(CONFIG_FREEZER) += power/ obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o + obj-$(CONFIG_KEXEC) += kexec.o + obj-$(CONFIG_BACKTRACE_SELF_TEST) += backtracetest.o --- a/kernel/module.c +++ b/kernel/module.c @@ -44,6 +44,7 @@ @@ -830,9 +830,9 @@ + /* Initialize unwind table */ + add_unwind_table(mod, &info); + - /* Get rid of temporary copy and strmap. */ - kfree(info.strmap); + /* Get rid of temporary copy. */ free_copy(&info); + @@ -2999,6 +3028,7 @@ SYSCALL_DEFINE3(init_module, void __user /* Drop initial reference. */ module_put(mod); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/supported-flag new/patches.suse/supported-flag --- old/patches.suse/supported-flag 2012-01-13 17:43:09.000000000 +0100 +++ new/patches.suse/supported-flag 2012-02-09 15:57:54.000000000 +0100 @@ -29,7 +29,7 @@ --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -2610,6 +2610,11 @@ bytes respectively. Such letter suffixes +@@ -2666,6 +2666,11 @@ bytes respectively. Such letter suffixes unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -43,10 +43,10 @@ (default -1 = authorized except for wireless USB, --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt -@@ -579,6 +579,18 @@ can be ORed together: - instead of using the one provided by the hardware. - 512 - A kernel warning has occurred. +@@ -603,6 +603,18 @@ can be ORed together: 1024 - A module from drivers/staging was loaded. + 2048 - The system is working around a severe firmware bug. + 4096 - An out-of-tree module has been loaded. + 0x40000000 - An unsupported kernel module was loaded. + 0x80000000 - An kernel module with external support was loaded. + @@ -78,18 +78,19 @@ KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -341,8 +341,10 @@ extern int panic_timeout; +@@ -342,9 +342,11 @@ extern int panic_timeout; extern int panic_on_oops; extern int panic_on_unrecovered_nmi; extern int panic_on_io_nmi; +extern int unsupported; + extern int sysctl_panic_on_stackoverflow; extern const char *print_tainted(void); extern void add_taint(unsigned flag); +extern void add_nonfatal_taint(unsigned flag); extern int test_taint(unsigned flag); extern unsigned long get_taint(void); extern int root_mountflags; -@@ -373,6 +375,13 @@ extern enum system_states { +@@ -375,6 +377,13 @@ extern enum system_states { #define TAINT_FIRMWARE_WORKAROUND 11 #define TAINT_OOT_MODULE 12 @@ -105,7 +106,7 @@ #define hex_asc_hi(x) hex_asc[((x) & 0xf0) >> 4] --- a/include/linux/module.h +++ b/include/linux/module.h -@@ -378,6 +378,7 @@ struct module *__module_address(unsigned +@@ -389,6 +389,7 @@ struct module *__module_address(unsigned bool is_module_address(unsigned long addr); bool is_module_percpu_address(unsigned long addr); bool is_module_text_address(unsigned long addr); @@ -154,7 +155,7 @@ --- a/kernel/module.c +++ b/kernel/module.c -@@ -95,6 +95,20 @@ +@@ -89,6 +89,20 @@ /* If this is set, the section belongs in the init part of the module */ #define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1)) @@ -175,9 +176,20 @@ /* * Mutex protects: * 1) List of modules (also safely readable with preempt_disable), -@@ -991,11 +1005,37 @@ struct module_attribute module_uevent = - .store = store_uevent, - }; +@@ -954,6 +968,10 @@ static size_t module_flags_taint(struct + buf[l++] = 'F'; + if (mod->taints & (1 << TAINT_CRAP)) + buf[l++] = 'C'; ++ if (mod->taints & (1 << TAINT_NO_SUPPORT)) ++ buf[l++] = 'N'; ++ if (mod->taints & (1 << TAINT_EXTERNAL_SUPPORT)) ++ buf[l++] = 'X'; + /* + * TAINT_FORCED_RMMOD: could be added. + * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't +@@ -1029,6 +1047,31 @@ static ssize_t show_taint(struct module_ + static struct module_attribute modinfo_taint = + __ATTR(taint, 0444, show_taint, NULL); +static void setup_modinfo_supported(struct module *mod, const char *s) +{ @@ -205,15 +217,17 @@ +}; + static struct module_attribute *modinfo_attrs[] = { - &modinfo_version, - &modinfo_srcversion, - &initstate, &module_uevent, + &modinfo_version, +@@ -1037,6 +1080,7 @@ static struct module_attribute *modinfo_ + &modinfo_coresize, + &modinfo_initsize, + &modinfo_taint, + &modinfo_supported, #ifdef CONFIG_MODULE_UNLOAD - &refcnt, + &modinfo_refcnt, #endif -@@ -1537,6 +1577,26 @@ static int mod_sysfs_setup(struct module +@@ -1578,6 +1622,26 @@ static int mod_sysfs_setup(struct module add_sect_attrs(mod, info); add_notes_attrs(mod, info); @@ -240,18 +254,7 @@ kobject_uevent(&mod->mkobj.kobj, KOBJ_ADD); return 0; -@@ -3264,6 +3324,10 @@ static char *module_flags(struct module - buf[bx++] = 'F'; - if (mod->taints & (1 << TAINT_CRAP)) - buf[bx++] = 'C'; -+ if (mod->taints & (1 << TAINT_NO_SUPPORT)) -+ buf[bx++] = 'N'; -+ if (mod->taints & (1 << TAINT_EXTERNAL_SUPPORT)) -+ buf[bx++] = 'X'; - /* - * TAINT_FORCED_RMMOD: could be added. - * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't -@@ -3476,6 +3540,7 @@ void print_modules(void) +@@ -3491,6 +3555,7 @@ void print_modules(void) if (last_unloaded_module[0]) printk(" [last unloaded: %s]", last_unloaded_module); printk("\n"); @@ -261,7 +264,7 @@ #ifdef CONFIG_MODVERSIONS --- a/kernel/panic.c +++ b/kernel/panic.c -@@ -178,6 +178,8 @@ static const struct tnt tnts[] = { +@@ -198,6 +198,8 @@ static const struct tnt tnts[] = { { TAINT_CRAP, 'C', ' ' }, { TAINT_FIRMWARE_WORKAROUND, 'I', ' ' }, { TAINT_OOT_MODULE, 'O', ' ' }, @@ -270,7 +273,7 @@ }; /** -@@ -196,6 +198,8 @@ static const struct tnt tnts[] = { +@@ -216,6 +218,8 @@ static const struct tnt tnts[] = { * 'C' - modules from drivers/staging are loaded. * 'I' - Working around severe firmware bug. * 'O' - Out-of-tree module has been loaded. @@ -279,7 +282,7 @@ * * The string is overwritten by the next call to print_tainted(). */ -@@ -231,6 +235,11 @@ unsigned long get_taint(void) +@@ -251,6 +255,11 @@ unsigned long get_taint(void) return tainted_mask; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/supported-flag-enterprise new/patches.suse/supported-flag-enterprise --- old/patches.suse/supported-flag-enterprise 2012-01-13 17:43:09.000000000 +0100 +++ new/patches.suse/supported-flag-enterprise 2012-02-09 15:57:54.000000000 +0100 @@ -20,12 +20,12 @@ kernel/module.c | 19 ++++++++++++++++++- kernel/panic.c | 2 ++ kernel/sysctl.c | 2 +- - scripts/Makefile.modpost | 5 +++-- - 8 files changed, 50 insertions(+), 4 deletions(-) + scripts/Makefile.modpost | 7 ++++--- + 8 files changed, 51 insertions(+), 5 deletions(-) --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -2568,6 +2568,9 @@ bytes respectively. Such letter suffixes +@@ -2671,6 +2671,9 @@ bytes respectively. Such letter suffixes 1 = warn when loading unsupported modules, 2 = don't warn. @@ -37,7 +37,7 @@ (default -1 = authorized except for wireless USB, --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -372,12 +372,14 @@ extern enum system_states { +@@ -377,12 +377,14 @@ extern enum system_states { #define TAINT_FIRMWARE_WORKAROUND 11 #define TAINT_OOT_MODULE 12 @@ -80,7 +80,7 @@ depends on SUSE_KERNEL && MODULES --- a/kernel/ksysfs.c +++ b/kernel/ksysfs.c -@@ -166,6 +166,7 @@ static struct bin_attribute notes_attr = +@@ -167,6 +167,7 @@ static struct bin_attribute notes_attr = struct kobject *kernel_kobj; EXPORT_SYMBOL_GPL(kernel_kobj); @@ -88,7 +88,7 @@ const char *supported_printable(int taint) { int mask = TAINT_PROPRIETARY_MODULE|TAINT_NO_SUPPORT; -@@ -187,6 +188,7 @@ static ssize_t supported_show(struct kob +@@ -188,6 +189,7 @@ static ssize_t supported_show(struct kob return sprintf(buf, "%s\n", supported_printable(get_taint())); } KERNEL_ATTR_RO(supported); @@ -96,7 +96,7 @@ static struct attribute * kernel_attrs[] = { &fscaps_attr.attr, -@@ -203,7 +205,9 @@ static struct attribute * kernel_attrs[] +@@ -204,7 +206,9 @@ static struct attribute * kernel_attrs[] &kexec_crash_size_attr.attr, &vmcoreinfo_attr.attr, #endif @@ -108,7 +108,7 @@ --- a/kernel/module.c +++ b/kernel/module.c -@@ -95,6 +95,7 @@ +@@ -89,6 +89,7 @@ /* If this is set, the section belongs in the init part of the module */ #define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1)) @@ -116,7 +116,7 @@ /* Allow unsupported modules switch. */ #ifdef UNSUPPORTED_MODULES int unsupported = UNSUPPORTED_MODULES; -@@ -108,6 +109,7 @@ static int __init unsupported_setup(char +@@ -102,6 +103,7 @@ static int __init unsupported_setup(char return 1; } __setup("unsupported=", unsupported_setup); @@ -124,32 +124,46 @@ /* * Mutex protects: -@@ -1005,6 +1007,7 @@ struct module_attribute module_uevent = - .store = store_uevent, - }; +@@ -968,10 +970,12 @@ static size_t module_flags_taint(struct + buf[l++] = 'F'; + if (mod->taints & (1 << TAINT_CRAP)) + buf[l++] = 'C'; ++#ifdef CONFIG_ENTERPRISE_SUPPORT + if (mod->taints & (1 << TAINT_NO_SUPPORT)) + buf[l++] = 'N'; + if (mod->taints & (1 << TAINT_EXTERNAL_SUPPORT)) + buf[l++] = 'X'; ++#endif + /* + * TAINT_FORCED_RMMOD: could be added. + * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't +@@ -1047,6 +1051,7 @@ static ssize_t show_taint(struct module_ + static struct module_attribute modinfo_taint = + __ATTR(taint, 0444, show_taint, NULL); +#ifdef CONFIG_ENTERPRISE_SUPPORT static void setup_modinfo_supported(struct module *mod, const char *s) { if (!s) { -@@ -1029,13 +1032,16 @@ static struct module_attribute modinfo_s +@@ -1071,6 +1076,7 @@ static struct module_attribute modinfo_s .show = show_modinfo_supported, .setup = setup_modinfo_supported, }; +#endif static struct module_attribute *modinfo_attrs[] = { - &modinfo_version, - &modinfo_srcversion, - &initstate, &module_uevent, +@@ -1080,7 +1086,9 @@ static struct module_attribute *modinfo_ + &modinfo_coresize, + &modinfo_initsize, + &modinfo_taint, +#ifdef CONFIG_ENTERPRISE_SUPPORT &modinfo_supported, +#endif #ifdef CONFIG_MODULE_UNLOAD - &refcnt, + &modinfo_refcnt, #endif -@@ -1577,6 +1583,7 @@ static int mod_sysfs_setup(struct module +@@ -1622,6 +1630,7 @@ static int mod_sysfs_setup(struct module add_sect_attrs(mod, info); add_notes_attrs(mod, info); @@ -157,7 +171,7 @@ /* We don't use add_taint() here because it also disables lockdep. */ if (mod->taints & (1 << TAINT_EXTERNAL_SUPPORT)) add_nonfatal_taint(TAINT_EXTERNAL_SUPPORT); -@@ -1586,7 +1593,7 @@ static int mod_sysfs_setup(struct module +@@ -1631,7 +1640,7 @@ static int mod_sysfs_setup(struct module "Novell, refusing to load. To override, echo " "1 > /proc/sys/kernel/unsupported\n", mod->name); err = -ENOEXEC; @@ -166,7 +180,7 @@ } add_nonfatal_taint(TAINT_NO_SUPPORT); if (unsupported == 1) { -@@ -1596,10 +1603,16 @@ static int mod_sysfs_setup(struct module +@@ -1641,10 +1650,16 @@ static int mod_sysfs_setup(struct module "fault.\n", mod->name); } } @@ -183,20 +197,7 @@ out_unreg_param: module_param_sysfs_remove(mod); out_unreg_holders: -@@ -3321,10 +3334,12 @@ static char *module_flags(struct module - buf[bx++] = 'F'; - if (mod->taints & (1 << TAINT_CRAP)) - buf[bx++] = 'C'; -+#ifdef CONFIG_ENTERPRISE_SUPPORT - if (mod->taints & (1 << TAINT_NO_SUPPORT)) - buf[bx++] = 'N'; - if (mod->taints & (1 << TAINT_EXTERNAL_SUPPORT)) - buf[bx++] = 'X'; -+#endif - /* - * TAINT_FORCED_RMMOD: could be added. - * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't -@@ -3537,7 +3552,9 @@ void print_modules(void) +@@ -3555,7 +3570,9 @@ void print_modules(void) if (last_unloaded_module[0]) printk(" [last unloaded: %s]", last_unloaded_module); printk("\n"); @@ -208,10 +209,10 @@ #ifdef CONFIG_MODVERSIONS --- a/kernel/panic.c +++ b/kernel/panic.c -@@ -177,8 +177,10 @@ static const struct tnt tnts[] = { +@@ -198,8 +198,10 @@ static const struct tnt tnts[] = { { TAINT_CRAP, 'C', ' ' }, { TAINT_FIRMWARE_WORKAROUND, 'I', ' ' }, - { TAINT_OOT_MODULE, 'O', ' ' }, + { TAINT_OOT_MODULE, 'O', ' ' }, +#ifdef CONFIG_ENTERPRISE_SUPPORT { TAINT_NO_SUPPORT, 'N', ' ' }, { TAINT_EXTERNAL_SUPPORT, 'X', ' ' }, @@ -221,7 +222,7 @@ /** --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -666,7 +666,7 @@ static struct ctl_table kern_table[] = { +@@ -670,7 +670,7 @@ static struct ctl_table kern_table[] = { .extra1 = &pid_max_min, .extra2 = &pid_max_max, }, ++++++ patches.xen.tar.bz2 ++++++ ++++ 59384 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:51.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:51.000000000 +0100 @@ -55,6 +55,7 @@ patches.rpmify/rpm-kernel-config patches.rpmify/split-package patches.rpmify/cloneconfig.diff + patches.rpmify/nvme-broken ######################################################## # kbuild/module infrastructure fixes @@ -105,6 +106,27 @@ ######################################################## patches.arch/x86_64-hpet-64bit-timer.patch + # Queued for 3.4, please remove the autoload patches then + # including the autoload_fixes below + patches.arch/001-x86_autoload.patch + patches.arch/002-x86_autoload.patch + patches.arch/003-x86_autoload.patch + patches.arch/004-x86_autoload.patch + patches.arch/005-x86_autoload.patch + patches.arch/006-x86_autoload.patch + patches.arch/007-x86_autoload.patch + patches.arch/008-x86_autoload.patch + patches.arch/009-x86_autoload.patch + patches.arch/010-x86_autoload.patch + + patches.arch/001-x86_autoload_fixes.patch + patches.arch/002-x86_autoload_fixes.patch + patches.arch/003-x86_autoload_fixes.patch + patches.arch/004-x86_autoload_fixes.patch + patches.arch/005-x86_autoload_fixes.patch + patches.arch/006-x86_autoload_fixes.patch + patches.arch/007-x86_autoload_fixes.patch + +needs_update patches.arch/kvm-split-paravirt-ops-by-functionality +needs_update patches.arch/kvm-only-export-selected-pv-ops-feature-structs +needs_update patches.arch/kvm-split-the-KVM-pv-ops-support-by-feature @@ -177,7 +199,6 @@ patches.suse/readahead-request-tunables.patch patches.fixes/fs-partitions-efi-c-corrupted-guid-partition-tables-can-cause-kernel-oops patches.fixes/mm-Fix-assertion-mapping-nrpages-0-in-end_writeback.patch - patches.fixes/proc-mem-security-fix ######################################################## # IPC patches @@ -210,9 +231,6 @@ # for example SLE11 specific BIOS updates (if there is no other # way to safely solve an ACPI issue). +trenn patches.suse/acpi_osi_sle11_ident.patch - patches.arch/acpi_srat-pxm-rev-store.patch - patches.arch/acpi_srat-pxm-rev-ia64.patch - patches.arch/acpi_srat-pxm-rev-x86-64.patch # Queued for 2.6.36 -> just revert after some time patches.fixes/acpi_ec_sys_access_user_space_with_get_user.patch @@ -280,7 +298,6 @@ ######################################################## # Reiserfs Patches ######################################################## - patches.fixes/reiserfs-force-inode-evictions-before-umount-to-avoid-crash +needs_updating-39 patches.suse/reiser4-dependencies ######################################################## @@ -619,6 +636,10 @@ patches.xen/xen3-patch-3.0 patches.xen/xen3-patch-3.1 patches.xen/xen3-patch-3.2 + patches.xen/xen3-patch-3.3-rc5 + patches.xen/xen3-004-x86_autoload.patch + patches.xen/xen3-006-x86_autoload.patch + patches.xen/xen3-009-x86_autoload.patch patches.xen/xen3-apei_allow_drivers_access_nvs_ram.patch patches.xen/xen3-acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch patches.xen/xen3-stack-unwind @@ -646,7 +667,7 @@ patches.xen/xen-blktap-modular patches.xen/xen-blktap-write-barriers patches.xen/xen-blktap2-configurable-nr-devs - patches.xen/xen-op-packet + patches.xen/xen-blkif-op-packet patches.xen/xen-blkfront-cdrom patches.xen/xen-blkfront-hvm-no-cdrom patches.xen/xen-netback-nr-irqs ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.yJtsVm/_old 2012-03-02 13:48:51.000000000 +0100 +++ /var/tmp/diff_new_pack.yJtsVm/_new 2012-03-02 13:48:51.000000000 +0100 @@ -1,3 +1,3 @@ -2012-01-25 11:51:08 +0100 -GIT Revision: 2206a5c5b9aa64bd9a741830257f184818a0f6ee +2012-02-29 15:22:34 +0100 +GIT Revision: f22562233702e32624577b9254075e086c8da001 GIT Branch: master -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdelibs3 for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package kdelibs3 for openSUSE:Factory checked in at 2012-03-02 13:48:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs3 (Old) and /work/SRC/openSUSE:Factory/.kdelibs3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdelibs3", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs3/kdelibs3.changes 2012-01-25 10:37:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs3.new/kdelibs3.changes 2012-03-02 13:48:30.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 27 16:13:13 UTC 2012 - anixx(a)opensuse.org + +- make system tray icons resizable via parameter systrayIconWidth + in section [System Tray] in file ~/.kde/share/config/systemtray_panelappletrc + +------------------------------------------------------------------- New: ---- scalable-tray-icons.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.TIsHgK/_old 2012-03-02 13:48:34.000000000 +0100 +++ /var/tmp/diff_new_pack.TIsHgK/_new 2012-03-02 13:48:34.000000000 +0100 @@ -186,6 +186,7 @@ Patch220: kdelibs-fedora-3.5.x-CVE-2011-3365.patch Patch221: kdelibs-tarent-fix-webdav-utf8.diff +Patch222: scalable-tray-icons.patch %description This package contains kdelibs, one of the basic packages of the K @@ -359,6 +360,7 @@ %patch219 -p1 %patch220 -p1 %patch221 -p1 +%patch222 -p1 tar xfvj %SOURCE12 # ++++++ scalable-tray-icons.patch ++++++ diff -wruN kdelibs-3.5.10.orig/kdeui/ksystemtray.cpp kdelibs-3.5.10/kdeui/ksystemtray.cpp --- kdelibs-3.5.10.orig/kdeui/ksystemtray.cpp 2007-05-14 11:52:25.000000000 +0400 +++ kdelibs-3.5.10/kdeui/ksystemtray.cpp 2012-02-26 21:38:08.846734704 +0400 @@ -95,6 +95,7 @@ } setCaption( KGlobal::instance()->aboutData()->programName()); setAlignment( alignment() | Qt::AlignVCenter | Qt::AlignHCenter ); + setScaledContents(true); } KSystemTray::~KSystemTray() -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegraphics3 for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package kdegraphics3 for openSUSE:Factory checked in at 2012-03-02 13:48:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdegraphics3 (Old) and /work/SRC/openSUSE:Factory/.kdegraphics3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdegraphics3", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdegraphics3/kdegraphics3.changes 2012-02-14 13:06:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdegraphics3.new/kdegraphics3.changes 2012-03-02 13:48:26.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 1 21:34:35 UTC 2012 - anixx(a)opensuse.org + +- add rotate options to kpdf + +------------------------------------------------------------------- @@ -4 +9 @@ -- remove dependencies on kdelibs3-devel-doc and qt3-devcel-doc +- remove dependencies on kdelibs3-devel-doc and qt3-devel-doc New: ---- kdegraphics-trinity-kpdf-rotate.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics3.spec ++++++ --- /var/tmp/diff_new_pack.9RkXTE/_old 2012-03-02 13:48:29.000000000 +0100 +++ /var/tmp/diff_new_pack.9RkXTE/_new 2012-03-02 13:48:29.000000000 +0100 @@ -71,6 +71,7 @@ Patch14: 001-fribidi.diff %endif Patch15: GSmartPointer-gcc46.patch +Patch16: kdegraphics-trinity-kpdf-rotate.diff Requires: ghostscript-x11 %if 0%{?suse_version} <= 1120 Provides: kdegraphics3-viewer:/opt/kde3/bin/kuickshow @@ -266,6 +267,7 @@ %patch14 -p1 %endif %patch15 -p1 +%patch16 -p1 # gift is not maintained anymore and broken rm -rf kmrml @@ -319,12 +321,7 @@ %suse_update_desktop_file kfaxview Office Viewer %suse_update_desktop_file kamera kde_post_install -%if 0%{?suse_version} > 1030 %fdupes %{buildroot} -%endif - -%clean -rm -rf %{buildroot} %post %run_ldconfig ++++++ kdegraphics-trinity-kpdf-rotate.diff ++++++ diff --git a/kpdf/core/generator.h b/kpdf/core/generator.h index ca0ea01..e0c892f 100644 --- a/kpdf/core/generator.h +++ b/kpdf/core/generator.h @@ -92,8 +92,8 @@ class Generator : public QObject */ struct PixmapRequest { - PixmapRequest( int rId, int n, int w, int h, int p, bool a = false ) - : id( rId ), pageNumber( n ), width( w ), height( h ), + PixmapRequest( int rId, int n, int w, int h, int p, bool a = false, int r = 0 ) + : id( rId ), pageNumber( n ), width( w ), height( h ), rotation( r ), priority( p ), async( a ), page( 0 ) {}; // observer id @@ -102,6 +102,7 @@ struct PixmapRequest int pageNumber; int width; int height; + int rotation; // asyncronous request priority (less is better, 0 is max) int priority; // generate the pixmap in a thread and notify observer when done diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp index 7ad3415..35020e5 100644 --- a/kpdf/core/generator_pdf/generator_pdf.cpp +++ b/kpdf/core/generator_pdf/generator_pdf.cpp @@ -316,7 +316,8 @@ void PDFGenerator::generatePixmap( PixmapRequest * request ) // 1. Set OutputDev parameters and Generate contents // note: thread safety is set on 'false' for the GUI (this) thread kpdfOutputDev->setParams( request->width, request->height, genObjectRects, genObjectRects, false ); - pdfdoc->displayPage( kpdfOutputDev, page->number() + 1, fakeDpiX, fakeDpiY, 0, false, true, false ); + pdfdoc->displayPage( kpdfOutputDev, page->number() + 1, fakeDpiX, fakeDpiY, request->rotation, + false, true, false ); if ( genObjectRects ) pdfdoc->processLinks( kpdfOutputDev, page->number() + 1 ); @@ -1225,7 +1226,7 @@ void PDFPixmapGeneratorThread::run() d->generator->kpdfOutputDev->setParams( width, height, genObjectRects, genObjectRects, TRUE /*thread safety*/ ); d->generator->pdfdoc->displayPage( d->generator->kpdfOutputDev, page->number() + 1, - fakeDpiX, fakeDpiY, 0, false, true, false ); + fakeDpiX, fakeDpiY, d->currentRequest->rotation, false, true, false ); if ( genObjectRects ) d->generator->pdfdoc->processLinks( d->generator->kpdfOutputDev, page->number() + 1 ); diff --git a/kpdf/core/page.cpp b/kpdf/core/page.cpp index e6a847a..70bc71b 100644 --- a/kpdf/core/page.cpp +++ b/kpdf/core/page.cpp @@ -27,10 +27,40 @@ KPDFPage::KPDFPage( uint page, float w, float h, int r ) : m_number( page ), m_rotation( r ), m_width( w ), m_height( h ), m_bookmarked( false ), m_text( 0 ), m_transition( 0 ) { + setRotation( r ); +} + +KPDFPage::~KPDFPage() +{ + deletePixmapsAndRects(); + deleteHighlights(); + delete m_text; + delete m_transition; +} + +void KPDFPage::rotate90degrees() + { + float w = m_width; + m_width = m_height; + m_height = w; + + // avoid Division-By-Zero problems in the program + + if ( m_width <= 0 ) + m_width = 1; + if ( m_height <= 0 ) + m_height = 1; + + deletePixmapsAndRects(); + } + +void KPDFPage::setRotation( int r ) +{ // if landscape swap width <-> height (rotate 90deg CCW) if ( r == 90 || r == 270 ) { - m_width = h; + float w = m_width; + m_width = m_height; m_height = w; } // avoid Division-By-Zero problems in the program @@ -38,17 +68,10 @@ KPDFPage::KPDFPage( uint page, float w, float h, int r ) m_width = 1; if ( m_height <= 0 ) m_height = 1; -} -KPDFPage::~KPDFPage() -{ deletePixmapsAndRects(); - deleteHighlights(); - delete m_text; - delete m_transition; } - bool KPDFPage::hasPixmap( int id, int width, int height ) const { if ( !m_pixmaps.contains( id ) ) diff --git a/kpdf/core/page.h b/kpdf/core/page.h index ebd6e52..4a8be71 100644 --- a/kpdf/core/page.h +++ b/kpdf/core/page.h @@ -120,6 +120,9 @@ class KPDFPage void deletePixmapsAndRects(); void deleteHighlights( int s_id = -1 ); + void setRotation( int r ); + void rotate90degrees(); + private: friend class PagePainter; int m_number, m_rotation; diff --git a/kpdf/part.rc b/kpdf/part.rc index aa7409c..194e94a 100644 --- a/kpdf/part.rc +++ b/kpdf/part.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="kpdf_part" version="18"> +<kpartgui name="kpdf_part" version="19"> <MenuBar> <Menu name="file"><text>&File</text> <Action name="save" group="file_save"/> @@ -19,6 +19,8 @@ <Action name="zoom_fit_width"/> <Action name="zoom_fit_page"/> <Action name="zoom_fit_rect"/> + <Action name="rotate_right"/> + <Action name="rotate_left"/> <Separator/> <Action name="view_continuous"/> <Action name="view_twopages"/> @@ -53,6 +55,8 @@ <Action name="zoom_in"/> <Action name="zoom_to" /> <Action name="zoom_out"/> + <Action name="rotate_left"/> + <Action name="rotate_right"/> <Separator/> <Action name="zoom_fit_width"/> <Action name="zoom_fit_page"/> diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp index 247f1b1..866b8d6 100644 --- a/kpdf/ui/pageview.cpp +++ b/kpdf/ui/pageview.cpp @@ -71,6 +71,7 @@ public: // view layout (columns and continuous in Settings), zoom and mouse PageView::ZoomMode zoomMode; float zoomFactor; + int rotation; PageView::MouseMode mouseMode; QPoint mouseGrabPos; QPoint mousePressPos; @@ -185,6 +186,7 @@ PageView::PageView( QWidget *parent, KPDFDocument *document ) d->document = document; d->zoomMode = (PageView::ZoomMode)KpdfSettings::zoomMode(); d->zoomFactor = KpdfSettings::zoomFactor(); + d->rotation = 0; d->mouseMode = MouseNormal; d->mouseMidStartY = -1; d->mouseOnRect = false; @@ -263,6 +265,14 @@ void PageView::setupActions( KActionCollection * ac ) d->aZoomFitText = new KToggleAction( i18n("Fit to &Text"), "viewmagfit", 0, ac, "zoom_fit_text" ); connect( d->aZoomFitText, SIGNAL( toggled( bool ) ), SLOT( slotFitToTextToggled( bool ) ) ); + // rotate actions + KAction *action; + action = new KAction( i18n("Rotate Right"), "rotate_cw", KShortcut( "Ctrl+Shift++" ), + this, SLOT( slotRotateRight() ), ac, "rotate_right" ); + + action = new KAction( i18n("Rotate Left"), "rotate_ccw", KShortcut( "Ctrl+Shift+-" ), + this, SLOT( slotRotateLeft() ), ac, "rotate_left" ); + // View-Layout actions d->aViewTwoPages = new KToggleAction( i18n("&Two Pages"), "view_left_right", 0, ac, "view_twopages" ); connect( d->aViewTwoPages, SIGNAL( toggled( bool ) ), SLOT( slotTwoPagesToggled( bool ) ) ); @@ -1867,7 +1877,7 @@ void PageView::slotRequestVisiblePixmaps( int newLeft, int newTop ) if ( !i->page()->hasPixmap( PAGEVIEW_ID, i->width(), i->height() ) ) { PixmapRequest * p = new PixmapRequest( - PAGEVIEW_ID, i->pageNumber(), i->width(), i->height(), PAGEVIEW_PRIO, true ); + PAGEVIEW_ID, i->pageNumber(), i->width(), i->height(), PAGEVIEW_PRIO, true, d->rotation ); requestedPixmaps.push_back( p ); } @@ -1907,7 +1917,7 @@ void PageView::slotRequestVisiblePixmaps( int newLeft, int newTop ) // request the pixmap if not already present if ( !i->page()->hasPixmap( PAGEVIEW_ID, i->width(), i->height() ) && i->width() > 0 ) requestedPixmaps.push_back( new PixmapRequest( - PAGEVIEW_ID, i->pageNumber(), i->width(), i->height(), PAGEVIEW_PRELOAD_PRIO, true ) ); + PAGEVIEW_ID, i->pageNumber(), i->width(), i->height(), PAGEVIEW_PRELOAD_PRIO, true, d->rotation ) ); } // add the page before the 'visible series' in preload @@ -1918,7 +1928,7 @@ void PageView::slotRequestVisiblePixmaps( int newLeft, int newTop ) // request the pixmap if not already present if ( !i->page()->hasPixmap( PAGEVIEW_ID, i->width(), i->height() ) && i->width() > 0 ) requestedPixmaps.push_back( new PixmapRequest( - PAGEVIEW_ID, i->pageNumber(), i->width(), i->height(), PAGEVIEW_PRELOAD_PRIO, true ) ); + PAGEVIEW_ID, i->pageNumber(), i->width(), i->height(), PAGEVIEW_PRELOAD_PRIO, true, d->rotation ) ); } } @@ -2044,6 +2054,52 @@ void PageView::slotFitToTextToggled( bool on ) if ( on ) updateZoom( ZoomFitText ); } +void PageView::slotRotateRight() +{ + d->rotation = ( d->rotation + 90 ) % 360; + + QValueVector< PageViewItem * >::iterator iIt = d->items.begin(), iEnd = d->items.end(); + for ( ; iIt != iEnd; ++iIt ) + { + int r = const_cast<KPDFPage*>((*iIt)->page())->rotation(); + r = ( r + 90 ) % 360; + + const_cast<KPDFPage*>((*iIt)->page())->rotate90degrees(); + } + + // be sure to block updates to document's viewport + bool prevState = d->blockViewport; + d->blockViewport = true; + slotRelayoutPages(); + d->blockViewport = prevState; + // request pixmaps + slotRequestVisiblePixmaps(); +} + +void PageView::slotRotateLeft() +{ + d->rotation -= 90; + if ( d->rotation < 0 ) d->rotation += 360; + + QValueVector< PageViewItem * >::iterator iIt = d->items.begin(), iEnd = d->items.end(); + for ( ; iIt != iEnd; ++iIt ) + { + int r = const_cast<KPDFPage*>((*iIt)->page())->rotation(); + r -= 90; + if ( r < 0 ) r += 360; + + const_cast<KPDFPage*>((*iIt)->page())->rotate90degrees(); + } + + // be sure to block updates to document's viewport + bool prevState = d->blockViewport; + d->blockViewport = true; + slotRelayoutPages(); + d->blockViewport = prevState; + // request pixmaps + slotRequestVisiblePixmaps(); +} + void PageView::slotTwoPagesToggled( bool on ) { uint newColumns = on ? 2 : 1; diff --git a/kpdf/ui/pageview.h b/kpdf/ui/pageview.h index f6e4099..be082bd 100644 --- a/kpdf/ui/pageview.h +++ b/kpdf/ui/pageview.h @@ -135,6 +135,8 @@ class PageView : public QScrollView, public DocumentObserver void slotFitToWidthToggled( bool ); void slotFitToPageToggled( bool ); void slotFitToTextToggled( bool ); + void slotRotateRight(); + void slotRotateLeft(); void slotTwoPagesToggled( bool ); void slotContinuousToggled( bool ); void slotSetMouseNormal(); diff --git a/kpdf/xpdf/xpdf/Stream.cc b/kpdf/xpdf/xpdf/Stream.cc index ab63024..2021952 100644 --- a/kpdf/xpdf/xpdf/Stream.cc +++ b/kpdf/xpdf/xpdf/Stream.cc @@ -410,15 +410,12 @@ StreamPredictor::StreamPredictor(Stream *strA, int predictorA, ok = gFalse; nVals = width * nComps; - if (width <= 0 || nComps <= 0 || nBits <= 0 || - nComps > gfxColorMaxComps || nBits > 16 || - width >= INT_MAX / nComps || - nVals >= (INT_MAX - 7) / nBits) { - return; - } pixBytes = (nComps * nBits + 7) >> 3; rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; - if (rowBytes <= 0) { + if (width <= 0 || nComps <= 0 || nBits <= 0 || + nComps > gfxColorMaxComps || nBits > 16 || + width >= INT_MAX / nComps || // check for overflow in nVals + nVals >= (INT_MAX - 7) / nBits) { // check for overflow in rowBytes return; } predLine = (Guchar *)gmalloc(rowBytes); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegames3 for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package kdegames3 for openSUSE:Factory checked in at 2012-03-02 13:48:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdegames3 (Old) and /work/SRC/openSUSE:Factory/.kdegames3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdegames3", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdegames3/kdegames3.changes 2011-09-23 02:06:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdegames3.new/kdegames3.changes 2012-03-02 13:48:18.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 1 21:09:25 UTC 2012 - anixx(a)opensuse.org + +- fix katomic highscores display + +------------------------------------------------------------------- New: ---- kdegames-trinity-fix-highscore.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegames3.spec ++++++ --- /var/tmp/diff_new_pack.7g7LRB/_old 2012-03-02 13:48:20.000000000 +0100 +++ /var/tmp/diff_new_pack.7g7LRB/_new 2012-03-02 13:48:20.000000000 +0100 @@ -13,10 +13,6 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -# norootforbuild - Name: kdegames3 BuildRequires: kdelibs3-devel @@ -36,6 +32,7 @@ Url: http://www.kde.org Source: kdegames-%{version}.tar.bz2 Patch0: 3_5_BRANCH.diff +Patch1: kdegames-trinity-fix-highscore.diff %description The base libraries for kdegames as well as the games Solitaire and @@ -43,12 +40,6 @@ kdegames3-arcade kdegames3-board kdegames3-card kdegames3-tactic - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %package arcade License: GPL-2.0+ # usesubdirs kasteroids ksirtet ksmiletris ksnake kspaceduel ktron kbounce ktuberling kolf kfouleggs @@ -60,12 +51,6 @@ Several arcade style games. Hunting asteroids, the famous Tetris, and Tron are just an example of what is included. - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %package board License: GPL-2.0+ # usesubdirs atlantik kbackgammon kbattleship kblackbox kenolaba kmahjongg kreversi kshisen kwin4 klickety @@ -77,12 +62,6 @@ %description board Board games like Backgammon, battleship, Mahjongg, and 4 wins. - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %package card License: GPL-2.0+ # usesubdirs megami kpoker lskat @@ -93,12 +72,6 @@ %description card Card games for KDE. Poker and Skat. - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %package tactic License: GPL-2.0 and GPL-2.0+ # usesubdirs katomic kjumpingcube klines konquest ksame ksokoban @@ -110,12 +83,6 @@ Famous games for the time you should spend working: Sokoban, Same, and more. - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %package devel License: GPL-2.0+ Summary: Games for KDE: Build Environment @@ -129,15 +96,10 @@ This package contains all necessary include files needed to develop applications that require these. - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %prep %setup -n kdegames-%{version} -q %patch0 +%patch1 -p1 . /etc/opt/kde3/common_options update_admin ++++++ kdegames-trinity-fix-highscore.diff ++++++ commit 18b5622af48967838240687fc54ff937acaae903 Author: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> Date: 1260832269 +0000 Fix high scores display git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1062508 283d02a7-25f6-0310-bc7c-ecb5cbfe19da diff --git a/katomic/gamewidget.cpp b/katomic/gamewidget.cpp index fc6838a..165e55c 100644 --- a/katomic/gamewidget.cpp +++ b/katomic/gamewidget.cpp @@ -116,6 +116,25 @@ void GameWidget::getMoves(int moves) ys->setText(current); } +void GameWidget::mergeHighScores(int l) +{ + KConfigGroup oldConfig(kapp->config(), QString("High Scores Level %1").arg(l).utf8()); + KConfigGroup newConfig(kapp->config(), QString("Highscores Level %1").arg(l).utf8()); + + newConfig.writeEntry("LastPlayer", oldConfig.readEntry("LastPlayer")); + + QString num; + for (int i = 1; i <= 10; ++i) + { + num.setNum(i); + QString key = "Pos" + num + "Name"; + newConfig.writeEntry(key, oldConfig.readEntry(key, "-")); + key = "Pos" + num + "Score"; + newConfig.writeEntry(key, oldConfig.readEntry(key, "-")); + } + kapp->config()->sync(); +} + void GameWidget::updateLevel (int l) { level=l; @@ -128,7 +147,11 @@ void GameWidget::updateLevel (int l) cfg.setGroup("Level"); feld->load(cfg); - highScore->setConfigGroup(QString("High Scores Level %1").arg(level)); + if (!kapp->config()->hasGroup(QString("Highscores Level %1").arg(level)) && + kapp->config()->hasGroup(QString("High Scores Level %1").arg(level))) + mergeHighScores(level); + + highScore->setConfigGroup(QString("Highscores Level %1").arg(level)); highest.setNum(highScore->highScore()); if (highest != "0" ) hs->setText(highest); diff --git a/katomic/gamewidget.h b/katomic/gamewidget.h index 6259e6b..00e9537 100644 --- a/katomic/gamewidget.h +++ b/katomic/gamewidget.h @@ -28,6 +28,9 @@ class GameWidget : public QWidget // bringt level auf neuesten stand void updateLevel (int); + // copy highscores from "High Scores" key to "Highscores" key + void mergeHighScores(int l); + // restart current level void restartLevel(); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase3 for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package kdebase3 for openSUSE:Factory checked in at 2012-03-02 13:48:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase3 (Old) and /work/SRC/openSUSE:Factory/.kdebase3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase3", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase3/kdebase3.changes 2012-02-28 14:13:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase3.new/kdebase3.changes 2012-03-02 13:48:14.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 1 16:02:57 UTC 2012 - anixx(a)opensuse.org + +- set default tray icon size to 18 px +- remove arrows from panel applet handles + +------------------------------------------------------------------- New: ---- applet-no-arrow.patch kicker-height.patch systray-icons-style.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.iP42fq/_old 2012-03-02 13:48:18.000000000 +0100 +++ /var/tmp/diff_new_pack.iP42fq/_new 2012-03-02 13:48:18.000000000 +0100 @@ -277,6 +277,9 @@ Patch270: kdebase-svn-konq-move.patch Patch271: ksmserver-shutdown-upower.patch Patch272: kickoff-shutdown-upower.patch +Patch273: systray-icons-style.patch +Patch274: applet-no-arrow.patch +Patch275: kicker-height.patch %description This package contains kdebase, one of the basic packages of the K @@ -621,6 +624,9 @@ %patch270 -p4 %patch271 -p1 %patch272 -p1 +%patch273 -p1 +%patch274 -p1 +%patch275 -p1 rm -rf kappfinder rm pics/crystalsvg/cr??-*emacs.png ++++++ applet-no-arrow.patch ++++++ diff -wruN kdebase-3.5.10.orig/kicker/kicker/core/applethandle.cpp kdebase-3.5.10/kicker/kicker/core/applethandle.cpp --- kdebase-3.5.10.orig/kicker/kicker/core/applethandle.cpp 2008-08-19 22:16:56.000000000 +0400 +++ kdebase-3.5.10/kicker/kicker/core/applethandle.cpp 2012-03-01 17:38:54.720182058 +0400 @@ -58,7 +58,7 @@ m_dragBar->installEventFilter(this); m_layout->addWidget(m_dragBar); - if (kapp->authorizeKAction("kicker_rmb")) + /* if (kapp->authorizeKAction("kicker_rmb")) { m_menuButton = new AppletHandleButton( this ); m_menuButton->installEventFilter(this); @@ -67,7 +67,7 @@ connect(m_menuButton, SIGNAL(pressed()), this, SLOT(menuButtonPressed())); QToolTip::add(m_menuButton, i18n("%1 menu").arg(parent->info().name())); - } + } */ QToolTip::add(this, i18n("%1 applet handle").arg(parent->info().name())); resetLayout(); @@ -236,7 +236,7 @@ } } - if (m_menuButton && e->type() == QEvent::MouseButtonPress) +/* if (m_menuButton && e->type() == QEvent::MouseButtonPress) { QMouseEvent* ev = static_cast<QMouseEvent*>(e); if (ev->button() == RightButton) @@ -249,6 +249,20 @@ return true; } + } */ + + if (e->type() == QEvent::MouseButtonPress) + { + QMouseEvent* ev = static_cast<QMouseEvent*>(e); + if (ev->button() == RightButton) + { + if (kapp->authorizeKAction("kicker_rmb")) + { + emit showAppletMenu(); + return true; + } + + } } return QWidget::eventFilter(o, e); // standard event processing ++++++ kicker-height.patch ++++++ diff -wruN kdebase-3.5.10.orig/kicker/libkicker/global.cpp kdebase-3.5.10/kicker/libkicker/global.cpp --- kdebase-3.5.10.orig/kicker/libkicker/global.cpp 2008-08-19 22:16:55.000000000 +0400 +++ kdebase-3.5.10/kicker/libkicker/global.cpp 2012-03-01 23:53:52.430187490 +0400 @@ -145,7 +145,7 @@ break; case KPanelExtension::SizeNormal: - return 46; + return 42; break; case KPanelExtension::SizeLarge: ++++++ systray-icons-style.patch ++++++ diff -wruN kdebase-3.5.10.orig/kicker/applets/systemtray/systemtrayapplet.cpp kdebase-3.5.10/kicker/applets/systemtray/systemtrayapplet.cpp --- kdebase-3.5.10.orig/kicker/applets/systemtray/systemtrayapplet.cpp 2008-08-19 22:16:58.000000000 +0400 +++ kdebase-3.5.10/kicker/applets/systemtray/systemtrayapplet.cpp 2012-02-26 14:17:06.579731598 +0400 @@ -416,7 +416,7 @@ //Note This setting comes from kdeglobal. conf->setGroup("System Tray"); - m_iconSize = conf->readNumEntry("systrayIconWidth", 22); + m_iconSize = conf->readNumEntry("systrayIconWidth", 18); } void SystemTrayApplet::systemTrayWindowAdded( WId w ) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-shell for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package gnome-shell for openSUSE:Factory checked in at 2012-03-02 13:48:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-shell (Old) and /work/SRC/openSUSE:Factory/.gnome-shell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-shell", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-shell/gnome-shell.changes 2012-02-20 16:11:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-shell.new/gnome-shell.changes 2012-03-02 13:48:03.000000000 +0100 @@ -1,0 +2,41 @@ +Thu Feb 23 07:59:27 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.90: + + Allow other applications to implement search providers via + D-Bus [bgo#663125, bgo#670148] + + Remove "Recent Items" search, as replaced by Documents search + [bgo#663125] + + Allow NetworkManager VPN plugins to use a shell-themed dialog + [bgo#658484] + + Port away from deprecated Clutter API [bgo#670034] + - StTooltip is removed + - StWidget is now a concrete class and can be instantiated + - st_container_destroy_children(), + st_box_layout_insert_actor(), and other functions removed in + favor of new replacements in Clutter. + + Use systemd for console/session handling when available + + Visual improvements to contact search, padding, top panel, + checkboxes [bgo#669489, bgo#669811, bgo#669993] + + Add a include_cursor parameter to Screenshot and + ScreenshotWindow D-Bus methods [bgo#670086] + + Add a "FlashArea" D-Bus method to do the screenshot flash + without a screenshot [bgo#669660] + + Build fixes [bgo#658484, bgo#669637] + + Misc bug fixes [bgo#642135, bgo#658484, bgo#658908, bgo#667694, + bgo#669098, bgo#669921, bgo#669662, bgo#669694, bgo#669776, + bgo#669887, bgo#669921, bgo#670005, bgo#670006, bgo#670319, + bgo#670418, bgo#670489] + + Updated translations. +- Add pkgconfig(libsystemd-daemon) and pkgconfig(libsystemd-login) + BuildRequires: build systemd support. Note that it nicely falls + back to ConsoleKit if systemd is not used on the system. +- Remove pkgconfig(gnome-desktop-3.0) BuildRequires: not needed + anymore. +- Add gnome-shell-search-provider-documents Recommends: this is the + D-Bus service in gnome-documents that allow searching in + documents from the shell. +- Manually create the %{_datadir}/gnome-shell/search-providers + directory in install, so that we can own this directory where + search providers install a .ini file. + +------------------------------------------------------------------- Old: ---- gnome-shell-3.3.5.tar.xz New: ---- gnome-shell-3.3.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-shell.spec ++++++ --- /var/tmp/diff_new_pack.lHypGN/_old 2012-03-02 13:48:04.000000000 +0100 +++ /var/tmp/diff_new_pack.lHypGN/_new 2012-03-02 13:48:04.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gnome-shell -Version: 3.3.5 +Version: 3.3.90 Release: 0 Summary: GNOME Shell License: GPL-2.0+ @@ -28,14 +29,13 @@ BuildRequires: update-desktop-files # needed for directory ownership BuildRequires: dbus-1 -BuildRequires: pkgconfig(clutter-1.0) >= 1.7.5 +BuildRequires: pkgconfig(clutter-1.0) >= 1.9.11 BuildRequires: pkgconfig(folks) >= 0.5.2 BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) >= 2.31.6 BuildRequires: pkgconfig(gjs-1.0) >= 1.29.18 BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.1.0 -BuildRequires: pkgconfig(gnome-desktop-3.0) BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.10.1 BuildRequires: pkgconfig(gstreamer-0.10) >= 0.10.16 @@ -52,9 +52,11 @@ BuildRequires: pkgconfig(libpulse-mainloop-glib) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.11 +BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(libsystemd-login) BuildRequires: pkgconfig(mutter-plugins) BuildRequires: pkgconfig(polkit-agent-1) >= 0.100 -BuildRequires: pkgconfig(telepathy-glib) >= 0.15.6 +BuildRequires: pkgconfig(telepathy-glib) >= 0.17.5 BuildRequires: pkgconfig(telepathy-logger-0.2) >= 0.2.4 BuildRequires: pkgconfig(xfixes) Requires: gdk-pixbuf-loader-rsvg @@ -84,6 +86,7 @@ %endif Recommends: %{name}-browser-plugin Recommends: %{name}-lang +Recommends: gnome-shell-search-provider-documents BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires @@ -135,6 +138,8 @@ find %{buildroot} -type f -name "*.la" -delete -print # This is the directory where extensions get installed install -d %{buildroot}%{_datadir}/gnome-shell/extensions +# This is the directory where search providers get installed +install -d %{buildroot}%{_datadir}/gnome-shell/search-providers %find_lang %{name} %{?no_lang_C} %suse_update_desktop_file %{name} %suse_update_desktop_file gnome-shell-extension-prefs @@ -165,11 +170,13 @@ %{_datadir}/GConf/gsettings/gnome-shell-overrides.convert %{_datadir}/applications/gnome-shell.desktop %{_datadir}/applications/gnome-shell-extension-prefs.desktop +%{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml %{_datadir}/dbus-1/services/org.gnome.Shell.CalendarServer.service %{_datadir}/dbus-1/services/org.gnome.Shell.HotplugSniffer.service %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml %{_datadir}/gnome-shell/ %dir %{_datadir}/gnome-shell/extensions +%dir %{_datadir}/gnome-shell/search-providers %doc %{_mandir}/man?/gnome-shell.* %files devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gmime for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package gmime for openSUSE:Factory checked in at 2012-03-02 13:47:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gmime (Old) and /work/SRC/openSUSE:Factory/.gmime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gmime", Maintainer is "sbrabec(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/gmime/gmime.changes 2012-01-17 16:05:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gmime.new/gmime.changes 2012-03-02 13:47:58.000000000 +0100 @@ -1,0 +2,40 @@ +Thu Mar 1 13:26:28 UTC 2012 - cfarrell(a)suse.com + +- license update: LGPL-2.1+ + Reduced to applicable license in SPDX format + +------------------------------------------------------------------- +Tue Feb 21 20:10:12 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 2.6.6: + + configure.ac: Add a --enable-smime flag which defaults to "no". + + Fixed multipart/signed logic. + + Handle non-standard Content-Transfer-Encodings names: 7-bit, + 8-bit, and x-uue (the standard names for these are 7bit, 8bit, + and x-uuencode). + + Various other code changes. + + Several optimizations. + +------------------------------------------------------------------- +Sat Feb 18 16:10:50 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 2.6.5: + + Stop installing uuencode/uudecode. + + configure.ac: Added --with-gacdir to fix bgo#667072 + + Several other build fixes. + + Bug fixes, including: bgo#667684, bgo#668085. +- Drop tools subpackage: those are not really usable programs, but + are meant as examples (they moved to the examples folder in the + source code). Add a gmime-tools Obsoletes to libgmime-2_6-0 for + smooth upgrades. +- Pass --with-gacdir=%{_prefix}/lib to configure. +- Drop patches: + + gmime-mono-arch-indep.patch: fixed upstream by introducing + --with-gacdir option to configure + + gmime-compiler-warnings.patch: fixed upstream +- Remove libtool BuildRequires and call to autoreconf, as they were + only needed by the patches, +- Remove xz BuildRequires now that it comes for free in the build + system. + +------------------------------------------------------------------- Old: ---- gmime-2.6.4.tar.xz gmime-compiler-warnings.patch gmime-mono-arch-indep.patch New: ---- gmime-2.6.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gmime.spec ++++++ --- /var/tmp/diff_new_pack.gAep91/_old 2012-03-02 13:48:00.000000000 +0100 +++ /var/tmp/diff_new_pack.gAep91/_new 2012-03-02 13:48:00.000000000 +0100 @@ -15,25 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gmime -Version: 2.6.4 +Version: 2.6.6 Release: 0 Url: http://spruce.sourceforge.net/gmime/ Summary: MIME Parser and Utility Library -License: LGPL-2.1+ ; SUSE-Public-Domain ; MIT +License: LGPL-2.1+ Group: Productivity/Networking/Email/Utilities Source: http://download.gnome.org/sources/gmime/2.6/%{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE gmime-mono-arch-indep.patch bgo#667072 dimstar(a)opensuse.org -- Do not install mono libs to libdir -Patch0: gmime-mono-arch-indep.patch -# PATCH-FIX-UPSTREAM gmime-compiler-warnings.patch bgo#667684 dimstar(a)opensuse.org -- Fix compiler warnings, taken from upstream git, commit 3d1a969 -Patch1: gmime-compiler-warnings.patch BuildRequires: gpgme-devel BuildRequires: gtk-doc -# Needed for patch0 -BuildRequires: libtool BuildRequires: mono-devel -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz BuildRequires: zlib-devel BuildRequires: pkgconfig(gapi-2.0) BuildRequires: pkgconfig(glib-2.0) @@ -44,21 +37,11 @@ GMime is a C/C++ library for parsing and creating messages using the Multipurpose Internet Mail Extension (MIME). -%package tools -Summary: MIME Parser and Utility Library -- Tools -License: GPL-2.0+ -Group: Productivity/Networking/Email/Utilities -Provides: gmime-2_4 = %{version} -Obsoletes: gmime-2_4 < %{version} - -%description tools -GMime is a C/C++ library for parsing and creating messages using -the Multipurpose Internet Mail Extension (MIME). - %package -n libgmime-2_6-0 Summary: MIME Parser and Utility Library -License: LGPL-2.1+ ; SUSE-Public-Domain ; MIT Group: System/Libraries +# The tools package was only for some sample applications, which are no longer installed since 2.6.5 +Obsoletes: %{name}-tools < %{version} %description -n libgmime-2_6-0 GMime is a C/C++ library for parsing and creating messages using @@ -66,9 +49,9 @@ %package sharp Summary: MIME Parser and Utility Library -- Mono Bindings -License: LGPL-2.1+ ; SUSE-Public-Domain ; MIT Group: Development/Libraries/Other -Requires: libgmime-2_6-0 = %{version} glib-sharp2 +Requires: glib-sharp2 +Requires: libgmime-2_6-0 = %{version} # Obsoletes without Provides: gmime-2_4-sharp was an old name # during 2.4.x days, and even though API is different, we need to # get rid of it since some files are common. @@ -80,7 +63,6 @@ %package devel Summary: MIME Parser and Utility Library -- Development Files -License: LGPL-2.1+ ; SUSE-Public-Domain ; MIT Group: Development/Libraries/C and C++ Requires: libgmime-2_6-0 = %{version} @@ -92,8 +74,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %ifarch %arm @@ -101,13 +81,12 @@ # with >= -O2. See https://bugs.launchpad.net/gcc/+bug/836588. CFLAGS="%{optflags} -O1" %endif -# Needed for patch0 -autoreconf -fiv %configure\ --enable-largefile\ --disable-static\ - --enable-gtk-doc -make %{?jobs:-j%jobs} + --enable-gtk-doc \ + --with-gacdir=%{_prefix}/lib +make %{?_smp_mflags} %install %makeinstall @@ -123,13 +102,6 @@ %postun -n libgmime-2_6-0 -p /sbin/ldconfig -%files tools -%defattr (-, root, root) -# NEWS is empty -# COPYING is LGPL while the binaries are GPL -%doc AUTHORS ChangeLog README TODO -%{_bindir}/*uu* - %files -n libgmime-2_6-0 %defattr (-, root, root) # NEWS is empty -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit evolution for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package evolution for openSUSE:Factory checked in at 2012-03-02 13:47:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution (Old) and /work/SRC/openSUSE:Factory/.evolution.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "evolution", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/evolution/evolution.changes 2012-02-20 16:09:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.evolution.new/evolution.changes 2012-03-02 13:47:42.000000000 +0100 @@ -1,0 +2,34 @@ +Fri Mar 2 08:19:30 UTC 2012 - vuntz(a)opensuse.org + +- Add a comment about GPL-2.0 files in the tarball, that are + pending relicensing (bnc#749859). + +------------------------------------------------------------------- +Mon Feb 20 22:36:56 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.90: + + Use GSettings for EProxy + + Improved documentation + + Bugs fixed: bgo#670414, bgo#670301, bgo#670389, bgo#668620, + bgo#670252, bgo#552873, bgo#471795, bgo#670278, bgo#670280, + bgo#663110, bgo#663077, bgo#320976, bgo#332043, bgo#668482, + bgo#669113, bgo#668848, bgo#659396, bgo#659394, bgo#655955, + bgo#670014, bgo#655485, bgo#655021, bgo#637200, bgo#662743, + bgo#670073, bgo#591436, bgo#637354, bgo#669097, bgo#669433, + bgo#210105, bgo#384838, bgo#391472, bgo#418520, bgo#553796, + bgo#309945. + + Updated translations. +- Drop evolution-pst-plugin.patch: fixed upstream. +- Drop the libemail-engine0 and libemail-utils0 subpackages: those + are private libraries now. Like for any removed shared library, + we do not need to obsolete them; and they were only available in + Factory for a short time anyway. + +------------------------------------------------------------------- +Sun Feb 19 17:08:11 UTC 2012 - dimstar(a)opensuse.org + +- Add pkgconfig(ice) and pkgconfig(sm) BuildRequires: they used to + be pulled in by something else, but the relayout of xorg-x11 + packages changed that. + +------------------------------------------------------------------- Old: ---- evolution-3.3.5.tar.xz evolution-pst-plugin.patch New: ---- evolution-3.3.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.6da4gV/_old 2012-03-02 13:47:44.000000000 +0100 +++ /var/tmp/diff_new_pack.6da4gV/_new 2012-03-02 13:47:44.000000000 +0100 @@ -62,6 +62,7 @@ BuildRequires: pkgconfig(gtkimageview-3.0) %endif BuildRequires: pkgconfig(gweather-3.0) +BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libedataserver-1.2) BuildRequires: pkgconfig(libedataserverui-3.0) @@ -75,17 +76,18 @@ BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(pangoft2) BuildRequires: pkgconfig(shared-mime-info) +BuildRequires: pkgconfig(sm) # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. %define evolution_base_version 3.4 -Version: 3.3.5 +Version: 3.3.90 Release: 0 +# FIXME: check if note on license is still valid (comment before license) # FIXME: check with upstream/meego if we want to enable clutter for express mode Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite License: LGPL-2.0 ; LGPL-3.0 Group: Productivity/Networking/Email/Clients +# NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859 Source0: http://download.gnome.org/sources/evolution/3.3/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM evolution-pst-plugin.patch bgo#669443 dimstar(a)opensuse.org -- Fix linking of evolution pst import plugin. -Patch0: evolution-pst-plugin.patch # PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw(a)novell.com -- look for ldap includes in %{_libdir}/evoldap/include Patch15: evolution-custom-openldap-includes.patch # PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath(a)suse.de -- Book URI: Spills Into Second Column. @@ -121,32 +123,10 @@ This package provides a catalog for Glade, to allow the use of Evolution widgets in Glade. -%package -n libemail-engine0 -Summary: Client library for evolution mail -Group: System/Libraries - -%description -n libemail-engine0 -Evolution consists of modular components (at the moment: mailer, -calendar, and address book) that should make daily life easier. Because -of the modular design, it is possible to plug new components into -Evolution or embed the existing ones in other applications. - -%package -n libemail-utils0 -Summary: Client library for evolution mail -Group: System/Libraries - -%description -n libemail-utils0 -Evolution consists of modular components (at the moment: mailer, -calendar, and address book) that should make daily life easier. Because -of the modular design, it is possible to plug new components into -Evolution or embed the existing ones in other applications. - %package devel Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Requires: evolution = %{version} -Requires: libemail-engine0 = %{version} -Requires: libemail-utils0 = %{version} Provides: evolution2-devel = %{version} Obsoletes: evolution2-devel < %{version} @@ -197,7 +177,6 @@ %prep %setup -q translation-update-upstream -%patch0 -p1 %if %USE_EVOLDAP %patch15 -p1 %endif @@ -272,14 +251,6 @@ %desktop_database_postun %icon_theme_cache_postun -%post -n libemail-engine0 -p /sbin/ldconfig - -%postun -n libemail-engine0 -p /sbin/ldconfig - -%post -n libemail-utils0 -p /sbin/ldconfig - -%postun -n libemail-utils0 -p /sbin/ldconfig - %files -f %{name}.schemas_list %defattr(-,root,root) %doc AUTHORS COPYING COPYING.LGPL2 COPYING.LGPL3 COPYING-DOCS COPYING.OPENLDAP ChangeLog MAINTAINERS NEWS NEWS-1.0 README @@ -299,7 +270,7 @@ %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.external-editor.gschema.xml %dir %{_libdir}/evolution %dir %{_libdir}/evolution/* -%{_libdir}/evolution/*/*.so.* +%{_libdir}/evolution/*/*.so %dir %{_libdir}/evolution/*/modules/ %{_libdir}/evolution/*/modules/*-module-addressbook.* %{_datadir}/glib-2.0/schemas/org.gnome.evolution.addressbook.gschema.xml @@ -373,20 +344,9 @@ %{_libdir}/glade/modules/libgladeevolution.so %{_datadir}/glade/catalogs/evolution.xml -%files -n libemail-engine0 -%defattr(-,root,root) -%{_libdir}/libemail-engine.so.* - -%files -n libemail-utils0 -%defattr(-,root,root) -%{_libdir}/libemail-utils.so.* - %files devel %defattr(-,root,root) %{_includedir}/* -%{_libdir}/libemail-engine.so -%{_libdir}/libemail-utils.so -%{_libdir}/evolution/%{evolution_base_version}/*.so %{_libdir}/pkgconfig/*.pc %{_datadir}/gtk-doc/html/eshell -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit epiphany-extensions for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package epiphany-extensions for openSUSE:Factory checked in at 2012-03-02 13:47:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/epiphany-extensions (Old) and /work/SRC/openSUSE:Factory/.epiphany-extensions.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "epiphany-extensions", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/epiphany-extensions/epiphany-extensions.changes 2012-01-09 12:03:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.epiphany-extensions.new/epiphany-extensions.changes 2012-03-02 13:47:36.000000000 +0100 @@ -1,0 +2,20 @@ +Tue Feb 28 10:38:11 UTC 2012 - vuntz(a)opensuse.org + +- Add epiphany-extensions-fix-help.patch: fix installation of help + files, so we don't break the build of bundle-lang-gnome-extras. + +------------------------------------------------------------------- +Sat Feb 25 20:42:02 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.90: + + Completely new AdBlocker extension + + Updated all extensions for API and UI changes in Epiphany + + Disable certificates extension, it uses XUL and nobody had + noticed + + Default to xz compression + + Updated translations. +- Drop epiphany-extensions-ephy-3.3.patch: fixed upstream. +- Remove gnome-common BuildRequires and call to gnome-autogen.sh, + as they were only needed for the patch above. + +------------------------------------------------------------------- Old: ---- epiphany-extensions-3.2.0.tar.bz2 epiphany-extensions-ephy-3.3.patch New: ---- epiphany-extensions-3.3.90.tar.xz epiphany-extensions-fix-help.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ epiphany-extensions.spec ++++++ --- /var/tmp/diff_new_pack.iXmcu4/_old 2012-03-02 13:47:38.000000000 +0100 +++ /var/tmp/diff_new_pack.iXmcu4/_new 2012-03-02 13:47:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package epiphany-extensions # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,24 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: epiphany-extensions -Version: 3.2.0 +Version: 3.3.90 Release: 0 Summary: Extensions Collection for Epiphany License: GPL-2.0+ ; LGPL-2.1+ Group: Productivity/Networking/Web/Browsers Url: http://www.gnome.org/projects/epiphany/ -Source: http://download.gnome.org/sources/epiphany-extensions/3.2/%{name}-%{version… -# PATCH-FIX-UPSTREAM epiphany-extensions-ephy-3.3.patch vuntz(a)opensuse.org -- Build against ephy 3.3.x, taken from git -Patch0: epiphany-extensions-ephy-3.3.patch +Source: http://download.gnome.org/sources/epiphany-extensions/3.3/%{name}-%{version… +# PATCH-FIX-UPSTREAM epiphany-extensions-fix-help.patch bgo#670958 vuntz(a)opensuse.org -- Don't install broken symlink in help files +Patch0: epiphany-extensions-fix-help.patch %define api_version %(pkg-config --variable extensionsdir %{_libdir}/pkgconfig/epiphany-*.pc | sed "s,^%{_libdir}/epiphany/,,;s,/extensions$,,") BuildRequires: dbus-1-glib-devel BuildRequires: epiphany BuildRequires: epiphany-devel >= 3.2 BuildRequires: fdupes BuildRequires: gcc-c++ -# needed for patch0 -BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel BuildRequires: intltool BuildRequires: libwebkitgtk3-devel @@ -57,8 +56,6 @@ %patch0 -p1 %build -# needed for patch0 -NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-static \ --enable-compile-warnings=yes \ @@ -91,7 +88,7 @@ %dir %{_datadir}/omf/%{name}/ %doc %{_datadir}/omf/%{name}/%{name}-C.omf %{_datadir}/epiphany-extensions/ -%{_datadir}/epiphany/icons/hicolor/*/status/*.* +%{_datadir}/epiphany/icons/ %{_datadir}/glib-2.0/schemas/org.gnome.epiphanyextensions.gschema.xml %{_libdir}/epiphany/%{api_version}/extensions/*.ephy-extension %{_libdir}/epiphany/%{api_version}/extensions/*.so ++++++ epiphany-extensions-fix-help.patch ++++++ commit 326209a2dc3a7aea0f5ef2cfc9c7ecd3055e8674 Author: Vincent Untz <vuntz(a)gnome.org> Date: Tue Feb 28 11:35:28 2012 +0100 help: Stop referencing figures/epi-ext-adblocker.png file It got removed with the move to the new adblocker extension. https://bugzilla.gnome.org/show_bug.cgi?id=670958 Index: epiphany-extensions-3.3.90/help/Makefile.am =================================================================== --- epiphany-extensions-3.3.90.orig/help/Makefile.am +++ epiphany-extensions-3.3.90/help/Makefile.am @@ -6,7 +6,6 @@ DOC_INCLUDES = DOC_FIGURES = \ figures/epi-ext-action-create.png \ figures/epi-ext-actions-use.png \ - figures/epi-ext-adblocker.png \ figures/epi-ext-gestures-back.png \ figures/epi-ext-gestures-close.png \ figures/epi-ext-gestures-close-2.png \ Index: epiphany-extensions-3.3.90/help/Makefile.in =================================================================== --- epiphany-extensions-3.3.90.orig/help/Makefile.in +++ epiphany-extensions-3.3.90/help/Makefile.in @@ -378,7 +378,6 @@ DOC_INCLUDES = DOC_FIGURES = \ figures/epi-ext-action-create.png \ figures/epi-ext-actions-use.png \ - figures/epi-ext-adblocker.png \ figures/epi-ext-gestures-back.png \ figures/epi-ext-gestures-close.png \ figures/epi-ext-gestures-close-2.png \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit epiphany for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package epiphany for openSUSE:Factory checked in at 2012-03-02 13:47:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/epiphany (Old) and /work/SRC/openSUSE:Factory/.epiphany.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "epiphany", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/epiphany/epiphany.changes 2012-02-21 12:18:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.epiphany.new/epiphany.changes 2012-03-02 13:47:32.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Feb 22 07:07:12 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.90: + + Enable accelerators in the supermenu (bgo#668325) + + Use the symbolic icon for the clear action in the search entry + (bgo#669131) + + Convert web application names to the proper encoding before + saving them (bgo#658028) + + Make the global menu work in private mode too (bgo#669740) + + Several fixes for the web inspector (bgo#669835) + + Other bugfixes and cleanups + +------------------------------------------------------------------- Old: ---- epiphany-3.3.5.tar.xz New: ---- epiphany-3.3.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ epiphany.spec ++++++ --- /var/tmp/diff_new_pack.DMcIVe/_old 2012-03-02 13:47:34.000000000 +0100 +++ /var/tmp/diff_new_pack.DMcIVe/_new 2012-03-02 13:47:34.000000000 +0100 @@ -17,7 +17,7 @@ Name: epiphany -Version: 3.3.5 +Version: 3.3.90 Release: 0 Summary: GNOME Web Browser License: GPL-2.0+ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit eog-plugins for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package eog-plugins for openSUSE:Factory checked in at 2012-03-02 13:47:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eog-plugins (Old) and /work/SRC/openSUSE:Factory/.eog-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "eog-plugins", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/eog-plugins/eog-plugins.changes 2012-02-16 12:19:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.eog-plugins.new/eog-plugins.changes 2012-03-02 13:47:26.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Feb 21 08:29:00 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.90: + + Fullscreen Background: + - Various code improvements + + Python Console: + - Import latest code from gedit's Python Console plugin + - Coding style improvements + + Slideshow Shuffle: + - Code improvements + + Updated translations. +- Add pkgconfig(gsettings-desktop-schemas) BuildRequires: new + dependency for pythonconsole plugin. + +------------------------------------------------------------------- Old: ---- eog-plugins-3.3.5.tar.xz New: ---- eog-plugins-3.3.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eog-plugins.spec ++++++ --- /var/tmp/diff_new_pack.8f4iKu/_old 2012-03-02 13:47:27.000000000 +0100 +++ /var/tmp/diff_new_pack.8f4iKu/_new 2012-03-02 13:47:27.000000000 +0100 @@ -17,7 +17,7 @@ Name: eog-plugins -Version: 3.3.5 +Version: 3.3.90 Release: 0 #FIXME: add postr BuildRequires when we have a package Summary: A collection of plugins for Eye of GNOME @@ -30,7 +30,8 @@ BuildRequires: translation-update-upstream BuildRequires: pkgconfig(champlain-gtk-0.12) >= 0.9.0 BuildRequires: pkgconfig(clutter-gtk-1.0) >= 1.1.2 -BuildRequires: pkgconfig(eog) +BuildRequires: pkgconfig(eog) >= 3.3.6 +BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libexif) >= 0.6.16 BuildRequires: pkgconfig(libgdata) @@ -76,7 +77,6 @@ %{_libdir}/eog/plugins/exif-display.plugin %{_libdir}/eog/plugins/fit-to-width.plugin %{_libdir}/eog/plugins/fullscreenbg.plugin -%{_libdir}/eog/plugins/fullscreenbg/ %{_libdir}/eog/plugins/map.plugin %{_libdir}/eog/plugins/postasa.plugin %{_libdir}/eog/plugins/pythonconsole.plugin @@ -84,9 +84,12 @@ %{_libdir}/eog/plugins/slideshowshuffle.plugin %dir %{_datadir}/eog/plugins %{_datadir}/eog/plugins/exif-display/ +%{_datadir}/eog/plugins/fullscreenbg/ %{_datadir}/eog/plugins/postasa/ +%{_datadir}/eog/plugins/pythonconsole/ %{_datadir}/glib-2.0/schemas/org.gnome.eog.plugins.exif-display.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.eog.plugins.fullscreenbg.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.eog.plugins.pythonconsole.gschema.xml %files lang -f %{name}.lang -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit e3 for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package e3 for openSUSE:Factory checked in at 2012-03-02 13:47:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/e3 (Old) and /work/SRC/openSUSE:Factory/.e3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "e3", Maintainer is "Stephan.Barth(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/e3/e3.changes 2011-10-02 09:57:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.e3.new/e3.changes 2012-03-02 13:47:22.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 29 15:54:35 UTC 2012 - dvaleev(a)suse.com + +- Fix build for ppc, add ppc ppc64 to arch declerations + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ e3.spec ++++++ --- /var/tmp/diff_new_pack.26WMVa/_old 2012-03-02 13:47:24.000000000 +0100 +++ /var/tmp/diff_new_pack.26WMVa/_new 2012-03-02 13:47:24.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package e3 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,16 +16,15 @@ # - Name: e3 BuildRequires: nasm Url: http://sites.google.com/site/e3editor/ Version: 2.8 -Release: 1 +Release: 0 Summary: Tiny Editor with Many Different Modes like Vi, Emacs, and Wordstar License: GPL-2.0+ -Source: %{name}-%{version}.tar.bz2 Group: Productivity/Editors/Other +Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -36,7 +35,7 @@ %setup %build -%ifnarch %ix86 x86_64 %arm +%ifnarch %ix86 x86_64 %arm ppc ppc64 cd e3c rm -f Makefile ln -sf Makefile.x86 Makefile @@ -46,7 +45,7 @@ %endif %install -%ifnarch %ix86 x86_64 %arm +%ifnarch %ix86 x86_64 %arm ppc ppc64 cd e3c %endif make -e PREFIX=%buildroot/%_prefix MANDIR=$RPM_BUILD_ROOT%_mandir/man'$(MANSEC)' install @@ -58,7 +57,7 @@ %doc COPYING.GPL COPYRIGHT ChangeLog README /usr/bin/e3* %_mandir/man1/e3*.1.gz -%ifnarch %ix86 x86_64 %arm +%ifnarch %ix86 x86_64 %arm ppc ppc64 /usr/lib/e3* %endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit clutter-gst for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package clutter-gst for openSUSE:Factory checked in at 2012-03-02 13:47:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clutter-gst (Old) and /work/SRC/openSUSE:Factory/.clutter-gst.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "clutter-gst", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/clutter-gst/clutter-gst.changes 2012-01-25 12:18:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.clutter-gst.new/clutter-gst.changes 2012-03-02 13:47:20.000000000 +0100 @@ -1,0 +2,27 @@ +Thu Feb 23 19:35:47 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 1.5.4: + + Fix compilation with cogl 1.9.x + +------------------------------------------------------------------- +Sat Feb 11 13:07:29 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 1.5.2: + + Add a standalone gstreamer plugin. Clutter-gst gstreamer + elements are now available just like any other GStreamer + element, that includes working with gst-launch. + + Add support for video/x-surface ("hardware" surfaces) that can + be converted to opengl textures. (Requires -bad 0.10.22.1) + + Addition of a new element, autocluttersink, a bin that picks up + clutter-compatible sinks automatically. This allows an + eco-system of 3rd party decoders and (clutter) sinks to be + autoplugged. + + Various small fixes. +- Split new subpackage gstreamer-0_10-plugin-gstclutter: + + it contains the new gstreamer plugin. + + add to it a Supplements for gstreamer-0_10 and + libclutter-gst-1_0-0, so users of both those packages will get + it installed automatically. + + add it as Requires to the devel subpackage. + +------------------------------------------------------------------- Old: ---- clutter-gst-1.4.6.tar.xz New: ---- clutter-gst-1.5.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clutter-gst.spec ++++++ --- /var/tmp/diff_new_pack.9XuAAq/_old 2012-03-02 13:47:22.000000000 +0100 +++ /var/tmp/diff_new_pack.9XuAAq/_new 2012-03-02 13:47:22.000000000 +0100 @@ -17,20 +17,21 @@ Name: clutter-gst -Version: 1.4.6 +Version: 1.5.4 Release: 0 +# FIXME: Add pkgconfig(gstreamer-basevideo-0.10) >= 0.10.22.1 once we have gstreamer-plugins-bad providing this. It adds support for Add support for video/x-surface. Url: http://clutter-project.org/ Summary: GStreamer integration for Clutter License: LGPL-2.1+ Group: System/Libraries -Source0: http://download.gnome.org/sources/clutter-gst/1.4/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/clutter-gst/1.5/%{name}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: gobject-introspection-devel BuildRequires: gstreamer-0_10-devel >= 0.10.26 BuildRequires: gstreamer-0_10-plugins-base-devel # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 BuildRequires: xz -BuildRequires: pkgconfig(clutter-1.0) >= 1.4.0 +BuildRequires: pkgconfig(clutter-1.0) >= 1.6.0 BuildRequires: pkgconfig(cogl-1.0) >= 1.8.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libclutter-gst-1_0-0 = %{version}-%{release} @@ -64,9 +65,22 @@ This package provides the GObject Introspection bindings for Clutter GStreamer. +%package -n gstreamer-0_10-plugin-gstclutter +Summary: GStreamer Clutter Plug-In +Group: Productivity/Multimedia/Other +Supplements: packageand(gstreamer-0_10:libclutter-gst-1_0-0) + +%description -n gstreamer-0_10-plugin-gstclutter +Clutter is an open source software library for creating fast, visually +rich and animated graphical user interfaces. + +This plug-in for GStreamer contains elements to render to Clutter +textures. + %package devel Summary: GStreamer integration for Clutter Group: Development/Libraries/C and C++ +Requires: gstreamer-0_10-plugin-gstclutter = %{version} Requires: libclutter-gst-1_0-0 = %{version} Requires: typelib-1_0-ClutterGst-1_0 = %{version} Provides: clutter-doc = %{version} @@ -87,7 +101,7 @@ %install %makeinstall -rm -f %{buildroot}%{_libdir}/*.la +find %{buildroot}%{_libdir} -name '*.la' -delete -print %check make %{?_smp_mflags} check @@ -105,6 +119,10 @@ %defattr(-,root,root) %{_libdir}/girepository-1.0/ClutterGst-1.0.typelib +%files -n gstreamer-0_10-plugin-gstclutter +%defattr(-,root,root) +%{_libdir}/gstreamer-0.10/libgstclutter.so + %files devel %defattr(-,root,root) %{_libdir}/*.so -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit clutter for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package clutter for openSUSE:Factory checked in at 2012-03-02 13:47:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clutter (Old) and /work/SRC/openSUSE:Factory/.clutter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "clutter", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/clutter/clutter.changes 2012-02-16 16:12:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.clutter.new/clutter.changes 2012-03-02 13:47:17.000000000 +0100 @@ -1,0 +2,21 @@ +Thu Feb 23 12:45:52 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 1.9.12: + + Add ClutterTimeline:repeat-count and deprecate :loop + + Add a progress mode for ClutterTimeline + + Fix ClutterBoxLayout allocation + + Improve the performance of the shader-based effect in Clutter + + Update the internal usage of Cogl API + + Allow accessing Wayland input devices + + Add a convenience CLUTTER_BIND_ALL enumeration + + Cally updates + + Visual Studio project updates + + Add clutter_text_coords_to_position() + + Documentation updates. + + Introspection annotation fixes. + + Bugs fixed: bgo#669730, bgo#669291, bgo#667540, bgo#670433, + bgo#670402, bco#2515. +- Add pkgconfig(gdk-3.0) BuildRequires so that we also build the + GDK backend. + +------------------------------------------------------------------- Old: ---- clutter-1.9.10.tar.xz New: ---- clutter-1.9.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clutter.spec ++++++ --- /var/tmp/diff_new_pack.NjmvZo/_old 2012-03-02 13:47:20.000000000 +0100 +++ /var/tmp/diff_new_pack.NjmvZo/_new 2012-03-02 13:47:20.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: clutter -Version: 1.9.10 +Version: 1.9.12 Release: 0 Summary: The clutter library License: LGPL-2.1+ @@ -28,7 +29,8 @@ BuildRequires: xmlto BuildRequires: pkgconfig(atk) >= 2.1.5 BuildRequires: pkgconfig(cairo) -BuildRequires: pkgconfig(cogl-1.0) >= 1.9.4 +BuildRequires: pkgconfig(cogl-1.0) >= 1.9.6 +BuildRequires: pkgconfig(gdk-3.0) >= 3.0.0 BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(gobject-2.0) >= 2.31.10 BuildRequires: pkgconfig(gobject-introspection-1.0) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bwidget for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package bwidget for openSUSE:Factory checked in at 2012-03-02 13:47:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bwidget (Old) and /work/SRC/openSUSE:Factory/.bwidget.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bwidget", Maintainer is "max(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/bwidget/bwidget.changes 2011-09-26 17:01:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bwidget.new/bwidget.changes 2012-03-02 13:47:06.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Feb 29 06:53:44 UTC 2012 - gschlotter(a)suse.com + +- Upgrade to version 1.9.5. +- /images/CVS/ doesn't exist in this version +- source name changed to bwidget from BWidget +- included dos2unix to erease an error from a txt file + + +------------------------------------------------------------------- Old: ---- BWidget-1.9.0.tar.bz2 New: ---- bwidget-1.9.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bwidget.spec ++++++ --- /var/tmp/diff_new_pack.zEKTSS/_old 2012-03-02 13:47:08.000000000 +0100 +++ /var/tmp/diff_new_pack.zEKTSS/_new 2012-03-02 13:47:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bwidget # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -19,15 +19,16 @@ Name: bwidget BuildRequires: tcl +BuildRequires: dos2unix License: BSD-3-Clause -Version: 1.9.0 +Version: 1.9.5 Release: 11 Summary: A Set of Megawidgets for Tcl/Tk Group: Development/Libraries/Tcl BuildArch: noarch Requires: tk BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: BWidget-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 %description Add useful and nice-looking widgets to your interfaces with the BWidget @@ -39,8 +40,9 @@ in pure Tcl/Tk. %prep -%setup -q -n BWidget-%version -rm -rf images/CVS +%setup -q -n %{name}-%version + +find . -name \*.txt -print0 | xargs -0 dos2unix %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit brp-extract-appdata for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package brp-extract-appdata for openSUSE:Factory checked in at 2012-03-02 13:46:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/brp-extract-appdata (Old) and /work/SRC/openSUSE:Factory/.brp-extract-appdata.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "brp-extract-appdata", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/brp-extract-appdata/brp-extract-appdata.changes 2012-02-22 16:07:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.brp-extract-appdata.new/brp-extract-appdata.changes 2012-03-02 13:47:02.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 1 11:15:36 UTC 2012 - coolo(a)suse.com + +- make the brp script a perl script too and let it find icons + +------------------------------------------------------------------- Old: ---- brp-extract-appdata.sh New: ---- brp-extract-appdata.pl ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ brp-extract-appdata.spec ++++++ --- /var/tmp/diff_new_pack.ZGwhBi/_old 2012-03-02 13:47:04.000000000 +0100 +++ /var/tmp/diff_new_pack.ZGwhBi/_new 2012-03-02 13:47:04.000000000 +0100 @@ -23,7 +23,7 @@ License: MIT Group: Development/Tools/Building BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %{name}.sh +Source0: %{name}.pl Source1: create-appdata-xml.pl BuildArch: noarch ++++++ brp-extract-appdata.pl ++++++ #! /usr/bin/perl # Copyright (c) 2012 Stephan Kulow, SUSE Linux Products GmbH # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the # "Software"), to deal in the Software without restriction, including # without limitation the rights to use, copy, modify, merge, publish, # distribute, sublicense, and/or sell copies of the Software, and to # permit persons to whom the Software is furnished to do so, subject to # the following conditions: # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # # find files and extract them for later processing # use File::Basename; use File::Find; use MIME::Base64; my $basedir=dirname($ENV{'RPM_SOURCE_DIR'}) . "/OTHER"; my $outputfile = "$basedir/$ENV{'RPM_PACKAGE_NAME'}.applications"; if (! -f "/.buildenv") { # this looks fishy, skip it print "WARNING: I better not trim without a /.buildenv around\n"; exit(0); } if (! -w "$basedir") { print "WARNING: Can't write to $BASEDIR, skipping\n"; exit(0); } open(OUTPUT, '>', $outputfile); chdir("/" . $ENV{'RPM_BUILD_ROOT'}); my @icondirs; for my $prefix (qw{/usr /opt/kde3 usr opt/kde3}) { for my $suffix (qw{pixmaps icons/hicolor icons/crystalsvg icons/gnome}) { push(@icondirs, "$prefix/share/$suffix"); } } find(\&wanted, "usr/share/applications/"); my @icons; sub wanted { return unless $_ =~ /\.desktop$/; print OUTPUT "<</$File::Find::name>>\n"; open(DESKTOP, $_) or return; while ( <DESKTOP> ) { if ($_ =~ /^Icon=(.*)$/) { push(@icons, $1); } print OUTPUT $_; } close(DESKTOP); } our $icon; sub outputicon { return unless ($_ =~ /^$icon\.(png|svg|svgz|xpm)$/); open(my $icon, '<', $_) or return; my $content = do { local $/; <$icon> }; close($icon); my $fname = $File::Find::name; $fname = "/$fname" unless $fname =~ m,^/,; print OUTPUT "<<$fname>>\n"; print OUTPUT encode_base64($content) . "\n"; } for $icon (@icons) { find(\&outputicon, @icondirs); } close(OUTPUT); ++++++ create-appdata-xml.pl ++++++ --- /var/tmp/diff_new_pack.ZGwhBi/_old 2012-03-02 13:47:04.000000000 +0100 +++ /var/tmp/diff_new_pack.ZGwhBi/_new 2012-03-02 13:47:04.000000000 +0100 @@ -35,6 +35,7 @@ my $currentfile = ''; my $indesktopentry = 0; my %apphash; +my %fullfiles; while ( <APPDATA> ) { chomp; @@ -49,7 +50,10 @@ print "ERROR: haven't seen a file before $_\n"; exit 0; } - + + my $content = $fullfiles{$currentfile} || ''; + $fullfiles{$currentfile} = $content . $_; + if (m/^\[Desktop Entry\]\s*$/) { if ($indesktopentry) { print "ERROR: 2 desktop entries? I'm out\n"; @@ -81,6 +85,7 @@ open (URL, "chroot $build_root rpm -qp --qf '%{URL}' $rpm|"); chomp(my $url = <URL>); close URL; + $url = undef if $url eq '(none)'; # ignore empty rpm as rpmlint will catch them @files = grep {!/^$none$/} @files; for my $file (@files) { @@ -104,7 +109,8 @@ my $applications_output = 0; - while (my ($file, $hash) = each(%apphash)) { + for my $file (sort keys %apphash) { + my $hash = $apphash{$file}; next if (($hash->{nodisplay} || '') =~ m,true,i); next if ($hash->{pkgname} ne $rpmname); $applications_output++; @@ -126,7 +132,16 @@ print APPDATA " </keywords>\n"; } if ($hash->{icon}) { - print APPDATA " <icon type='local'>" . _e($hash->{icon}) . "</icon>\n"; + print APPDATA " <icon type='embedded'>\n"; + print APPDATA " <name>" . _e($hash->{icon}) . "</name>\n"; + for my $ifile (sort keys %fullfiles) { + if ($ifile =~ m,$hash->{icon}\.(png|svg|svgz|xpm)$,) { + print APPDATA " <filecontent file='$ifile'>\n"; + print APPDATA $fullfiles{$ifile}; + print APPDATA " </filecontent>\n"; + } + } + print APPDATA " </icon>\n"; } print APPDATA " <appcategories>\n"; for my $keyword (split(/\s*;\s*/, $hash->{categories})) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit arpwatch-ethercodes for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package arpwatch-ethercodes for openSUSE:Factory checked in at 2012-03-02 13:46:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arpwatch-ethercodes (Old) and /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "arpwatch-ethercodes", Maintainer is "draht(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/arpwatch-ethercodes/arpwatch-ethercodes.changes 2012-02-29 14:05:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.arpwatch-ethercodes.new/arpwatch-ethercodes.changes 2012-03-02 13:46:57.000000000 +0100 @@ -2 +2 @@ -Wed Feb 29 09:40:15 CET 2012 - autobuild(a)suse.de +Fri Mar 2 07:40:11 CET 2012 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2012-02-29 +- automated update on 2012-03-02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch-ethercodes.spec ++++++ --- /var/tmp/diff_new_pack.bMrSh8/_old 2012-03-02 13:46:59.000000000 +0100 +++ /var/tmp/diff_new_pack.bMrSh8/_new 2012-03-02 13:46:59.000000000 +0100 @@ -23,7 +23,7 @@ License: BSD-3-Clause Group: Productivity/Networking/Diagnostic Summary: Ethercodes Data for arpwatch -Version: 2012.2.29 +Version: 2012.3.2 Release: 1 Source0: http://standards.ieee.org/regauth/oui/oui.txt BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ oui.txt ++++++ --- /var/tmp/diff_new_pack.bMrSh8/_old 2012-03-02 13:46:59.000000000 +0100 +++ /var/tmp/diff_new_pack.bMrSh8/_new 2012-03-02 13:46:59.000000000 +0100 @@ -39766,11 +39766,10 @@ PALAISEAU ESSONNE 91120 FRANCE -00-18-80 (hex) Maxim Integrated Circuits -001880 (base 16) Maxim Integrated Circuits - 2900 Lakeside Drive - Suite 100 - Santa Clara CA 95054 +00-18-80 (hex) Maxim Integrated Products +001880 (base 16) Maxim Integrated Products + 120 San Gabriel Dr. + Sunnyvale CA 94086 UNITED STATES 00-18-81 (hex) Buyang Electronics Industrial Co., Ltd @@ -82067,6 +82066,12 @@ Terwispel Friesland 8407ED NETHERLANDS +0C-13-0B (hex) Uniqoteq Ltd. +0C130B (base 16) Uniqoteq Ltd. + Lemminkaisenkatu 14-18 A + Turku 20520 + FINLAND + 0C-15-C5 (hex) SDTEC Co., Ltd. 0C15C5 (base 16) SDTEC Co., Ltd. 167, Churye-2Dong, Sasang-Gu, @@ -82652,6 +82657,12 @@ Seoul Korea 138-160 KOREA, REPUBLIC OF +10-BF-48 (hex) ASUSTEK COMPUTER INC. +10BF48 (base 16) ASUSTEK COMPUTER INC. + 15,LI-TE RD.,PEITOU + TAIPEI TAIWAN 112 + TAIWAN, REPUBLIC OF CHINA + 10-C2-BA (hex) UTT Co., Ltd. 10C2BA (base 16) UTT Co., Ltd. 4F, Hyun Bldg @@ -83535,6 +83546,12 @@ MISSISSAUGA ON. L5N 5Z2 CANADA +1C-97-3D (hex) PRICOM Design +1C973D (base 16) PRICOM Design + 2755 Slocum Rd + Peyton CO 80831 + UNITED STATES + 1C-AA-07 (hex) Cisco Systems 1CAA07 (base 16) Cisco Systems 80 West Tasman Dr. @@ -84698,6 +84715,13 @@ Gumi Gyeongbuk 730-350 KOREA, REPUBLIC OF +2C-54-2D (hex) Cisco Systems +2C542D (base 16) Cisco Systems + 80 West Tasman Dr. + SJCM1-1 + San Jose CA 95134 + UNITED STATES + 2C-67-FB (hex) ShenZhen Zhengjili Electronics Co., LTD 2C67FB (base 16) ShenZhen Zhengjili Electronics Co., LTD The Longhua Town Shenzhen City Streets huaning three house Science Park Road Chiayi Source fifth floor @@ -85759,6 +85783,12 @@ HINO-SHI TOKYO 191-0022 JAPAN +3C-36-3D (hex) Nokia Corporation +3C363D (base 16) Nokia Corporation + Yrttipellontie 6 + Oulu 90230 + FINLAND + 3C-38-88 (hex) ConnectQuest, llc 3C3888 (base 16) ConnectQuest, llc P.O. Box 425 @@ -85910,6 +85940,13 @@ Yokneam 20692 ISRAEL +3C-A9-F4 (hex) Intel Corporate +3CA9F4 (base 16) Intel Corporate + Lot 8, Jalan Hi-Tech 2/3 + Kulim Hi-Tech Park + Kulim Kedah 09000 + MALAYSIA + 3C-B1-5B (hex) Avaya, Inc 3CB15B (base 16) Avaya, Inc 211 Mount Airy Road @@ -90059,6 +90096,13 @@ Seongnam-Si 463-816 KOREA, REPUBLIC OF +70-9E-86 (hex) X6D Limited +709E86 (base 16) X6D Limited + 199, Arch. Makariou III + Neocleous House + Limassol 3030 + CYPRUS + 70-A1-91 (hex) Trendsetter Medical, LLC 70A191 (base 16) Trendsetter Medical, LLC 2030 Ardmore BLVD @@ -91249,6 +91293,13 @@ Taipei 100 TAIWAN, REPUBLIC OF CHINA +80-00-0B (hex) Intel Corporate +80000B (base 16) Intel Corporate + Lot 8, Jalan Hi-Tech 2/3 + Kulim Hi-Tech Park + Kulim Kedah 09000 + MALAYSIA + 80-00-10 (hex) ATT BELL LABORATORIES 800010 (base 16) ATT BELL LABORATORIES 1100 EAST WARRENVILLE ROAD @@ -92954,6 +93005,12 @@ SAO PAULO 05509002 BRAZIL +94-61-24 (hex) Pason Systems +946124 (base 16) Pason Systems + 6130 - 3rd Street S.E. + Calgary Alberta T2H1K4 + CANADA + 94-63-D1 (hex) Samsung Electronics Co.,Ltd 9463D1 (base 16) Samsung Electronics Co.,Ltd #94-1, Imsoo-Dong @@ -94118,6 +94175,12 @@ Kanata On K2K 2E1 CANADA +A0-F4-19 (hex) Nokia Corporation +A0F419 (base 16) Nokia Corporation + Yrttipellontie 6 + Oulu 90230 + FINLAND + A4-01-30 (hex) ABIsystems Co., LTD A40130 (base 16) ABIsystems Co., LTD 308 ACE Techno Tower8 191-7 Guro-dong @@ -94816,6 +94879,12 @@ HANGZHOU ZHEJIANG 310012 CHINA +AC-3F-A4 (hex) TAIYO YUDEN CO.,LTD +AC3FA4 (base 16) TAIYO YUDEN CO.,LTD + 8-1, Sakae-cho + Takasaki-shi Gunma 370-8522 + JAPAN + AC-44-F2 (hex) Revolabs Inc AC44F2 (base 16) Revolabs Inc 63 Great Rd @@ -96076,6 +96145,13 @@ Dallas TX 75243 UNITED STATES +BC-02-00 (hex) Stewart Audio +BC0200 (base 16) Stewart Audio + 100 West El Camino Real + Suite 72 + Mountain View CA 94041 + UNITED STATES + BC-05-43 (hex) AVM GmbH BC0543 (base 16) AVM GmbH Alt-Moabit 95 @@ -100835,6 +100911,13 @@ Boulder Colorado 80302 UNITED STATES +F4-7F-35 (hex) Cisco Systems +F47F35 (base 16) Cisco Systems + 80 West Tasman Dr. + SJCM1-1 + San Jose CA 95134 + UNITED STATES + F4-87-71 (hex) Infoblox F48771 (base 16) Infoblox 4750 Patrick Henry Drive -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apcupsd for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package apcupsd for openSUSE:Factory checked in at 2012-03-02 13:46:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apcupsd (Old) and /work/SRC/openSUSE:Factory/.apcupsd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apcupsd", Maintainer is "sbrabec(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes 2012-02-08 17:17:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2012-03-02 13:46:51.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 1 20:26:01 UTC 2012 - aj(a)suse.de + +- Buildrequire xorg-x11-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apcupsd.spec ++++++ --- /var/tmp/diff_new_pack.OM4KlC/_old 2012-03-02 13:46:53.000000000 +0100 +++ /var/tmp/diff_new_pack.OM4KlC/_new 2012-03-02 13:46:53.000000000 +0100 @@ -33,6 +33,7 @@ BuildRequires: tcpd-devel BuildRequires: update-desktop-files BuildRequires: automake +BuildRequires: xorg-x11-devel %if 0%{?suse_version} < 1210 BuildRequires: sysvinit %else @@ -70,7 +71,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define apache_serverroot %(/usr/sbin/apxs2 -q datadir 2>/dev/null || /usr/sbin/apxs -q PREFIX) - %description Controls and monitors the status of an APC UPS under Linux. Allows your computer or server to run for a specified length of time on UPS power @@ -82,12 +82,10 @@ %package gui - Summary: APC UPS Monitor GUI (for APC UPSs) Group: Hardware/UPS Requires: %{name} = %{version} - %description gui Controls and monitors the status of an APC UPS under Linux. Allows your computer or server to run for a specified length of time on UPS power @@ -119,7 +117,6 @@ %patch10 -p1 %patch11 - %build # Incomplete: #cd autoconf @@ -147,7 +144,6 @@ --with-cgi-bin=%{apache_serverroot}/cgi-bin make %{?_smp_mflags} - %install %makeinstall mkdir -p $RPM_BUILD_ROOT/sbin @@ -170,7 +166,6 @@ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates cp apcupsd.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.apcupsd - %post %{fillup_and_insserv apcupsd} # HALT_POWERDOWN_INSERT is supported since SuSE Linux 10.1, SLES 10. @@ -194,11 +189,9 @@ fi fi - %preun %{stop_on_removal apcupsd} - %postun # Remove HALT_POWERDOWN_INSERT if test $1 -eq 0 -a ! -f /etc/init.d/apcupsd ; then @@ -216,7 +209,6 @@ %{restart_on_update apcupsd} %{insserv_cleanup} - %files %defattr(-,root,root) %doc apcupsd-early-powerdown COPYING ChangeLog* DISCLAIMER Developers INSTALL README.SUSE ReleaseNotes examples/ @@ -253,13 +245,10 @@ %doc %{_mandir}/man?/*.* /var/adm/fillup-templates/sysconfig.* - %files gui %defattr(-,root,root) %{_bindir}/gapcmon %{_datadir}/applications/gapcmon.desktop %{_datadir}/pixmaps/*.png - - %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alsa-tools for openSUSE:Factory
by root＠hilbert.suse.de 02 Mar '12

02 Mar '12

Hello community, here is the log from the commit of package alsa-tools for openSUSE:Factory checked in at 2012-03-02 13:46:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-tools (Old) and /work/SRC/openSUSE:Factory/.alsa-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alsa-tools", Maintainer is "tiwai(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-tools/alsa-tools.changes 2012-01-27 15:16:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.alsa-tools.new/alsa-tools.changes 2012-03-02 13:46:45.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 1 20:23:35 UTC 2012 - aj(a)suse.de + +- Add BuildRequires on xorg-x11-devel. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-tools.spec ++++++ --- /var/tmp/diff_new_pack.I61AI7/_old 2012-03-02 13:46:48.000000000 +0100 +++ /var/tmp/diff_new_pack.I61AI7/_new 2012-03-02 13:46:48.000000000 +0100 @@ -16,6 +16,7 @@ # + Name: alsa-tools BuildRequires: alsa-devel BuildRequires: fdupes @@ -24,6 +25,7 @@ BuildRequires: gtk2-devel BuildRequires: libtool BuildRequires: update-desktop-files +BuildRequires: xorg-x11-devel %define package_version 1.0.25 Url: http://www.alsa-project.org/ Summary: Various ALSA Tools -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xmlstarlet for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package xmlstarlet for openSUSE:Factory checked in at 2012-03-01 17:28:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmlstarlet (Old) and /work/SRC/openSUSE:Factory/.xmlstarlet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xmlstarlet", Maintainer is "Thomas.Schraitle(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xmlstarlet/xmlstarlet.changes 2011-10-03 09:25:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmlstarlet.new/xmlstarlet.changes 2012-03-01 17:28:40.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 21 11:27:45 UTC 2012 - pascal.bleser(a)opensuse.org + +- update to 1.3.1: + * handle multiple values for --value-of properly (sf#2563866) + * substitute external entities (sf#3467320) + * pyx output needs space between attribute name and value (sf#3440797) + +------------------------------------------------------------------- Old: ---- xmlstarlet-1.3.0.tar.bz2 New: ---- xmlstarlet-1.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlstarlet.spec ++++++ --- /var/tmp/diff_new_pack.G8tC6I/_old 2012-03-01 17:28:42.000000000 +0100 +++ /var/tmp/diff_new_pack.G8tC6I/_new 2012-03-01 17:28:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xmlstarlet # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: xmlstarlet @@ -24,12 +23,11 @@ BuildRequires: sgml-skel BuildRequires: autoconf automake gcc glibc-devel libtool pkgconfig Summary: Command Line Tool to Process XML Documents -Version: 1.3.0 +Version: 1.3.1 Release: 1 License: MIT Group: Productivity/Publishing/XML -# http://prdownloads.sourceforge.net/xmlstar/xmlstarlet-%{version}.tar.gz -Source0: xmlstarlet-%{version}.tar.bz2 +Source: http://prdownloads.sourceforge.net/xmlstar/xmlstarlet-%{version}.tar.gz Source1: %{name}-rpmlintrc Patch2: %{name}-xml_depyx.c.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,23 +39,16 @@ simple set of shell commands in similar way it is done for plain text files using 'grep', 'sed', 'awk', 'tr', 'diff', or 'patch'. - - -Authors: --------- - Mikhail Grushinskiy <mgrouch(a)users.sourceforge.net> - %prep %setup -q %patch2 -#%patch3 %build export CFLAGS="$RPM_OPT_FLAGS -W -Wall" %configure \ --disable-static-libs -%__make %{?_smp_flags} +%__make %{?_smp_mflags} %__mkdir_p html %__cp -a doc/callouts html -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit turnpike for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package turnpike for openSUSE:Factory checked in at 2012-03-01 17:28:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/turnpike (Old) and /work/SRC/openSUSE:Factory/.turnpike.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "turnpike", Maintainer is "BiLi(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/turnpike/turnpike.changes 2011-09-23 12:49:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.turnpike.new/turnpike.changes 2012-03-01 17:28:34.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 22 06:29:59 UTC 2012 - bili(a)suse.com + +- Add turnpike-gmodule-and-unused-warning.patch to check gmodule. + Also fixing the build error for unused variant. + +------------------------------------------------------------------- New: ---- turnpike-gmodule-and-unused-warning.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ turnpike.spec ++++++ --- /var/tmp/diff_new_pack.VrOV39/_old 2012-03-01 17:28:40.000000000 +0100 +++ /var/tmp/diff_new_pack.VrOV39/_new 2012-03-01 17:28:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package turnpike # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -39,7 +39,8 @@ Requires: novell-ipsec-tools >= 0.7 PreReq: coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch: turnpike-0.1.2-missing-closedir.patch +Patch0: turnpike-0.1.2-missing-closedir.patch +Patch1: turnpike-gmodule-and-unused-warning.patch %description This package contains binaries for making use of ipsec-tools with a @@ -50,12 +51,14 @@ %prep %setup -q -%patch +%patch0 +%patch1 -p1 cp -v %{S:3} . # no point in having this in a package sed -i -e 's,-Werror,,' configure %build +autoreconf -f -i # fix build in disabling as-needed export SUSE_ASNEEDED=0 CFLAGS="$RPM_OPT_FLAGS" \ ++++++ turnpike-gmodule-and-unused-warning.patch ++++++ Index: turnpike-0.1.2/configure.ac =================================================================== --- turnpike-0.1.2.orig/configure.ac +++ turnpike-0.1.2/configure.ac @@ -108,6 +108,11 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) +dnl check for gmodule +PKG_CHECK_MODULES(GMODULE, gmodule-2.0) +AC_SUBST(GMODULE_CFLAGS) +AC_SUBST(GGMODULE_LIBS) + dnl check for libxml LIBXML_REQUIRED_VERSION=2.6.0 PKG_CHECK_MODULES(BASE_DEPENDENCIES, libxml-2.0 >= $LIBXML_REQUIRED_VERSION) Index: turnpike-0.1.2/VPNClient/vpnlogin/src/Makefile.am =================================================================== --- turnpike-0.1.2.orig/VPNClient/vpnlogin/src/Makefile.am +++ turnpike-0.1.2/VPNClient/vpnlogin/src/Makefile.am @@ -5,6 +5,7 @@ INCLUDES = \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ @LIBXML_CFLAGS@ \ @GTK_CFLAGS@ \ + @GMODULE_CFLAGS@ \ -I${top_srcdir}/ErrorGenerator/ \ -I${top_srcdir}/utility/ \ -I${top_srcdir}/VPNClient/vpnlogin/include \ @@ -29,7 +30,7 @@ vpnlogin_SOURCES = \ gui-hooks.c vpnlogin_LDFLAGS = -export-dynamic -vpnlogin_LDADD = $(INTLLIBS) -lcrypto ../../../ErrorGenerator/libErrorHandling.la ../../CommonUI/libCommonUI.la ../../../utility/libgetip.la @GTK_LIBS@ @LIBXML_LIBS@ +vpnlogin_LDADD = $(INTLLIBS) -lcrypto ../../../ErrorGenerator/libErrorHandling.la ../../CommonUI/libCommonUI.la ../../../utility/libgetip.la @GTK_LIBS@ @LIBXML_LIBS@ @GMODULE_LIBS@ #noinst_HEADERS=interface.h callbacks.h utility.h externs.h Index: turnpike-0.1.2/VPNClient/CommonUI/CommonUI.c =================================================================== --- turnpike-0.1.2.orig/VPNClient/CommonUI/CommonUI.c +++ turnpike-0.1.2/VPNClient/CommonUI/CommonUI.c @@ -1058,7 +1058,6 @@ int receiveEvents(Inf_t* Inf_pointer) size_t bufLen = 0; char sendBuf[1024]; comHeader_t *comHeader; - char *currptr; //extern int server_addr; //extern int source_addr; @@ -1069,7 +1068,6 @@ int receiveEvents(Inf_t* Inf_pointer) comHeader->ac_errno = 0; bufLen += sizeof(comHeader_t); - currptr = &sendBuf[bufLen]; comHeader->ac_len = bufLen; sendLen = send(Inf_pointer->eventsockfd, sendBuf,bufLen,0); @@ -2230,22 +2228,18 @@ int parse_profile_to_racoon_conf_buf(Inf { if ( cur_node->type == XML_ELEMENT_NODE ) { - int mode = -1, encalgo = -1, hashalgo = -1, dhgroup = -1, authmethod = -1; - if(strcmp((const char*)cur_node->name, "entry") == 0) { buffer= xmlGetProp(cur_node,(const xmlChar*)"mode"); if(buffer) { - mode = ph1ModeValue((char*)buffer); xmlFree(buffer); } buffer= xmlGetProp(cur_node,(const xmlChar*)"encalgo"); if(buffer) { - encalgo = ph1EncValue((char*)buffer); strcpy(enc, (const char*)buffer); xmlFree(buffer); } @@ -2253,7 +2247,6 @@ int parse_profile_to_racoon_conf_buf(Inf buffer= xmlGetProp(cur_node,(const xmlChar*)"hashalgo"); if(buffer) { - hashalgo = ph1HashValue((char*)buffer); strcpy(hash, (const char*)buffer); xmlFree(buffer); } @@ -2261,7 +2254,6 @@ int parse_profile_to_racoon_conf_buf(Inf buffer= xmlGetProp(cur_node,(const xmlChar*)"dhgroup"); if(buffer) { - dhgroup = ph1DhValue((char*)buffer); if(strcmp((const char*)buffer, "dh1") == 0) strcpy(dh, "1"); else @@ -2272,7 +2264,6 @@ int parse_profile_to_racoon_conf_buf(Inf buffer= xmlGetProp(cur_node,(const xmlChar*)"authmethod"); if(buffer) { - authmethod = ph1AuthValue((char*)buffer); if(strcmp((const char*)buffer, "X.509") == 0) strcpy(auth, "rsasig"); else @@ -2341,15 +2332,11 @@ int parse_profile_to_racoon_conf_buf(Inf { if ( cur_node->type == XML_ELEMENT_NODE ) { - int encalgo = -1, hashalgo = -1, dhgroup = -1; - if(strcmp((const char*)cur_node->name, "entry") == 0) { - buffer= xmlGetProp(cur_node,(const xmlChar*)"encalgo"); if(buffer) { - encalgo = ph2EncValue((char*)buffer); strcpy(ph2enc, (const char*)buffer); xmlFree(buffer); } @@ -2357,7 +2344,6 @@ int parse_profile_to_racoon_conf_buf(Inf buffer= xmlGetProp(cur_node,(const xmlChar*)"hashalgo"); if(buffer) { - hashalgo = ph2HashValue((char*)buffer); strcpy(ph2hash, (const char*)buffer); xmlFree(buffer); } @@ -2365,7 +2351,6 @@ int parse_profile_to_racoon_conf_buf(Inf buffer= xmlGetProp(cur_node,(const xmlChar*)"pfsgroup"); if(buffer) { - dhgroup = ph2DhValue((char*)buffer); strcpy(ph2pfs, (const char*)buffer); xmlFree(buffer); } Index: turnpike-0.1.2/VPNClient/vpnlogin/src/utility.c =================================================================== --- turnpike-0.1.2.orig/VPNClient/vpnlogin/src/utility.c +++ turnpike-0.1.2/VPNClient/vpnlogin/src/utility.c @@ -1072,7 +1072,7 @@ int writeCurrentProfileToFile() char fileName[256] = {0}; int i, len; - xmlNodePtr childptr, policyptr = NULL; + xmlNodePtr policyptr = NULL; xmlNodePtr root_node = NULL; xmlDocPtr doc; @@ -1131,7 +1131,7 @@ int writeCurrentProfileToFile() strcpy(vfile, VENDOR_PROFILE_PREFIX); strcat(vfile, profileName); strcat(vfile, ".prf"); - childptr=xmlNewTextChild(root,NULL,(const xmlChar *)"vendor",(const xmlChar *)vfile); + xmlNewTextChild(root,NULL,(const xmlChar *)"vendor",(const xmlChar *)vfile); strcpy(vfile, Inf.userHome); strcat(vfile, VENDOR_FILE); @@ -1150,10 +1150,10 @@ int writeCurrentProfileToFile() unloadmodule(); pmPluginActive = 0; } - childptr=xmlNewTextChild(root,NULL,(const xmlChar *)"gateway_ip",(const xmlChar *)gatewayip); - childptr=xmlNewTextChild(root,NULL,(const xmlChar *)"gateway_type",(const xmlChar *)gatewayType); + xmlNewTextChild(root,NULL,(const xmlChar *)"gateway_ip",(const xmlChar *)gatewayip); + xmlNewTextChild(root,NULL,(const xmlChar *)"gateway_type",(const xmlChar *)gatewayType); if(strcmp(authentication_type, "X.509 Certificate") == 0) - childptr=xmlNewTextChild(root,NULL,(const xmlChar *)"certificate",(const xmlChar *)cert); + xmlNewTextChild(root,NULL,(const xmlChar *)"certificate",(const xmlChar *)cert); policyptr=xmlNewChild(root,NULL,(const xmlChar *)"policies", NULL); writePhase1PoliciesToFile(policyptr); Index: turnpike-0.1.2/VPNClient/vpnlogin/src/ph2fill.c =================================================================== --- turnpike-0.1.2.orig/VPNClient/vpnlogin/src/ph2fill.c +++ turnpike-0.1.2/VPNClient/vpnlogin/src/ph2fill.c @@ -267,7 +267,6 @@ add_columns (GtkTreeView *treeview) { GtkCellRenderer *renderer; GtkTreeModel *model = gtk_tree_view_get_model (treeview); - int columns = 0; GtkTreeViewColumn *current_column = NULL; @@ -275,7 +274,7 @@ add_columns (GtkTreeView *treeview) while((current_column = (gtk_tree_view_get_column (treeview,0)))) { - columns = gtk_tree_view_remove_column(treeview, current_column); + gtk_tree_view_remove_column(treeview, current_column); } /* number column */ Index: turnpike-0.1.2/VPNClient/vpnlogin/src/menuUpdate.c =================================================================== --- turnpike-0.1.2.orig/VPNClient/vpnlogin/src/menuUpdate.c +++ turnpike-0.1.2/VPNClient/vpnlogin/src/menuUpdate.c @@ -44,7 +44,7 @@ int main(int argc, char **argv) { - xmlNode *cur_node, *child_node, *folder_node = NULL, *vpn_node = NULL; + xmlNode *cur_node, *folder_node = NULL, *vpn_node = NULL; xmlChar *buffer; xmlDocPtr doc; int mode = -1; @@ -131,7 +131,7 @@ int main(int argc, char **argv) } } } - child_node=xmlNewTextChild(folder_node,NULL,(const xmlChar *)"Include",(const xmlChar *)DESKTOPFILE); + xmlNewTextChild(folder_node,NULL,(const xmlChar *)"Include",(const xmlChar *)DESKTOPFILE); xmlKeepBlanksDefault(0); xmlSaveFormatFile(XMLFILE,doc,1); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit telepathy-gabble for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package telepathy-gabble for openSUSE:Factory checked in at 2012-03-01 17:28:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/telepathy-gabble (Old) and /work/SRC/openSUSE:Factory/.telepathy-gabble.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "telepathy-gabble", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/telepathy-gabble/telepathy-gabble.changes 2012-01-09 15:21:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.telepathy-gabble.new/telepathy-gabble.changes 2012-03-01 17:28:24.000000000 +0100 @@ -1,0 +2,45 @@ +Wed Feb 22 07:20:36 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 0.15.4: + + Enhancements: + - Add support for the final version of Call1 from + telepathy-spec 0.25.2 and remove the telepathy-yell + submodule. + - fdo#41790: Make file transfer support optional + - fdo#44056: telepathy-gabble-xmpp-console no longer mixes GIR + and pygtk. + - fdo#33911: The Loudmouth API compatibility layer has been + removed. + - fdo#45491: Error messages provided by the server in <presence + type='error'/> stanzas are now exposed via the SimplePresence + API. This makes it easier for users to distinguish contacts + being offline from contacts' servers being broken. + - fdo#44649: Gabble now has a gabble-plugins.so library, + similarly to mission-control. + + API changes to Wocky snapshot: + - fdo#45400: WockyPepService's API has changed a little bit. + - fdo#34975: WockyPorter is now responsible for sending back + error replies for unhandled IQs, whereas previously this was + up to Gabble. + - fdo#27489: including <wocky/wocky.h> now includes all public + API from Wocky, and including any other header directly is + forbidden. + + Fixes: + - fdo#44331: Gabble plugin API fails at runtime on Windows: + gabble_plugin_create_sidecar function is renamed to + gabble_plugin_create_sidecar_async and new virtual function + gabble_plugin_create_sidecar_finish is introduced. + - fdo#45443 (workaround): avoid testing Credentials access + control, since recent Linux has stricter requirements for + credentials-passing (it's now opt-in) which we're not yet + meeting. + - fdo#46379: don't raise a GError with domain 0. + - fdo#44855: work around Google's unimplemented capability + discovery by hard-coding the capabilities of the GTalk echo + bot. + - Work around the deprecation of GValueArray. +- Remove doc subpackage, and add appropriate Provides/Obsoletes to + the main subpackage: the doc is too small to make sense as a + separate package. + +------------------------------------------------------------------- Old: ---- telepathy-gabble-0.15.3.tar.gz New: ---- telepathy-gabble-0.15.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-gabble.spec ++++++ --- /var/tmp/diff_new_pack.cs292S/_old 2012-03-01 17:28:28.000000000 +0100 +++ /var/tmp/diff_new_pack.cs292S/_new 2012-03-01 17:28:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package telepathy-gabble # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: telepathy-gabble -Version: 0.15.3 +Version: 0.15.4 Release: 0 Summary: XMPP connection manager for Telepathy License: LGPL-2.1+ @@ -25,13 +26,16 @@ Source: http://telepathy.freedesktop.org/releases/telepathy-gabble/%{name}-%{versio… BuildRequires: dbus-1-glib-devel BuildRequires: libgnutls-devel -BuildRequires: libnice-devel +BuildRequires: libnice-devel >= 0.0.11 BuildRequires: libsoup-devel BuildRequires: libxslt-devel BuildRequires: python-xml BuildRequires: sqlite3-devel -BuildRequires: telepathy-glib-devel >= 0.17.2 +BuildRequires: telepathy-glib-devel >= 0.17.5 Recommends: ca-certificates +# doc subpackage removed during 12.2 development +Provides: %{name}-doc = %{version} +Obsoletes: %{name}-doc < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -49,19 +53,6 @@ %description xmpp-console This utility is a XMPP console user interface, for telepathy-gabble. -%package doc -Summary: XMPP connection manager for Telepathy (documentation) -Group: Documentation/Other -Requires: %{name} = %{version} - -%description doc -Gabble is a Jabber/XMPP connection manager for the Telepathy framework, -currently supporting single user chats, multi user chats and -voice/video calls. Install this package to use Telepathy instant -messaging clients with Jabber/XMPP servers, including Google Talk. - -This package contain the documentation. - %prep %setup -q @@ -86,21 +77,20 @@ %files %defattr (-,root,root) +%doc AUTHORS ChangeLog COPYING NEWS README +%doc %{_docdir}/%{name}/*.html %dir %{_datadir}/telepathy %dir %{_datadir}/telepathy/managers %dir %{_libdir}/telepathy %{_libdir}/telepathy/gabble-0/ +%{_libdir}/libgabble-plugins.so %{_libexecdir}/telepathy-gabble %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.gabble.service %{_datadir}/telepathy/managers/gabble.manager -%{_mandir}/man8/telepathy-gabble.8.gz +%{_mandir}/man8/telepathy-gabble.8%{?ext_man} %files xmpp-console %defattr (-,root,root) %{_bindir}/telepathy-gabble-xmpp-console -%files doc -%defattr (-,root,root) -%{_docdir}/%{name}/ - %changelog ++++++ telepathy-gabble-0.15.3.tar.gz -> telepathy-gabble-0.15.4.tar.gz ++++++ ++++ 127136 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit systemtap for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package systemtap for openSUSE:Factory checked in at 2012-03-01 17:28:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemtap (Old) and /work/SRC/openSUSE:Factory/.systemtap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemtap", Maintainer is "TonyJ(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/systemtap/systemtap-docs.changes 2012-01-31 10:22:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.systemtap.new/systemtap-docs.changes 2012-03-01 17:28:17.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Feb 18 01:36:46 UTC 2012 - tonyj(a)suse.com + +- Update to version 1.7. See systemtap.spec for changelog + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/systemtap/systemtap.changes 2011-12-27 18:38:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.systemtap.new/systemtap.changes 2012-03-01 17:28:17.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Feb 18 01:33:56 UTC 2012 - tonyj(a)suse.com + +- Upgrade to version 1.7 + Changelog: http://sourceware.org/ml/systemtap/2012-q1/msg00097.html + +------------------------------------------------------------------- Old: ---- 0001-PR13216-set-AM_GNU_GETTEXT_VERSION-0.17-in-configury.patch systemtap-1.6.tar.bz2 New: ---- systemtap-1.7.tar.bz2 systemtap-docs-autoconf-version.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemtap-docs.spec ++++++ --- /var/tmp/diff_new_pack.tnC6St/_old 2012-03-01 17:28:20.000000000 +0100 +++ /var/tmp/diff_new_pack.tnC6St/_new 2012-03-01 17:28:20.000000000 +0100 @@ -26,7 +26,7 @@ BuildRequires: xmlto BuildRequires: fop BuildRequires: latex2html -Version: 1.6 +Version: 1.7 Release: 0 Summary: Documents and examples for systemtap License: GPL-2.0+ @@ -36,7 +36,7 @@ Source2: README-BEFORE-ADDING-PATCHES Patch1: systemtap-docdir-fix.diff Patch2: systemtap-xmlto-fop.diff -Patch3: 0001-PR13216-set-AM_GNU_GETTEXT_VERSION-0.17-in-configury.patch +Patch3: systemtap-docs-autoconf-version.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ systemtap.spec ++++++ --- /var/tmp/diff_new_pack.tnC6St/_old 2012-03-01 17:28:20.000000000 +0100 +++ /var/tmp/diff_new_pack.tnC6St/_new 2012-03-01 17:28:20.000000000 +0100 @@ -27,7 +27,7 @@ BuildRequires: pkg-config BuildRequires: sqlite-devel BuildRequires: systemd -Version: 1.6 +Version: 1.7 Release: 0 Summary: Instrumentation System License: GPL-2.0+ ++++++ systemtap-1.6.tar.bz2 -> systemtap-1.7.tar.bz2 ++++++ ++++ 101470 lines of diff (skipped) ++++++ systemtap-docs-autoconf-version.diff ++++++ From: Tony Jones <tonyj(a)suse.de> Subject: adjust autoconf version References: none Upstream: no Signed-off-by: Tony Jones <tonyj(a)suse.de> diff --git a/configure.ac b/configure.ac index ce3121e..c8b90de 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AC_PROG_MAKE_SET AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) AM_GNU_GETTEXT(external) -AM_GNU_GETTEXT_VERSION(0.17) +AM_GNU_GETTEXT_VERSION(0.15) AC_CHECK_FUNCS(ppoll) dnl Handle the prologues option. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit subversion for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package subversion for openSUSE:Factory checked in at 2012-03-01 17:27:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/subversion (Old) and /work/SRC/openSUSE:Factory/.subversion.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "subversion", Maintainer is "DMueller(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/subversion/subversion.changes 2012-01-05 13:51:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.subversion.new/subversion.changes 2012-03-01 17:28:05.000000000 +0100 @@ -1,0 +2,58 @@ +Tue Feb 21 20:00:27 UTC 2012 - coolo(a)suse.com + +- Apache-2 is not a license in spdx.org, pick Apache-2.0 + +------------------------------------------------------------------- +Mon Feb 13 23:16:44 UTC 2012 - andreas.stieger(a)gmx.de + +- refresh subversion-no-build-date.patch +- add mod_dontdothat to subversion-server package +- add section to README.SuSE about mod_dontdothat +- add inactive sample mod_dontdothat configuration to subversion.conf +- update to upstream 1.7.3 + + General: + * ship mod_dontdothat with the standard release + + User-visible changes: + * fix segfault on 'svn rm $ROOT_URL' (issue #4074) + * replace a couple of assertions in favor of errors (r1207858, -949) + * fix a server assert after being upgraded (r1210195) + * fix segfault on 'svn mkdir svn://localhost' (r1211483) + * make 'svnadmin recover' prune the rep cache (r1213331, et al) + * make svnmucc use values from --config-dir option + * update and clarify the merge help text (r1154121, et al) + * replace wc assertion with informative error (r1222521, -693) + * copy permissions correctly for FSFS dirs (r1229252) + * improve 'svn log --with-all-revprops' over ra-dav (issue #4082) + * fix segfault when remapping a file external (issue #4093) + * fix segfault caused by obstructing unversioned dir (r1229677) + * fix regression on first update of external dir with '-r' (issue #4053) + * fix various EOL-handling problems in 'svn patch' (issues #3814, #3991) + * fix segfault in 'svn revert' (r1229303) + * improve correctness of 'svn patch --dry-run' (r1231944, -5) + * enforce revisions given in 'svn:externals' (issue #4053) + * fix potential corruption on 32-bit FSFS with large files (r1230212) + * make 'svn status --xml' show new files (issue #4097) + * fix 'svn mergeinfo' correctness (issue #4050) + * return the correct status for non-present nodes (r1232202, -07, -21, -22) + * improve SASL error messages (r1236343, et al) + * improve server cert error code for ra_serf (r1232413) + * fix SVNParentPath listings for parent path symlinks (r1221767, -80) + * fix mod_dav_svn's handling of POST errors (issue #4086) + * log some mod_dav_svn errors, rather than ignoring them (r1237720, -9596) + * relax requirements for canonicalization in mod_dav_svn (r1236173) + * fix a rare source of FSFS corruption (r1240752) + * allow committing the result of some copy operations (issue #4059) + * prevent one-byte buffer overflow in base64 decoding (r1242337) + + Developer-visible changes: + * JavaHL: Add missing notify action, fixing an exception (r1221793) + * fix swig-py memory leak (r1235264, -296, -302, -736) + * fix spurious test suite failure (r1220742, -50) + * allow running tests on UNC shares (r1225491) + * bindings: see platform-specific password providers (r1242660, -1) + * skip 'svnrdump dump' tests over ra_serf (r1242537) + * convert a few ra_serf assertions to errors (r1242607) + +------------------------------------------------------------------- Old: ---- subversion-1.7.2.tar.bz2 New: ---- subversion-1.7.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subversion.spec ++++++ --- /var/tmp/diff_new_pack.hoClz1/_old 2012-03-01 17:28:08.000000000 +0100 +++ /var/tmp/diff_new_pack.hoClz1/_new 2012-03-01 17:28:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package subversion # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009-2010 Pascal Bleser <pascal.bleser(a)opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -41,16 +41,23 @@ %bcond_without regression_tests Name: subversion -Version: 1.7.2 -Release: 1 +Version: 1.7.3 +Release: 0 # in-tree SWIG version to use for the build: %define swig_version 1.3.36 %define sqlite_version 3.7.6.3 %define sqlite_pkg_version 3070603 -BuildRequires: apache2-devel db-devel file-devel gcc-c++ libstdc++-devel zlib-devel -BuildRequires: libtool pkgconfig -BuildRequires: python-devel python-xml +BuildRequires: apache2-devel +BuildRequires: db-devel +BuildRequires: file-devel +BuildRequires: gcc-c++ +BuildRequires: libstdc++-devel +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: python-devel +BuildRequires: python-xml BuildRequires: update-alternatives +BuildRequires: zlib-devel %if %with_python_ctypes BuildRequires: ctypesgen %endif @@ -72,7 +79,10 @@ BuildRequires: libserf-devel %endif %if %with_kde4_kwallet -BuildRequires: dbus-1-devel kdelibs4-core libkde4-devel libqt4-devel +BuildRequires: dbus-1-devel +BuildRequires: kdelibs4-core +BuildRequires: libkde4-devel +BuildRequires: libqt4-devel %endif # with_kde4_kwallet %if 0%{?suse_version} >= 1130 %define with_java 1 @@ -84,7 +94,8 @@ %if 0%{?suse_version} > 1030 BuildRequires: libneon-devel %else -BuildRequires: neon-devel openldap2-devel +BuildRequires: neon-devel +BuildRequires: openldap2-devel %endif # suse_version > 1030 # for %check section, to find a free port: BuildRequires: iproute2 @@ -102,9 +113,9 @@ PreReq: %insserv_prereq %fillup_prereq # Summary: Subversion version control system -BuildRoot: %{_tmppath}/%{name}-%{version}-build -License: Apache-2 +License: Apache-2.0 Group: Development/Tools/Version Control +BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://subversion.apache.org Source0: http://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2 Source1: subversion.conf @@ -165,9 +176,8 @@ %package devel -License: Apache-2 -Group: Development/Libraries/C and C++ Summary: Development package for Subversion developers +Group: Development/Libraries/C and C++ Requires: subversion = %{version} # this pulls in libapr1-devel and libexpat-devel Requires: libapr-util1-devel @@ -179,18 +189,16 @@ %package tools -License: Apache-2 -Group: Development/Tools/Version Control Summary: Tools for Subversion +Group: Development/Tools/Version Control %description tools This package contains some tools for subversion server and repository admins. %package perl -License: Apache-2 -Group: Development/Tools/Version Control Summary: Allows Perl scripts to directly use Subversion repositories +Group: Development/Tools/Version Control Requires: subversion = %{version} Requires: perl >= 5.8 Requires: perl = %{perl_version} @@ -201,9 +209,8 @@ %package python -License: Apache-2 -Group: Development/Tools/Version Control Summary: Allows Python scripts to directly use Subversion repositories +Group: Development/Tools/Version Control Requires: subversion = %{version} %description python @@ -215,8 +222,8 @@ %package python-ctypes -Group: Development/Tools/Version Control Summary: High-Level Python Bindings for Subversion +Group: Development/Tools/Version Control Requires: subversion = %{version} %description python-ctypes @@ -225,9 +232,8 @@ %if %with_ruby %package ruby -License: Apache-2 -Group: Development/Tools/Version Control Summary: Allows Ruby scripts to directly use Subversion repositories +Group: Development/Tools/Version Control Requires: subversion = %{version} %description ruby @@ -238,10 +244,11 @@ %endif # with_ruby %package server -License: Apache-2 -Group: Development/Tools/Version Control Summary: Apache server module for Subversion server -Requires: subversion = %{version} apache2 %{apache_mmn} +Group: Development/Tools/Version Control +Requires: %{apache_mmn} +Requires: apache2 +Requires: subversion = %{version} %description server The subversion-server package adds the Subversion server Apache module @@ -254,7 +261,6 @@ %if %with_kde4_kwallet %package -n libsvn_auth_kwallet-1-0 -License: Apache-2 Summary: A Concurrent Versioning system similar to but better than CVS Group: Development/Tools/Version Control @@ -266,7 +272,6 @@ %if %with_gnome_keyring %package -n libsvn_auth_gnome_keyring-1-0 -License: Apache-2 Summary: A Concurrent Versioning system similar to but better than CVS Group: Development/Tools/Version Control @@ -733,6 +738,7 @@ %dir %{apache_libexecdir} %{apache_libexecdir}/mod_dav_svn.* %{apache_libexecdir}/mod_authz_svn.* +%{apache_libexecdir}/mod_dontdothat.* %if %with_gnome_keyring %files -n libsvn_auth_gnome_keyring-1-0 ++++++ subversion-1.7.2.tar.bz2 -> subversion-1.7.3.tar.bz2 ++++++ ++++ 10073 lines of diff (skipped) ++++++ subversion-no-build-date.patch ++++++ --- /var/tmp/diff_new_pack.hoClz1/_old 2012-03-01 17:28:10.000000000 +0100 +++ /var/tmp/diff_new_pack.hoClz1/_new 2012-03-01 17:28:10.000000000 +0100 @@ -1,7 +1,7 @@ Index: subversion/libsvn_subr/opt.c =================================================================== ---- subversion/libsvn_subr/opt.c.orig 2011-06-24 16:55:09.000000000 +0100 -+++ subversion/libsvn_subr/opt.c 2011-12-21 17:32:39.000000000 +0000 +--- subversion/libsvn_subr/opt.c.orig 2012-01-25 17:16:44.000000000 +0000 ++++ subversion/libsvn_subr/opt.c 2012-02-13 20:48:43.000000000 +0000 @@ -1070,9 +1070,8 @@ svn_opt__print_version_info(const char * if (quiet) return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER); @@ -12,5 +12,5 @@ + SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n\n"), pgm_name, + SVN_VERSION)); SVN_ERR(svn_cmdline_fputs( - _("Copyright (C) 2011 The Apache Software Foundation.\n" + _("Copyright (C) 2012 The Apache Software Foundation.\n" "This software consists of contributions made by many " ++++++ subversion.README.SuSE ++++++ --- /var/tmp/diff_new_pack.hoClz1/_old 2012-03-01 17:28:10.000000000 +0100 +++ /var/tmp/diff_new_pack.hoClz1/_new 2012-03-01 17:28:10.000000000 +0100 @@ -3,6 +3,7 @@ 1. backup and restore your repository data 2. create svn user/group for svnserve 3. mini-howto for 2 projects +4. quickstart for mod_dontdothat ================================================================================ @@ -209,3 +210,46 @@ svn import /path/to/project2-tree http://host/repos/project2 + + + + +4. quickstart for mod_dontdothat + +The apache module mod_dontdothat can be used to prevent users from causing high +load on the server, e.g. checking out the root of the tree or the tags or +branches directories. + +Make sure mod_dontdothat is loaded: +$ a2enmod dontdothat + +Add configuration for the module, e.g. + +<Location /> + DAV svn + SVNParentPath /srv/svn/repositories/ + SVNListParentPath on + # [...other configuration...] + <IfModule mod_dontdothat.c> + DontDoThatConfigFile /srv/svn/mod_dontdothat.config + DontDoThatDisallowReplay off + </IfModule> +</Location> + +Restart apache to make the change effective. + +A fairly standard file /srv/svn/mod_dontdothat.config may contain: + +[recursive-actions] +/*/trunk = allow +/ = deny +/* = deny +/*/tags = deny +/*/branches = deny +/*/* = deny +/*/*/tags = deny +/*/*/branches = deny + +This allows checking out of /trunk and each branch, but disallows checking out +all branches or the complete repository at once. + ++++++ subversion.conf ++++++ --- /var/tmp/diff_new_pack.hoClz1/_old 2012-03-01 17:28:10.000000000 +0100 +++ /var/tmp/diff_new_pack.hoClz1/_new 2012-03-01 17:28:10.000000000 +0100 @@ -83,6 +83,15 @@ # <LimitExcept GET PROPFIND OPTIONS REPORT> # Require valid-user # </LimitExcept> +# # +# # Optional configuration for mod_dontdothat +# # prevent users from causing high load on the server, e.g. checking out +# # the root of the tree or the tags or branches directories +# # +# #<IfModule mod_dontdothat.c> +# # DontDoThatConfigFile /srv/svn/mod_dontdothat.config +# # DontDoThatDisallowReplay off +# #</IfModule> # </Location> #</VirtualHost> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit smartmontools for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package smartmontools for openSUSE:Factory checked in at 2012-03-01 17:27:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/smartmontools (Old) and /work/SRC/openSUSE:Factory/.smartmontools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "smartmontools", Maintainer is "sbrabec(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/smartmontools/smartmontools.changes 2011-12-01 17:38:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.smartmontools.new/smartmontools.changes 2012-03-01 17:27:49.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 21 19:32:51 CET 2012 - sbrabec(a)suse.cz + +- Disable PIE for SLE9. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smartmontools.spec ++++++ --- /var/tmp/diff_new_pack.RIGLd3/_old 2012-03-01 17:27:52.000000000 +0100 +++ /var/tmp/diff_new_pack.RIGLd3/_new 2012-03-01 17:27:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package smartmontools # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -82,9 +82,11 @@ %build AUTOMAKE=/usr/bin/automake-1.11 ./autogen.sh +%if %suse_version > 1000 export CFLAGS="%{optflags} -fPIE" export CXXFLAGS="%{optflags} -fPIE" export LDFLAGS="-pie" +%endif %configure\ --with-docdir=%{_defaultdocdir}/%{name}\ %if %suse_version >= 1110 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sgrep for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package sgrep for openSUSE:Factory checked in at 2012-03-01 17:27:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sgrep (Old) and /work/SRC/openSUSE:Factory/.sgrep.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sgrep", Maintainer is "ke(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sgrep/sgrep.changes 2011-09-23 12:46:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sgrep.new/sgrep.changes 2012-03-01 17:27:42.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Feb 25 08:41:20 UTC 2012 - coolo(a)suse.com + +- sync spec file name with package name + +------------------------------------------------------------------- Old: ---- sgrep-1.92a.spec New: ---- sgrep.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sgrep-1.92a.spec -> sgrep.spec ++++++ --- /work/SRC/openSUSE:Factory/sgrep/sgrep-1.92a.spec 2011-12-06 19:37:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sgrep.new/sgrep.spec 2012-03-01 17:27:42.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package sgrep (Version 1.92a) +# spec file for package sgrep # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,16 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: sgrep -License: GPL-2.0+ -Group: Productivity/Text/Utilities -AutoReqProv: on Version: 1.92a -Release: 966 +Release: 0 Summary: Searching for Structured Patterns +License: GPL-2.0+ +Group: Productivity/Text/Utilities Source: ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/sgrep-%{version}.tar.gz Patch: sgrep-sgreprc.diff Patch1: sgrep-no-build-date.patch @@ -36,13 +33,6 @@ can use the program to extract fragments from SGML/XML or any other well formed text files (including UTF-8 encoded files). - - -Authors: --------- - Jani Jaakkola <jjaakkol(a)cs.helsinki.fi> - Pekka Kilpelainen <kilpelai(a)cs.helsinki.fi> - %define INSTALL install -m755 -s %define INSTALL_SCRIPT install -m755 %define INSTALL_DIR install -d -m755 @@ -60,21 +50,14 @@ make %install -if [ ! "x" = "x$RPM_BUILD_ROOT" ] ; then - export RPM_BUILD_ROOT - rm -fr $RPM_BUILD_ROOT - %{INSTALL_DIR} $RPM_BUILD_ROOT -fi +%{INSTALL_DIR} $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %{INSTALL_DATA} sample.sgreprc $RPM_BUILD_ROOT/%{_sysconfdir}/sgreprc rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/sample.sgreprc -%clean -rm -fr $RPM_BUILD_ROOT - %files %defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog INSTALL NEWS README sgrep.lsm +%doc AUTHORS COPYING ChangeLog NEWS README sgrep.lsm %doc sample.sgreprc %config %{_sysconfdir}/sgreprc %{_bindir}/sgrep -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-fastthread for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package rubygem-fastthread for openSUSE:Factory checked in at 2012-03-01 17:27:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-fastthread (Old) and /work/SRC/openSUSE:Factory/.rubygem-fastthread.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-fastthread", Maintainer is "JMassaguerPla(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-fastthread/rubygem-fastthread.changes 2012-02-16 16:23:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-fastthread.new/rubygem-fastthread.changes 2012-03-01 17:27:38.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 21 12:17:12 UTC 2012 - jreidinger(a)suse.com + +- add ruby-devel dependencies which helps for older systems + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-fastthread.spec ++++++ --- /var/tmp/diff_new_pack.iaWkuu/_old 2012-03-01 17:27:39.000000000 +0100 +++ /var/tmp/diff_new_pack.iaWkuu/_new 2012-03-01 17:27:39.000000000 +0100 @@ -26,6 +26,8 @@ # BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: rubygems_with_buildroot_patch +#ruby devel is needed for native extension +BuildRequires: ruby-devel %rubygems_requires # Url: http://moonbase.rydia.net/ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpmlint for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2012-03-01 17:27:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint (Old) and /work/SRC/openSUSE:Factory/.rpmlint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpmlint", Maintainer is "DMueller(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2012-02-22 15:55:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2012-03-01 17:27:34.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Feb 29 13:49:51 UTC 2012 - lnussel(a)suse.de + +- add udisks2 to dbus whitelist (bnc#742751) +- add smb4k to dbus whitelist (bnc#749065) + +------------------------------------------------------------------- +Wed Feb 29 12:02:40 CET 2012 - dmueller(a)suse.de + +- ignore fixed dependencies on config() + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.9cjoFm/_old 2012-03-01 17:27:37.000000000 +0100 +++ /var/tmp/diff_new_pack.9cjoFm/_new 2012-03-01 17:27:37.000000000 +0100 @@ -57,10 +57,16 @@ Source100: syntax-validator.py Url: http://rpmlint.zarb.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: rpm-python, /usr/bin/readelf, file, findutils, cpio, bash +Requires: /usr/bin/readelf +Requires: bash +Requires: checkbashisms +Requires: cpio +Requires: dash Requires: desktop-file-utils +Requires: file +Requires: findutils Requires: python-magic -Requires: dash checkbashisms +Requires: rpm-python BuildArch: noarch Patch0: rpmlint-suse.diff Patch1: suse-checks.diff ++++++ LibraryPolicyCheck.py ++++++ --- /var/tmp/diff_new_pack.9cjoFm/_old 2012-03-01 17:27:37.000000000 +0100 +++ /var/tmp/diff_new_pack.9cjoFm/_new 2012-03-01 17:27:37.000000000 +0100 @@ -408,7 +408,7 @@ # Verify shared lib policy package doesn't have hard dependency on non-lib packages if std_lib_package: for dep in pkg.requires(): - if (dep[0][0:7] == 'rpmlib('): + if (dep[0].startswith('rpmlib(') or dep[0].startswith('config(')): continue if (dep[1] & (rpm.RPMSENSE_GREATER | rpm.RPMSENSE_EQUAL)) == rpm.RPMSENSE_EQUAL: printWarning(pkg, "shlib-fixed-dependency", Pkg.formatRequire(dep[0], dep[1], dep[2])) ++++++ config ++++++ --- /var/tmp/diff_new_pack.9cjoFm/_old 2012-03-01 17:27:37.000000000 +0100 +++ /var/tmp/diff_new_pack.9cjoFm/_new 2012-03-01 17:27:37.000000000 +0100 @@ -349,6 +349,9 @@ # udisks "org.freedesktop.UDisks.service", "org.freedesktop.UDisks.conf", + # udisks2 (bnc#742751) + "org.freedesktop.UDisks2.service", + "org.freedesktop.UDisks2.conf", # scmon "com.novell.Pkcs11Monitor.conf", # systemd (bnc#641924) @@ -485,6 +488,9 @@ "org.kde.kalarmrtcwake.service", # NetworkManager-openvpn (bnc#732915) "nm-openconnect-service.conf", + # smb4k (bnc#749065) + "de.berlios.smb4k.mounthelper.conf", + "de.berlios.smb4k.mounthelper.service", )) # Output filters -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit remind for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package remind for openSUSE:Factory checked in at 2012-03-01 17:27:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/remind (Old) and /work/SRC/openSUSE:Factory/.remind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "remind", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/remind/remind.changes 2012-02-27 18:36:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.remind.new/remind.changes 2012-03-01 17:27:17.000000000 +0100 @@ -1,0 +2,21 @@ +Tue Feb 28 11:42:15 UTC 2012 - puzel(a)suse.com + +- update to remind-3.1.12 + - NEW FEATURE: Many substitution sequences "%x" have an alternate + mode denoted by "%*x". This alternate mode leaves out + prepositions. For example, in English "%i" might yield "on + 01-25" while "%*i" yields only "01-25". + - BUG FIX: The "dusk" and "dawn" calculations were completely + wrong. They have been fixed. Also, sunrise/sunset calculations + have been tweaked, so the results may be off by a minute or two + compared to previous versions of Remind. + - BUG FIX: For some inexplicable reason, dawn was considered to + happen when the sun was 14 degrees below the horizon instead of + the standard 6 degrees for Civil Dawn. This has been fixed. + - BUG FIXES: Clarified the man pages and fixed some typos. + - BUG FIX: Add THROUGH to the remind.vim syntax highlighting file. + - ENHANCEMENT (?): Allow SPECIAL COLOR to be spelled SPECIAL + COLOUR. + - BUG FIX: Apply minor Debian cleanups reported by Kurt B. Kaiser. + +------------------------------------------------------------------- Old: ---- remind-03.01.10.tar.bz2 remind-3.1.10-rpmlintrc New: ---- remind-03.01.12.tar.gz remind-3.1.12-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ remind.spec ++++++ --- /var/tmp/diff_new_pack.QAOtNi/_old 2012-03-01 17:27:20.000000000 +0100 +++ /var/tmp/diff_new_pack.QAOtNi/_new 2012-03-01 17:27:20.000000000 +0100 @@ -17,14 +17,14 @@ Name: remind -Version: 3.1.10 +Version: 3.1.12 Release: 0 -%define tar_version 03.01.10 +%define tar_version 03.01.12 Summary: A sophisticated calendar and alarm program License: GPL-2.0 Group: Productivity/Office/Organizers Url: http://www.roaringpenguin.com/products/remind -Source0: %{name}-%{tar_version}.tar.bz2 +Source0: %{name}-%{tar_version}.tar.gz Source100: %{name}-%{version}-rpmlintrc Patch0: remind-nostrip.patch Requires: tcllib ++++++ remind-3.1.10-rpmlintrc -> remind-3.1.12-rpmlintrc ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit R-base for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package R-base for openSUSE:Factory checked in at 2012-03-01 17:27:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/R-base (Old) and /work/SRC/openSUSE:Factory/.R-base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "R-base", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/R-base/R-base.changes 2012-01-05 13:49:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.R-base.new/R-base.changes 2012-03-01 17:27:06.000000000 +0100 @@ -1,0 +2,28 @@ +Fri Feb 17 20:53:49 UTC 2012 - detlef.steuer(a)gmx.de + +- Minor cleanup for easier automativ building of R-patched.spec + +------------------------------------------------------------------- +Wed Feb 15 19:41:43 UTC 2012 - detlef.steuer(a)gmx.de + +- changed licence string to "GPL-2.0 or GPL-3.0" + +------------------------------------------------------------------- +Mon Feb 13 22:39:51 UTC 2012 - detlef.steuer(a)gmx.de + +- uninstall rule for R.conf more than useless ... reverted. + +------------------------------------------------------------------- +Mon Feb 13 21:59:13 UTC 2012 - detlef.steuer(a)gmx.de + +- Applications like KDE's Cantor search for the R standard library +- using the library search path. However, in openSUSE's package, +- libraries are installed to %{_libdir}/R/lib, hence attempts to +- load them from these applications will fail. +- This revision adds a R.conf file to ld.so.conf.d to enable +- searching for libraries where R is installed. Once this change +- is in, applications are able to use libR.so. +- Thx to einar(a)heavensinferno.net for spotting this. +- Thought had done this for release of 2.14.0. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ R-base.spec ++++++ --- /var/tmp/diff_new_pack.WQafAg/_old 2012-03-01 17:27:09.000000000 +0100 +++ /var/tmp/diff_new_pack.WQafAg/_new 2012-03-01 17:27:09.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package R-base # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -21,10 +21,10 @@ %define release 1 Version: 2.14.1 Release: %release -Source: R-%{version}.tar.bz2 #Source: http://cran.r-project.org/src/base/R-2/R-%%{version}.tar.gz +Source: R-%{version}.tar.bz2 -License: GPL-2.0 || GPL-3.0 +License: GPL-2.0 or GPL-3.0 Url: http://www.r-project.org/ Group: Productivity/Scientific/Math @@ -49,6 +49,7 @@ Requires: xorg-x11-fonts-75dpi, cairo >= 1.2 Requires: fontconfig, freetype2, xdg-utils +Provides: R = %{version} Provides: R-boot = 1.3.3 Provides: R-class = 7.3.3 Provides: R-cluster = 1.14.1 @@ -83,15 +84,16 @@ AT&T Bell Laboratories by Rick Becker, John Chambers and Allan Wilks. %package -n R-base-devel -Summary: Libraries and includefiles for developing with R-base +Summary: Libraries and includefiles for using R as library Group: Development/Libraries/Other -Requires: R-base = %{version} +Requires: R = %{version} +Provides: R-devel = %{version} Provides: R-Matrix-devel = 1.0.2 Obsoletes: R-Matrix-devel < 1.0.2 %description -n R-base-devel This package provides the necessary development headers and -libraries to allow you to devel with R-base. +libraries to allow you to use R-core as library. %prep @@ -132,6 +134,12 @@ %fdupes -s $RPM_BUILD_ROOT %endif +# Install ld.so.conf.d file to ensure other applications access the shared lib +mkdir -p %{buildroot}/etc/ld.so.conf.d +cat << EOF >%{buildroot}/etc/ld.so.conf.d/R.conf +%{_libdir}/R/lib +EOF + %post /sbin/ldconfig %install_info --info-dir=%{_infodir} %{_infodir}/R-exts.info-1.gz @@ -699,7 +707,7 @@ %{_libdir}/R/library/utils/Sweave/ %{_libdir}/R/library/utils/doc/ -# R-base main part +# R-base (core) part %doc README %{_mandir}/man1/R.1* %{_mandir}/man1/Rscript.1* @@ -756,6 +764,8 @@ %{_libdir}/R/share/R/ %{_libdir}/R/share/sh/ %{_libdir}/R/share/texmf/ +# ld.so.conf +/etc/ld.so.conf.d/R.conf %files -n R-base-devel %defattr(-, root, root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-pyenchant for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package python-pyenchant for openSUSE:Factory checked in at 2012-03-01 17:26:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pyenchant (Old) and /work/SRC/openSUSE:Factory/.python-pyenchant.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pyenchant", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-02-28 22:35:32.095577906 +0100 +++ /work/SRC/openSUSE:Factory/.python-pyenchant.new/python-pyenchant.changes 2012-03-01 17:26:59.000000000 +0100 @@ -0,0 +1,22 @@ +------------------------------------------------------------------- +Mon Feb 27 14:43:28 UTC 2012 - cfarrell(a)suse.com + +- license update: LGPL-2.1+ + No reason to believe that the package author restricted licensing to only + version 2.1 of the LGPL. As such LGPL-2.1+ is the better choice + +------------------------------------------------------------------- +Mon Feb 20 13:35:38 UTC 2012 - saschpe(a)suse.de + +- Spec file cleanup: + * Simplified macro usage + * Removed outdated %clean section + * Set SPDX-style license + * No CFLAGS for noarch package + +------------------------------------------------------------------- +Fri Apr 15 13:20:39 UTC 2011 - saschpe(a)suse.de + +- Initial version 1.6.5 +- Obsoletes package 'python-enchant' + New: ---- pyenchant-1.6.5.tar.gz python-pyenchant.changes python-pyenchant.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pyenchant.spec ++++++ # # spec file for package python-pyenchant # # Copyright (c) 2012 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/ # Name: python-pyenchant Version: 1.6.5 Release: 0 Url: http://www.rfk.id.au/software/pyenchant/ Summary: Python bindings for the Enchant spellchecking system License: LGPL-2.1+ Group: Development/Languages/Python Source: pyenchant-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: enchant BuildRequires: python-devel BuildRequires: python-distribute Requires: enchant Obsoletes: python-enchant < %{version} Provides: python-enchant = %{version} Provides: PyEnchant %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description PyEnchant is a spellchecking library for Python, based on the excellent Enchant library. %prep %setup -q -n pyenchant-%{version} %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root,-) %doc LICENSE.txt README.txt TODO.txt %{python_sitelib}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-liblarch for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package python-liblarch for openSUSE:Factory checked in at 2012-03-01 17:26:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-liblarch (Old) and /work/SRC/openSUSE:Factory/.python-liblarch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-liblarch", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-02-28 22:35:32.095577906 +0100 +++ /work/SRC/openSUSE:Factory/.python-liblarch.new/python-liblarch.changes 2012-03-01 17:26:52.000000000 +0100 @@ -0,0 +1,11 @@ +------------------------------------------------------------------- +Tue Feb 28 10:43:02 UTC 2012 - cfarrell(a)suse.com + +- license update: LGPL-3.0+ + See README and License files. This package is LGPL-3.0+ + +------------------------------------------------------------------- +Wed Feb 15 19:34:52 UTC 2012 - dimstar(a)opensuse.org + +- Initial package, version 0.1.0. + New: ---- liblarch-0.1.0.tar.gz python-liblarch.changes python-liblarch.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-liblarch.spec ++++++ # # spec file for package # # Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands. # # 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/ # Name: python-liblarch %define _name liblarch Version: 0.1.0 Release: 0 License: LGPL-3.0+ Summary: A python library to easily handle data structure Url: https://live.gnome.org/liblarch Group: Development/Languages/Python Source: http://gtg.fritalk.com/publique/gtg.fritalk.com/liblarch/0.1/%{_name}-%{ver… BuildRequires: python Requires: python-gobject2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %py_requires %description Liblarch is a python library built to easily handle data structure such are lists, trees and acyclic graphs (tree where nodes can have multiple parents) %prep %setup -q -n %{_name}-%{version} %build python setup.py build %install python setup.py install --root %{buildroot} --prefix %{_prefix} %files %defattr(-,root,root) %doc README LICENSE %{python_sitelib}/%{_name}-%{version}-*.egg-info %{python_sitelib}/%{_name}/ %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-django-dajaxice for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package python-django-dajaxice for openSUSE:Factory checked in at 2012-03-01 17:26:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-django-dajaxice (Old) and /work/SRC/openSUSE:Factory/.python-django-dajaxice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-django-dajaxice", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-02-28 22:35:32.095577906 +0100 +++ /work/SRC/openSUSE:Factory/.python-django-dajaxice.new/python-django-dajaxice.changes 2012-03-01 17:26:43.000000000 +0100 @@ -0,0 +1,101 @@ +------------------------------------------------------------------- +Mon Feb 27 15:56:53 UTC 2012 - cfarrell(a)suse.com + +- license update: BSD-3-Clause and LGPL-2.1+ and SUSE-Public-Domain + See the COPYING file + +------------------------------------------------------------------- +Mon Feb 27 11:42:12 UTC 2012 - saschpe(a)suse.de + +- Buildrequire python-Sphinx to actually build HTML documentation + +------------------------------------------------------------------- +Fri Feb 24 15:03:07 UTC 2012 - saschpe(a)suse.de + +- Use original tarball +- Remove outdated sections +- Simplified macro usage + +------------------------------------------------------------------- +Wed Jul 13 15:50:54 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 0.2: + - Fix bug with the 'is_callback_a_function' variable in dajaxice.core.js + - Fix bug with csrftoken in landing pages using dajaxice. + - Improve reliability handling server errors. + - Exception handling was fully rewritten. Dajaxice + default_error_callback is now configurable using Dajaxice.setup. + - Custom error messages per dajaxice call. + - Dajaxice now propagate docstrings to javascript dajaxice functions. + - Added DAJAXICE_JS_DOCSTRINGS to configure docstrings propagation + behaviour, default=False. + - Updated installation guide for compatibility with django 1.3 + - dajaxice now uses the logger 'dajaxice' and not 'dajaxice.DajaxiceRequest' + - Documentation Updated. +- Regenerate spec file with py2pack. + +------------------------------------------------------------------- +Tue Feb 22 13:08:59 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 0.1.8.1: + - Fixed bug #25 related to CSRF verification on Django 1.2.5. + +------------------------------------------------------------------- +Wed Feb 9 12:33:27 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 0.1.8: + - Add build dir to ignores + - Remove MANIFEST file and auto-generate it through MANIFEST.in + - Add MANIFEST to ignores + - Include examples and docs dirs to source distribution + - Add long_description to setup.py + - Fixed Flaw in AJAX CSRF handling (X-CSRFToken Django 1.2.5) + +------------------------------------------------------------------- +Wed Jan 12 23:31:10 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 0.1.7. + +------------------------------------------------------------------- +Tue Sep 21 06:17:07 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 0.1.6; +- Bzip2 source file. + +------------------------------------------------------------------- +Wed Jul 7 12:41:13 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 0.1.5. + +------------------------------------------------------------------- +Tue Apr 6 22:11:47 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 0.1.4; +- Spec file cleaned with spec-cleaner. + +------------------------------------------------------------------- +Mon Mar 29 00:00:20 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 0.1.3. + +------------------------------------------------------------------- +Tue Feb 23 23:18:02 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 0.1.2. + +------------------------------------------------------------------- +Tue Feb 23 01:21:06 UTC 2010 - alexandre(a)exatati.com.br + +- Update to 0.1.1. + +------------------------------------------------------------------- +Wed Jan 6 18:50:43 UTC 2010 - alexandre(a)exatati.com.br + +- RPM renamed to python-django-dajaxice instead of + python-dajaxice; +- Update to 0.1.0. + +------------------------------------------------------------------- +Thu Dec 10 11:39:57 UTC 2009 - alexandre(a)exatati.com.br + +- Initial package (0.0.1) for openSUSE. New: ---- django-dajaxice-0.2.tar.gz python-django-dajaxice.changes python-django-dajaxice.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-django-dajaxice.spec ++++++ # # spec file for package python-django-dajaxice # # Copyright (c) 2012 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/ # Name: python-django-dajaxice Version: 0.2 Release: 0 Url: http://dajaxproject.com Summary: Agnostic and easy to use ajax library for django License: BSD-3-Clause and LGPL-2.1+ and SUSE-Public-Domain Group: Development/Languages/Python Source: https://github.com/downloads/jorgebastida/django-dajaxice/django-dajaxice-0… BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-django BuildRequires: python-Sphinx Requires: python-django %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description Easy to use AJAX library for django, all the presentation logic resides outside the views and doesn't require any JS Framework. Dajaxice uses the unobtrusive standard-compliant (W3C) XMLHttpRequest 1.0 object. %prep %setup -q -n django-dajaxice-%{version} %build python setup.py build cd docs && make html && rm -r _build/html/.buildinfo %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root,-) %doc CHANGELOG COPYING README examples docs/_build/html %{python_sitelib}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-distribute for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package python-distribute for openSUSE:Factory checked in at 2012-03-01 17:26:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-distribute (Old) and /work/SRC/openSUSE:Factory/.python-distribute.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-distribute", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-distribute/python-distribute.changes 2011-11-25 10:13:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-distribute.new/python-distribute.changes 2012-03-01 17:26:32.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 20 11:32:36 UTC 2012 - saschpe(a)suse.de + +- Set license to SDPX style +- Remove *.exe files from sitelib + +------------------------------------------------------------------- New Changes file: --- /dev/null 2012-02-28 22:35:32.095577906 +0100 +++ /work/SRC/openSUSE:Factory/.python-distribute.new/python3-distribute.changes 2012-03-01 17:26:32.000000000 +0100 @@ -0,0 +1,12 @@ +------------------------------------------------------------------- +Mon Feb 20 11:31:49 UTC 2012 - saschpe(a)suse.de + +- Add provides/obsoletes for python3-setuptools just to be safe +- Package documentation and easy_install binary +- Fix rpmlint issues +- Set SDPX-style license + +------------------------------------------------------------------- +Wed Nov 23 01:15:54 UTC 2011 - termim(a)gmail.com + +- add python3 spec file New: ---- python3-distribute.changes python3-distribute.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-distribute.spec ++++++ --- /var/tmp/diff_new_pack.oRVXOb/_old 2012-03-01 17:26:33.000000000 +0100 +++ /var/tmp/diff_new_pack.oRVXOb/_new 2012-03-01 17:26:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-distribute # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,27 +16,23 @@ # - Name: python-distribute Version: 0.6.24 Release: 0 Url: http://packages.python.org/distribute Summary: Easily download, build, install, upgrade, and uninstall Python packages -License: PSF or ZPL +License: Python-2.0 or ZPL-2.0 Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/d/distribute/distribute-%{version}.t… BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1110 +Provides: python-setuptools = %{version} +Obsoletes: python-setuptools < %{version} +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else BuildArch: noarch %endif -%endif -Conflicts: python-setuptools < %{version} -Obsoletes: python-setuptools < %{version} -Provides: python-setuptools = %{version} -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description Distribute is a fork of the Setuptools project. @@ -55,6 +51,7 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} rm -rf %{buildroot}%{python_sitelib}/setuptools/tests # Don't install tests +rm -rf %{buildroot}%{python_sitelib}/setuptools/*.exe # Remove unneeded files %check python setup.py test ++++++ python3-distribute.spec ++++++ # # spec file for package python3-distribute # # Copyright (c) 2012 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/ # Name: python3-distribute Version: 0.6.24 Release: 0 Url: http://packages.python.org/distribute Summary: Easily download, build, install, upgrade, and uninstall Python packages License: Python-2.0 or ZPL-2.0 Group: Development/Languages/Python Source: distribute-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python3 BuildRequires: python3-2to3 BuildRequires: python3-devel Provides: python3-setuptools = %{version} Obsoletes: python3-setuptools < %{version} BuildArch: noarch %description Distribute is a fork of the Setuptools project. Distribute is intended to replace Setuptools as the standard method for working with Python module distributions. %prep %setup -q -n distribute-%{version} %build python3 setup.py build rm -f distribute.egg-info/*.orig chmod -x {.,docs}/*.txt # Fix executable bits for documentation %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} rm -rf %{buildroot}%{python3_sitelib}/setuptools/tests # Don't install tests rm -rf %{buildroot}%{python3_sitelib}/setuptools/*.exe # Remove unneeded files %check python3 setup.py test %files %defattr(-,root,root,-) %doc docs/*.txt CHANGES.txt CONTRIBUTORS.txt DEVGUIDE.txt README.txt %{_bindir}/easy_install* %{python3_sitelib}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pymol for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package pymol for openSUSE:Factory checked in at 2012-03-01 17:26:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pymol (Old) and /work/SRC/openSUSE:Factory/.pymol.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pymol", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/pymol/pymol.changes 2011-11-14 13:30:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pymol.new/pymol.changes 2012-03-01 17:26:25.000000000 +0100 @@ -1,0 +2,44 @@ +Sat Feb 18 23:44:14 UTC 2012 - dhall(a)wustl.edu + +- update to 1.5.0.2 + * stack trace when saving movie as MPEG (ID: 3488608) + * error loading from pse that don't have Crystal/Symmetry info (ID: 3488609) + +------------------------------------------------------------------- +Mon Feb 13 22:41:59 UTC 2012 - dhall(a)wustl.edu + +- update to 1.5.0.1 release + * improved rendering Performance + * improved rendering Quality + * bg_gradient now ray traces + * improved cartoon support for non-standard nucleotides + * surface color smoothing + * surface-based picking + * frame buffer-based antialiasing for real-time rendering + * optimized anaglyph colors and intensities for an improved 3D + viewing experience + * real-time and ray-traceable ambient occlusion + * molecular weight calculuations; A > Compute > Molceular Weight + * selection generation A > Generate > Selection + * new mouse mode for repositioning lights + * many bug fixes + +------------------------------------------------------------------- +Fri Feb 10 08:54:07 UTC 2012 - cfarrell(a)suse.com + +- license update: Python-2.0 + Use the SPDX identifier (http://www.spdx.org/licenses) + +------------------------------------------------------------------- +Wed Jan 4 20:21:01 UTC 2012 - dhall(a)wustl.edu + +- update to svn rev 3975 + * improved callback rendering + * fixed object creation when merging two objects + * fixed get_mass + * fixed create to reorder IDs when combining objects + * Cleaned up 'fitting.py' + * alignto updated; can now take a method for alignment + * cealign updated; made faster and cleaner + +------------------------------------------------------------------- Old: ---- pymol-1.4.1.svn3971.tar.bz2 New: ---- pymol-1.5.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pymol.spec ++++++ --- /var/tmp/diff_new_pack.PoFEoG/_old 2012-03-01 17:26:27.000000000 +0100 +++ /var/tmp/diff_new_pack.PoFEoG/_new 2012-03-01 17:26:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pymol # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -18,11 +18,11 @@ Name: pymol -Version: 1.4.1.svn3971 +Version: 1.5.0.2 Release: 0 Url: http://pymol.org Summary: A Molecular Viewer -License: CNRI Python License +License: Python-2.0 Group: Productivity/Scientific/Chemistry Source: %{name}-%{version}.tar.bz2 Patch0: 1_rpmroot.patch @@ -63,10 +63,9 @@ sed -i "1d" modules/pmg_tk/startup/apbs_tools.py # Remove she-bang line %build -CFLAGS="%{optflags}" python setup.py build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +CFLAGS="%{optflags}" python setup.py install --prefix=%{_prefix} --root=%{buildroot} PYTHONPATH=%{buildroot}%{py_sitedir} python setup2.py install --root=%{buildroot} install -D pymol %{buildroot}%{_bindir}/pymol %if 0%{?suse_version} > 1010 ++++++ 1_rpmroot.patch ++++++ --- /var/tmp/diff_new_pack.PoFEoG/_old 2012-03-01 17:26:27.000000000 +0100 +++ /var/tmp/diff_new_pack.PoFEoG/_new 2012-03-01 17:26:27.000000000 +0100 @@ -1,13 +1,9 @@ ---- setup2.py.orig 2009-04-17 09:57:26.887027924 +0200 -+++ setup2.py 2009-04-17 11:57:39.835033241 +0200 -@@ -36,16 +36,24 @@ - else: +--- setup2.py 2012-02-13 13:51:22.000000000 -0500 ++++ setup2.py 2012-02-14 11:06:16.052599028 -0500 +@@ -37,12 +37,19 @@ uninstall = 0 -+ try: - pymol_launch = 3 - import pymol + import getopt if not (os.path.exists("data") and os.path.exists("LICENSE")): @@ -18,14 +14,13 @@ + for opt, arg in opts: + if opt in ("-r", "--root"): + rpm_root = arg - pymol_file = sys.modules['pymol'].__file__ - if pymol_file[-4:]==".pyc": - pymol_file = pymol_file[0:-1] -+ inst_pymol_file = re.sub("^" + rpm_root,"/",pymol_file) + from setup3 import site_packages + pymol_file = os.path.join(site_packages, 'pymol', '__init__.py') ++ inst_pymol_file = re.sub("^" + rpm_root,"",pymol_file) + pymol_path = os.path.join(site_packages, 'pymol', 'pymol_path') - site_packages = os.path.split(os.path.split(pymol_file)[0])[0] - -@@ -107,7 +115,7 @@ + if uninstall: +@@ -101,7 +108,7 @@ if python_exe[0:2]=="./": python_exe=os.getcwd()+"/"+python_exe[2:] if sys.platform!='win32': ++++++ pymol-1.4.1.svn3971.tar.bz2 -> pymol-1.5.0.2.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/pymol/pymol-1.4.1.svn3971.tar.bz2 /work/SRC/openSUSE:Factory/.pymol.new/pymol-1.5.0.2.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit procmeter for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package procmeter for openSUSE:Factory checked in at 2012-03-01 17:26:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/procmeter (Old) and /work/SRC/openSUSE:Factory/.procmeter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "procmeter", Maintainer is "PNemec(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/procmeter/procmeter.changes 2012-01-26 14:08:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.procmeter.new/procmeter.changes 2012-03-01 17:26:18.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 21 21:17:54 UTC 2012 - dimstar(a)opensuse.org + +- Add libX11-devel, libXaw-devel and libXt-devel BuildRequires on + openSUSE > 12.1 to cater for the reorganization of xorg-x11 + packages. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procmeter.spec ++++++ --- /var/tmp/diff_new_pack.PYKfnF/_old 2012-03-01 17:26:19.000000000 +0100 +++ /var/tmp/diff_new_pack.PYKfnF/_new 2012-03-01 17:26:19.000000000 +0100 @@ -31,6 +31,11 @@ BuildRequires: gtk3-devel %endif BuildRequires: libsensors4-devel +%if 0%{?suse_version} > 1210 +BuildRequires: libX11-devel +BuildRequires: libXaw-devel +BuildRequires: libXt-devel +%endif BuildRequires: update-desktop-files Provides: procmtr Obsoletes: procmtr -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit postfix for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package postfix for openSUSE:Factory checked in at 2012-03-01 17:26:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postfix (Old) and /work/SRC/openSUSE:Factory/.postfix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postfix", Maintainer is "varkoly(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/postfix/postfix.changes 2012-01-26 16:00:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix.changes 2012-03-01 17:26:14.000000000 +0100 @@ -1,0 +2,29 @@ +Mon Feb 27 16:35:56 UTC 2012 - chris(a)computersalat.de + +- update to 2.8.8 + Bugfixes: + tlsproxy(8) stored TLS sessions with a serverID of + "tlsproxy" instead of "smtpd", wasting an opportunity for + session reuse. File: tlsproxy/tlsproxy.c. + missing lookup table entry and terminator, causing + proxymap server segfault when postscreen(8) or verify(8) + attempted to access their cache via the proxymap server. + This could never have worked anyway, because the Postfix + 2.8 proxymap protocol does not support cache cleanup. File + util/dict.c. + the Postfix client sqlite + quoting routine returned the unquoted result instead of the + quoted text. The opportunities for misuse are limited, + because Postfix sqlite files are usually owned by root, and + Postfix daemons usually run with non-root privileges so + they can't corrupt the database. Problem reported by Rob + McGee (rob0). File: global/dict_sqlite.c. + the trace service did not + distinguish between notifications for a non-bounce or a + bounce message. This code pre-dates DSN support and should + have been updated when it was re-purposed to handle DSN + SUCCESS notifications. Problem reported by Sabahattin + Gucukoglu. File: bounce/bounce_trace_service.c. +- use latest VDA patch (2.8.5) + +------------------------------------------------------------------- Old: ---- postfix-2.8.7.tar.bz2 postfix-vda-v10-2.8.3.patch New: ---- postfix-2.8.8.tar.bz2 postfix-vda-v10-2.8.5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.6InkzV/_old 2012-03-01 17:26:16.000000000 +0100 +++ /var/tmp/diff_new_pack.6InkzV/_new 2012-03-01 17:26:16.000000000 +0100 @@ -20,7 +20,7 @@ Summary: A fast, secure, and flexible mailer License: IPL-1.0 Group: Productivity/Networking/Email/Servers -Version: 2.8.7 +Version: 2.8.8 Release: 0 Url: http://www.postfix.org/ Source: %{name}-%{version}.tar.bz2 @@ -35,7 +35,7 @@ Patch10: %{name}-2.8.3-main.cf.patch Patch11: %{name}-2.8.3-master.cf.patch Patch12: %{name}-2.8.3-post-install.patch -Patch20: %{name}-vda-v10-2.8.3.patch +Patch20: %{name}-vda-v10-2.8.5.patch Patch21: postfix-2.8.5-ssl-release-buffers.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq ++++++ postfix-2.8.7.tar.bz2 -> postfix-2.8.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/HISTORY new/postfix-2.8.8/HISTORY --- old/postfix-2.8.7/HISTORY 2011-11-05 20:16:53.000000000 +0100 +++ new/postfix-2.8.8/HISTORY 2012-01-31 22:13:45.000000000 +0100 @@ -16695,3 +16695,55 @@ Portability: OpenBSD 5.x is supported. Files: makedefs, util/sys_defs.h. + + Portability: Dovecot now officially supports more socket + types for its authentication server. File: + xsasl/xsasl_dovecot_server.c. + +20111126 + + Bitrot: changes in error reporting to the under-documented + OpenLDAP API. Problem reported by Quanah Gibson-Mount. Fix + by Viktor Dukhovni. File: global/dict_ldap.c. + +20111205 + + Bugfix: tlsproxy(8) stored TLS sessions with a serverID of + "tlsproxy" instead of "smtpd", wasting an opportunity for + session reuse. File: tlsproxy/tlsproxy.c. + +20111211 + + Bugfix: missing lookup table entry and terminator, causing + proxymap server segfault when postscreen(8) or verify(8) + attempted to access their cache via the proxymap server. + This could never have worked anyway, because the Postfix + 2.8 proxymap protocol does not support cache cleanup. File + util/dict.c. + +20111226 + + Bugfix (introduced 20110426): after lookup error with + mailbox_transport_maps, mailbox_command_maps or + fallback_transport_maps, the local delivery agent did not + log the problem before deferring mail, and produced no defer + logfile record. Files: local/mailbox.c, local/unknown.c. + +20120127 + + Bugfix (introduced: Postfix 2.8): the Postfix client sqlite + quoting routine returned the unquoted result instead of the + quoted text. The opportunities for misuse are limited, + because Postfix sqlite files are usually owned by root, and + Postfix daemons usually run with non-root privileges so + they can't corrupt the database. Problem reported by Rob + McGee (rob0). File: global/dict_sqlite.c. + +20120130 + + Bugfix (introduced: Postfix 2.3): the trace service did not + distinguish between notifications for a non-bounce or a + bounce message. This code pre-dates DSN support and should + have been updated when it was re-purposed to handle DSN + SUCCESS notifications. Problem reported by Sabahattin + Gucukoglu. File: bounce/bounce_trace_service.c. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/bounce/bounce_trace_service.c new/postfix-2.8.8/src/bounce/bounce_trace_service.c --- old/postfix-2.8.7/src/bounce/bounce_trace_service.c 2009-04-28 19:27:43.000000000 +0200 +++ new/postfix-2.8.8/src/bounce/bounce_trace_service.c 2012-01-31 02:49:54.000000000 +0100 @@ -83,8 +83,39 @@ BOUNCE_INFO *bounce_info; int bounce_status = 1; VSTREAM *bounce; - VSTRING *new_id = vstring_alloc(10); + int notify_mask = name_mask(VAR_NOTIFY_CLASSES, mail_error_masks, + var_notify_classes); + VSTRING *new_id; int count; + const char *sender; + + /* + * For consistency with fail/delay notifications, send notification for a + * non-bounce message as a single-bounce message, send notification for a + * single-bounce message as a double-bounce message, and drop requests to + * send notification for a double-bounce message. + */ +#define NULL_SENDER MAIL_ADDR_EMPTY /* special address */ + + if (strcasecmp(recipient, mail_addr_double_bounce()) == 0) { + msg_info("%s: not sending trace/success notification for " + "double-bounce message", queue_id); + return (0); + } else if (*recipient == 0) { + if ((notify_mask & MAIL_ERROR_2BOUNCE) != 0) { + recipient = var_2bounce_rcpt; + sender = mail_addr_double_bounce(); + } else { + msg_info("%s: not sending trace/success notification " + "for single-bounce message", queue_id); + if (mail_queue_remove(service, queue_id) && errno != ENOENT) + msg_fatal("remove %s %s: %m", service, queue_id); + return (0); + } + } else { + /* Always send notification for non-bounce message. */ + sender = NULL_SENDER; + } /* * Initialize. Open queue file, bounce log, etc. @@ -126,7 +157,6 @@ bounce_mail_free(bounce_info); return (0); } -#define NULL_SENDER MAIL_ADDR_EMPTY /* special address */ #define NULL_TRACE_FLAGS 0 /* @@ -139,7 +169,8 @@ * there are fewer potential left-over files to remove up when we create * a new queue file. */ - if ((bounce = post_mail_fopen_nowait(NULL_SENDER, recipient, + new_id = vstring_alloc(10); + if ((bounce = post_mail_fopen_nowait(sender, recipient, INT_FILT_MASK_BOUNCE, NULL_TRACE_FLAGS, new_id)) != 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/global/dict_ldap.c new/postfix-2.8.8/src/global/dict_ldap.c --- old/postfix-2.8.7/src/global/dict_ldap.c 2010-12-06 14:20:11.000000000 +0100 +++ new/postfix-2.8.8/src/global/dict_ldap.c 2012-01-31 22:26:42.000000000 +0100 @@ -225,6 +225,7 @@ #include "mail_conf.h" #if defined(USE_LDAP_SASL) && defined(LDAP_API_FEATURE_X_OPENLDAP) + /* * SASL headers, for sasl_interact_t. Either SASL v1 or v2 should be fine. */ @@ -242,13 +243,13 @@ #define DICT_LDAP_DO_SASL(d) ((d)->bind == DICT_LDAP_BIND_SASL) static const NAME_CODE bindopt_table[] = { - CONFIG_BOOL_NO, DICT_LDAP_BIND_NONE, - "none", DICT_LDAP_BIND_NONE, - CONFIG_BOOL_YES, DICT_LDAP_BIND_SIMPLE, - "simple", DICT_LDAP_BIND_SIMPLE, + CONFIG_BOOL_NO, DICT_LDAP_BIND_NONE, + "none", DICT_LDAP_BIND_NONE, + CONFIG_BOOL_YES, DICT_LDAP_BIND_SIMPLE, + "simple", DICT_LDAP_BIND_SIMPLE, #ifdef LDAP_API_FEATURE_X_OPENLDAP #if defined(USE_LDAP_SASL) - "sasl", DICT_LDAP_BIND_SASL, + "sasl", DICT_LDAP_BIND_SASL, #endif #endif 0, -1, @@ -292,9 +293,9 @@ #ifdef LDAP_API_FEATURE_X_OPENLDAP #if defined(USE_LDAP_SASL) int sasl; - char *sasl_mechs; - char *sasl_realm; - char *sasl_authz; + char *sasl_mechs; + char *sasl_realm; + char *sasl_authz; int sasl_minssf; #endif int ldap_ssl; @@ -451,28 +452,26 @@ } #if defined(USE_LDAP_SASL) && defined(LDAP_API_FEATURE_X_OPENLDAP) + /* * Context structure for SASL property callback. */ typedef struct bind_props { - char *authcid; - char *passwd; - char *realm; - char *authzid; + char *authcid; + char *passwd; + char *realm; + char *authzid; } bind_props; -static int -ldap_b2_interact(LDAP *ld, unsigned flags, void *props, void *inter) +static int ldap_b2_interact(LDAP *ld, unsigned flags, void *props, void *inter) { sasl_interact_t *in; - bind_props *ctx = (bind_props *)props; + bind_props *ctx = (bind_props *) props; - for (in = inter; in->id != SASL_CB_LIST_END; in++) - { + for (in = inter; in->id != SASL_CB_LIST_END; in++) { in->result = NULL; - switch(in->id) - { + switch (in->id) { case SASL_CB_GETREALM: in->result = ctx->realm; break; @@ -491,6 +490,7 @@ } return LDAP_SUCCESS; } + #endif /* dict_ldap_result - Read and parse LDAP result */ @@ -498,6 +498,7 @@ static int dict_ldap_result(LDAP *ld, int msgid, int timeout, LDAPMessage **res) { struct timeval mytimeval; + int err; mytimeval.tv_sec = timeout; mytimeval.tv_usec = 0; @@ -506,9 +507,12 @@ if (ldap_result(ld, msgid, GET_ALL, &mytimeval, res) == -1) return (dict_ldap_get_errno(ld)); - if (dict_ldap_get_errno(ld) == LDAP_TIMEOUT) { - (void) dict_ldap_abandon(ld, msgid); - return (dict_ldap_set_errno(ld, LDAP_TIMEOUT)); + if ((err = dict_ldap_get_errno(ld)) != LDAP_SUCCESS) { + if (err == LDAP_TIMEOUT) { + (void) dict_ldap_abandon(ld, msgid); + return (dict_ldap_set_errno(ld, LDAP_TIMEOUT)); + } + return err; } return LDAP_SUCCESS; } @@ -529,7 +533,7 @@ vstring_sprintf(minssf, "minssf=%d", dict_ldap->sasl_minssf); if ((rc = ldap_set_option(dict_ldap->ld, LDAP_OPT_X_SASL_SECPROPS, - (char *) minssf)) != LDAP_OPT_SUCCESS) + (char *) minssf)) != LDAP_OPT_SUCCESS) return (rc); props.authcid = dict_ldap->bind_dn; @@ -538,13 +542,14 @@ props.authzid = dict_ldap->sasl_authz; if ((rc = ldap_sasl_interactive_bind_s(dict_ldap->ld, NULL, - dict_ldap->sasl_mechs, NULL, NULL, - LDAP_SASL_QUIET, ldap_b2_interact, - &props)) != LDAP_SUCCESS) + dict_ldap->sasl_mechs, NULL, NULL, + LDAP_SASL_QUIET, ldap_b2_interact, + &props)) != LDAP_SUCCESS) return (rc); return (LDAP_SUCCESS); } + #endif /* dict_ldap_bind_st - Synchronous simple auth with timeout */ @@ -552,6 +557,7 @@ static int dict_ldap_bind_st(DICT_LDAP *dict_ldap) { int rc; + int err = LDAP_SUCCESS; int msgid; LDAPMessage *res; struct berval cred; @@ -567,7 +573,8 @@ return (rc); #define FREE_RESULT 1 - return (ldap_parse_sasl_bind_result(dict_ldap->ld, res, 0, FREE_RESULT)); + rc = ldap_parse_result(dict_ldap->ld, res, &err, 0, 0, 0, 0, FREE_RESULT); + return (rc == LDAP_SUCCESS ? err : rc); } /* search_st - Synchronous search with timeout */ @@ -868,6 +875,7 @@ #define DN_LOG_VAL(dict_ldap) \ ((dict_ldap)->bind_dn[0] ? (dict_ldap)->bind_dn : "empty or implicit") + /* * If this server requires a bind, do so. Thanks to Sam Tardieu for * noticing that the original bind call was broken. @@ -1873,6 +1881,7 @@ #ifdef LDAP_API_FEATURE_X_OPENLDAP #if defined(USE_LDAP_SASL) + /* * SASL options */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/global/dict_sqlite.c new/postfix-2.8.8/src/global/dict_sqlite.c --- old/postfix-2.8.7/src/global/dict_sqlite.c 2010-09-09 17:01:12.000000000 +0200 +++ new/postfix-2.8.8/src/global/dict_sqlite.c 2012-01-27 21:04:41.000000000 +0100 @@ -57,6 +57,12 @@ /* AUTHOR(S) /* Axel Steiner /* ast(a)treibsand.com +/* +/* Adopted and updated by: +/* Wietse Venema +/* IBM T.J. Watson Research +/* P.O. Box 704 +/* Yorktown Heights, NY 10598, USA /*--*/ /* System library. */ @@ -109,7 +115,7 @@ /* Fix 20100616 */ if (quoted_text == 0) msg_fatal("dict_sqlite_quote: out of memory"); - vstring_strcat(result, raw_text); + vstring_strcat(result, quoted_text); sqlite3_free(quoted_text); } @@ -151,6 +157,11 @@ int status; /* + * In case of return without lookup (skipped key, etc.). + */ + dict_errno = 0; + + /* * Don't frustrate future attempts to make Postfix UTF-8 transparent. */ if (!valid_utf_8(name, strlen(name))) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/global/mail_version.h new/postfix-2.8.8/src/global/mail_version.h --- old/postfix-2.8.7/src/global/mail_version.h 2011-11-05 20:17:13.000000000 +0100 +++ new/postfix-2.8.8/src/global/mail_version.h 2012-02-01 20:18:16.000000000 +0100 @@ -20,8 +20,8 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20111105" -#define MAIL_VERSION_NUMBER "2.8.7" +#define MAIL_RELEASE_DATE "20120201" +#define MAIL_VERSION_NUMBER "2.8.8" #ifdef SNAPSHOT # define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/global/maps.c new/postfix-2.8.8/src/global/maps.c --- old/postfix-2.8.7/src/global/maps.c 2006-06-15 20:07:15.000000000 +0200 +++ new/postfix-2.8.8/src/global/maps.c 2011-12-27 01:46:44.000000000 +0100 @@ -164,6 +164,11 @@ DICT *dict; /* + * In case of return without map lookup (empty name or no maps). + */ + dict_errno = 0; + + /* * Temp. workaround, for buggy callers that pass zero-length keys when * given partial addresses. */ @@ -189,6 +194,7 @@ *map_name, name, expansion); return (expansion); } else if (dict_errno != 0) { + msg_warn("%s:%s lookup of %s failed", dict->type, dict->name, name); break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/local/mailbox.c new/postfix-2.8.8/src/local/mailbox.c --- old/postfix-2.8.7/src/local/mailbox.c 2011-04-26 21:12:46.000000000 +0200 +++ new/postfix-2.8.8/src/local/mailbox.c 2011-12-25 21:15:55.000000000 +0100 @@ -289,7 +289,8 @@ } else if (dict_errno != 0) { /* Details in the logfile. */ dsb_simple(state.msg_attr.why, "4.3.0", "table lookup failure"); - *statusp = DEL_STAT_DEFER; + *statusp = defer_append(BOUNCE_FLAGS(state.request), + BOUNCE_ATTR(state.msg_attr)); return (YES); } if (*var_mailbox_transport) { @@ -333,7 +334,8 @@ } else if (dict_errno != 0) { /* Details in the logfile. */ dsb_simple(state.msg_attr.why, "4.3.0", "table lookup failure"); - status = DEL_STAT_DEFER; + status = defer_append(BOUNCE_FLAGS(state.request), + BOUNCE_ATTR(state.msg_attr)); } else if (*var_mailbox_command) { status = deliver_command(state, usr_attr, var_mailbox_command); } else if (*var_home_mailbox && LAST_CHAR(var_home_mailbox) == '/') { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/local/unknown.c new/postfix-2.8.8/src/local/unknown.c --- old/postfix-2.8.7/src/local/unknown.c 2011-04-26 21:11:43.000000000 +0200 +++ new/postfix-2.8.8/src/local/unknown.c 2011-12-25 21:16:15.000000000 +0100 @@ -120,7 +120,8 @@ } else if (dict_errno != 0) { /* Details in the logfile. */ dsb_simple(state.msg_attr.why, "4.3.0", "table lookup failure"); - return (DEL_STAT_DEFER); + return (defer_append(BOUNCE_FLAGS(state.request), + BOUNCE_ATTR(state.msg_attr))); } if (*var_fallback_transport) { state.msg_attr.rcpt.offset = -1L; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/tlsproxy/tlsproxy.c new/postfix-2.8.8/src/tlsproxy/tlsproxy.c --- old/postfix-2.8.7/src/tlsproxy/tlsproxy.c 2011-02-07 16:32:28.000000000 +0100 +++ new/postfix-2.8.8/src/tlsproxy/tlsproxy.c 2011-12-06 01:28:55.000000000 +0100 @@ -692,7 +692,7 @@ timeout = 0, /* unused */ requirecert = (var_tlsp_tls_req_ccert && var_tlsp_enforce_tls), - serverid = state->service, + serverid = MAIL_SERVICE_SMTPD, /* XXX */ namaddr = state->remote_endpt, cipher_grade = cipher_grade, cipher_exclusions = STR(cipher_exclusions), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/util/dict.c new/postfix-2.8.8/src/util/dict.c --- old/postfix-2.8.7/src/util/dict.c 2010-09-08 23:23:24.000000000 +0200 +++ new/postfix-2.8.8/src/util/dict.c 2011-12-17 23:46:55.000000000 +0100 @@ -536,6 +536,8 @@ "no_unauth", (1 << 13), /* disallow unauthenticated data */ "fold_fix", (1 << 14), /* case-fold with fixed-case key map */ "fold_mul", (1 << 15), /* case-fold with multi-case key map */ + "open_lock", (1 << 16), /* permanent lock upon open */ + 0, }; /* dict_flags_str - convert mask to string for debugging purposes */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.7/src/xsasl/xsasl_dovecot_server.c new/postfix-2.8.8/src/xsasl/xsasl_dovecot_server.c --- old/postfix-2.8.7/src/xsasl/xsasl_dovecot_server.c 2010-12-31 02:19:44.000000000 +0100 +++ new/postfix-2.8.8/src/xsasl/xsasl_dovecot_server.c 2011-11-17 22:53:25.000000000 +0100 @@ -371,11 +371,6 @@ { XSASL_DOVECOT_SERVER_IMPL *xp; - if (strchr(path_info, '/') == 0) - msg_warn("when SASL type is \"%s\", SASL path \"%s\" " - "should be a socket pathname", - server_type, path_info); - xp = (XSASL_DOVECOT_SERVER_IMPL *) mymalloc(sizeof(*xp)); xp->xsasl.create = xsasl_dovecot_server_create; xp->xsasl.done = xsasl_dovecot_server_done; ++++++ postfix-vda-v10-2.8.3.patch -> postfix-vda-v10-2.8.5.patch ++++++ --- /work/SRC/openSUSE:Factory/postfix/postfix-vda-v10-2.8.3.patch 2011-09-23 12:41:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix-vda-v10-2.8.5.patch 2012-03-01 17:26:14.000000000 +0100 @@ -1,6 +1,6 @@ -diff -uNr postfix-2.8.3.orig/README_FILES/VDA_README postfix-2.8.3/README_FILES/VDA_README ---- postfix-2.8.3.orig/README_FILES/VDA_README 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.8.3/README_FILES/VDA_README 2011-03-03 08:26:48.000000000 +0100 +diff -uNr postfix-2.8.5.orig/README_FILES/VDA_README postfix-2.8.5/README_FILES/VDA_README +--- postfix-2.8.5.orig/README_FILES/VDA_README 1970-01-01 01:00:00.000000000 +0100 ++++ postfix-2.8.5/README_FILES/VDA_README 2011-03-03 08:26:48.000000000 +0100 @@ -0,0 +1,10 @@ +Postfix VDA patch for maildir++ quota support by + Anderson Nadal <andernadal(a)gmail.com> @@ -12,9 +12,9 @@ +provided by this patch. + + -diff -uNr postfix-2.8.3.orig/src/global/mail_params.h postfix-2.8.3/src/global/mail_params.h ---- postfix-2.8.3.orig/src/global/mail_params.h 2011-01-17 15:56:39.000000000 +0100 -+++ postfix-2.8.3/src/global/mail_params.h 2011-03-03 07:40:55.000000000 +0100 +diff -uNr postfix-2.8.5.orig/src/global/mail_params.h postfix-2.8.5/src/global/mail_params.h +--- postfix-2.8.5.orig/src/global/mail_params.h 2011-01-17 15:56:39.000000000 +0100 ++++ postfix-2.8.5/src/global/mail_params.h 2011-03-03 07:40:55.000000000 +0100 @@ -2333,6 +2333,54 @@ #define DEF_VIRT_GID_MAPS "" extern char *var_virt_gid_maps; @@ -70,9 +70,9 @@ #define VAR_VIRT_MINUID "virtual_minimum_uid" #define DEF_VIRT_MINUID 100 extern int var_virt_minimum_uid; -diff -uNr postfix-2.8.3.orig/src/util/file_limit.c postfix-2.8.3/src/util/file_limit.c ---- postfix-2.8.3.orig/src/util/file_limit.c 2003-10-22 20:48:36.000000000 +0200 -+++ postfix-2.8.3/src/util/file_limit.c 2011-03-03 07:40:55.000000000 +0100 +diff -uNr postfix-2.8.5.orig/src/util/file_limit.c postfix-2.8.5/src/util/file_limit.c +--- postfix-2.8.5.orig/src/util/file_limit.c 2003-10-22 20:48:36.000000000 +0200 ++++ postfix-2.8.5/src/util/file_limit.c 2011-03-03 07:40:55.000000000 +0100 @@ -85,7 +85,11 @@ #else struct rlimit rlim; @@ -86,9 +86,9 @@ if (setrlimit(RLIMIT_FSIZE, &rlim) < 0) msg_fatal("setrlimit: %m"); #ifdef SIGXFSZ -diff -uNr postfix-2.8.3.orig/src/virtual/mailbox.c postfix-2.8.3/src/virtual/mailbox.c ---- postfix-2.8.3.orig/src/virtual/mailbox.c 2008-07-26 03:22:37.000000000 +0200 -+++ postfix-2.8.3/src/virtual/mailbox.c 2011-03-03 07:40:55.000000000 +0100 +diff -uNr postfix-2.8.5.orig/src/virtual/mailbox.c postfix-2.8.5/src/virtual/mailbox.c +--- postfix-2.8.5.orig/src/virtual/mailbox.c 2008-07-26 03:22:37.000000000 +0200 ++++ postfix-2.8.5/src/virtual/mailbox.c 2011-03-03 07:40:55.000000000 +0100 @@ -70,6 +70,70 @@ #define YES 1 #define NO 0 @@ -268,9 +268,9 @@ /* * Cleanup. -diff -uNr postfix-2.8.3.orig/src/virtual/maildir.c postfix-2.8.3/src/virtual/maildir.c ---- postfix-2.8.3.orig/src/virtual/maildir.c 2006-06-26 14:59:19.000000000 +0200 -+++ postfix-2.8.3/src/virtual/maildir.c 2011-03-03 08:15:42.000000000 +0100 +diff -uNr postfix-2.8.5.orig/src/virtual/maildir.c postfix-2.8.5/src/virtual/maildir.c +--- postfix-2.8.5.orig/src/virtual/maildir.c 2006-06-26 14:59:19.000000000 +0200 ++++ postfix-2.8.5/src/virtual/maildir.c 2011-03-03 08:15:42.000000000 +0100 @@ -63,28 +63,420 @@ #include <mbox_open.h> #include <dsn_util.h> @@ -1256,9 +1256,9 @@ + return (deliver_status); } -diff -uNr postfix-2.8.3.orig/src/virtual/virtual.c postfix-2.8.3/src/virtual/virtual.c ---- postfix-2.8.3.orig/src/virtual/virtual.c 2010-01-02 02:57:04.000000000 +0100 -+++ postfix-2.8.3/src/virtual/virtual.c 2011-03-03 07:40:55.000000000 +0100 +diff -uNr postfix-2.8.5.orig/src/virtual/virtual.c postfix-2.8.5/src/virtual/virtual.c +--- postfix-2.8.5.orig/src/virtual/virtual.c 2010-01-02 02:57:04.000000000 +0100 ++++ postfix-2.8.5/src/virtual/virtual.c 2011-03-03 07:40:55.000000000 +0100 @@ -335,12 +335,30 @@ char *var_mail_spool_dir; /* XXX dependency fix */ bool var_strict_mbox_owner; @@ -1388,9 +1388,9 @@ MAIL_SERVER_PRIVILEGED, 0); } -diff -uNr postfix-2.8.3.orig/src/virtual/virtual.h postfix-2.8.3/src/virtual/virtual.h ---- postfix-2.8.3.orig/src/virtual/virtual.h 2006-01-08 00:59:47.000000000 +0100 -+++ postfix-2.8.3/src/virtual/virtual.h 2011-03-03 07:40:55.000000000 +0100 +diff -uNr postfix-2.8.5.orig/src/virtual/virtual.h postfix-2.8.5/src/virtual/virtual.h +--- postfix-2.8.5.orig/src/virtual/virtual.h 2006-01-08 00:59:47.000000000 +0100 ++++ postfix-2.8.5/src/virtual/virtual.h 2011-03-03 07:40:55.000000000 +0100 @@ -34,6 +34,9 @@ extern MAPS *virtual_mailbox_maps; extern MAPS *virtual_uid_maps; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0