May 2015 - openSUSE Commits - openSUSE Mailing Lists

commit evince for openSUSE:Factory
by root＠hilbert.suse.de 29 May '15

29 May '15

Hello community, here is the log from the commit of package evince for openSUSE:Factory checked in at 2015-05-29 09:45:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evince (Old) and /work/SRC/openSUSE:Factory/.evince.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "evince" Changes: -------- --- /work/SRC/openSUSE:Factory/evince/evince.changes 2015-04-10 09:45:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.evince.new/evince.changes 2015-05-29 09:45:09.000000000 +0200 @@ -1,0 +2,12 @@ +Wed May 27 10:21:04 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 3.16.1: + + Add accessible relations between the labels in properties + dialog (bgo#749127). + + Never save n-copies in the persistent print-settings file + (bgo#748549). + + Fix the background color of annotation popup windows + (bgo#732211). + + Updated translations. + +------------------------------------------------------------------- Old: ---- evince-3.16.0.tar.xz New: ---- evince-3.16.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evince.spec ++++++ --- /var/tmp/diff_new_pack.fhrh69/_old 2015-05-29 09:45:10.000000000 +0200 +++ /var/tmp/diff_new_pack.fhrh69/_new 2015-05-29 09:45:10.000000000 +0200 @@ -19,7 +19,7 @@ %define _major_version 3.0 %define pluginAPI 4 Name: evince -Version: 3.16.0 +Version: 3.16.1 Release: 0 Summary: GNOME Document Viewer License: GPL-2.0+ ++++++ evince-3.16.0.tar.xz -> evince-3.16.1.tar.xz ++++++ ++++ 11117 lines of diff (skipped)

1 0

commit hplip for openSUSE:Factory
by root＠hilbert.suse.de 29 May '15

29 May '15

Hello community, here is the log from the commit of package hplip for openSUSE:Factory checked in at 2015-05-29 09:44:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hplip (Old) and /work/SRC/openSUSE:Factory/.hplip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hplip" Changes: -------- --- /work/SRC/openSUSE:Factory/hplip/hplip.changes 2015-03-29 20:16:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hplip.new/hplip.changes 2015-05-29 09:44:02.000000000 +0200 @@ -1,0 +2,43 @@ +Tue May 19 17:04:45 CEST 2015 - jsmeix(a)suse.de + +- Disabled build for parallel port because parallel port support + was disabled by default by upstream HPLIP at least since 2011 + and is deprecated by upstream HPLIP since 2013, + see https://bugs.launchpad.net/bugs/750796 + and http://hplipopensource.com/node/217 + furthermore parallel port support gets more or less abandoned + by upstream projects in general, see "Parallel port printers" + at https://en.opensuse.org/SDB:Installing_a_Printer +- Version upgrade to 3.15.4: + Added Support for the Following New Printers: + HP Color LaserJet Pro M252dw + HP Color LaserJet Pro M252n + HP Color LaserJet Pro MFP M277n + HP Color LaserJet Pro MFP M277dw + HP Color LaserJet Enterprise M553n + HP Color LaserJet Enterprise M553dn + HP Color LaserJet Enterprise M553x + HP Color LaserJet Enterprise M553dh + HP Color LaserJet Enterprise M552dn + HP LaserJet Enterprise M604n + HP LaserJet Enterprise M604dn + HP LaserJet Enterprise M605dn + HP LaserJet Enterprise M605n + HP LaserJet Enterprise M605x + HP LaserJet Enterprise M606x + HP LaserJet Enterprise M606dn + Some bug fixes. + For details see + http://hplipopensource.com/hplip-web/release_notes.html +- add_missing_includes_and_define_GNU_SOURCE.patch adds + missing '#include <...>' and missing '#define _GNU_SOURCE' + see https://bugs.launchpad.net/hplip/+bug/1456590 +- Using again plain 'make' instead of 'make %{?_smp_mflags}' + (cf. the entry below dated "Sun Apr 20 09:48:39 UTC 2014") + and plain 'make ... install' instead of + 'make ... install %{?_smp_mflags}' to avoid random obscure + build failures with errors like "libtool: install: error: relink + `cupsext.la' with the above command before installing it", cf. + http://lists.gnu.org/archive/html/automake/2010-03/msg00039.html + +------------------------------------------------------------------- Old: ---- hplip-3.15.2.tar.gz hplip-3.15.2.tar.gz.asc New: ---- add_missing_includes_and_define_GNU_SOURCE.patch hplip-3.15.4.tar.gz hplip-3.15.4.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hplip.spec ++++++ --- /var/tmp/diff_new_pack.mvSzrc/_old 2015-05-29 09:44:04.000000000 +0200 +++ /var/tmp/diff_new_pack.mvSzrc/_new 2015-05-29 09:44:04.000000000 +0200 @@ -17,18 +17,18 @@ Name: hplip -Version: 3.15.2 +Version: 3.15.4 Release: 0 Summary: HP's Printing, Scanning, and Faxing Software License: BSD-3-Clause and GPL-2.0+ and MIT Group: Hardware/Printing Url: http://hplipopensource.com # Source0...Source9 is for sources from HP: -# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.14.10.tar.gz -# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.14.10.tar.gz.asc +# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.15.4.tar.gz +# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.15.4.tar.gz.asc # How to verify Source0 see: http://hplipopensource.com/node/327 # For example: /usr/bin/gpg --keyserver pgp.mit.edu --recv-keys 0xA59047B9 -# /usr/bin/gpg --verify hplip-3.14.10.tar.gz.asc hplip-3.14.10.tar.gz +# /usr/bin/gpg --verify hplip-3.15.4.tar.gz.asc hplip-3.15.4.tar.gz # must result: Good signature from "HPLIP (HP Linux Imaging and Printing) <hplip(a)hp.com>" Source0: http://prdownloads.sourceforge.net/hplip/hplip-%{version}.tar.gz Source1: http://prdownloads.sourceforge.net/hplip/hplip-%{version}.tar.gz.asc @@ -81,6 +81,9 @@ Patch106: disable_hp-upgrade.patch # PATCH-FIX-SUSE: use proper udev rulesdir which is in usr not in /etc Patch107: hplip-udev-rules-in-usr.patch +# Patch108 add_missing_includes_and_define_GNU_SOURCE.patch adds missing '#include <...>' +# and missing '#define _GNU_SOURCE' see https://bugs.launchpad.net/hplip/+bug/1456590 +Patch108: add_missing_includes_and_define_GNU_SOURCE.patch # HPLIP's Python module cupsext.so has a build-time dependancy on the CUPS version: # It needs symbols (like ippFirstAttribute, ippNextAttribute, ippSetOperation etc) # that are defined only in libcups.so version > 1.5. For backward compatibility @@ -394,6 +397,9 @@ # To upgrade HPLIP an openSUSE software package manager like YaST or zypper should be used. %patch106 -b .disable_hp-upgrade.orig %patch107 -p1 -b .udev_rules_dir.orig +# Patch108 add_missing_includes_and_define_GNU_SOURCE.patch adds missing '#include <...>' +# and missing '#define _GNU_SOURCE' see https://bugs.launchpad.net/hplip/+bug/1456590 +%patch108 -b .add_missing_includes_and_define_GNU_SOURCE.orig %build # If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake) @@ -403,6 +409,8 @@ # Set our preferred architecture-specific flags for the compiler and linker: export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags} -fno-strict-aliasing" +# --disable-pp-build disables parallel port build because parallel port support is deprecated by upstream HPLIP +# and by upstream in general cf. "Parallel port printers" at https://en.opensuse.org/SDB:Installing_a_Printer # Static "hpijs" PPD files via enable-foomatic-ppd-install # require foomatic-rip-hplip via their cupsFilter entries # so that enable-foomatic-rip-hplip-install is also needed. @@ -435,7 +443,7 @@ --disable-policykit \ --enable-doc-build \ --enable-network-build \ - --enable-pp-build \ + --disable-pp-build \ --enable-scan-build \ --enable-gui-build \ --enable-fax-build \ @@ -454,10 +462,10 @@ --with-mimedir=%{_sysconfdir}/cups \ --with-docdir=%{_defaultdocdir}/%{name} \ --with-htmldir==%{_defaultdocdir}/%{name} -make %{?_smp_mflags} +make %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +make DESTDIR=%{buildroot} install # Make and install Python compiled bytecode files # (.pyc compiled python and .pyo optimized compiled python) # because normal users do not have write permissions @@ -768,6 +776,7 @@ %{_bindir}/hpijs %doc %{_mandir}/man1/hpijs.1.gz %{_libdir}/libhpip.so.* +%{_libdir}/libhpipp.so.* %{_libdir}/libhpmud.so.* %dir %{_libexecdir}/cups %dir %{_libexecdir}/cups/backend @@ -800,6 +809,7 @@ %files devel %defattr(-, root, root) %{_libdir}/libhpip.so +%{_libdir}/libhpipp.so %{_libdir}/libhpmud.so %{_libdir}/*.la %{_libdir}/sane/libsane-hpaio.so ++++++ add_missing_includes_and_define_GNU_SOURCE.patch ++++++ --- protocol/hp_ipp.c.orig 2015-04-14 11:53:09.000000000 +0200 +++ protocol/hp_ipp.c 2015-05-19 13:12:47.000000000 +0200 @@ -18,6 +18,9 @@ Boston, MA 02110-1301, USA. \******************************************************************************/ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif #include <cups/cups.h> #include <cups/language.h> --- scan/sane/sclpml.c.orig 2015-04-14 11:53:17.000000000 +0200 +++ scan/sane/sclpml.c 2015-05-19 13:45:44.000000000 +0200 @@ -25,11 +25,16 @@ \************************************************************************************/ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif + #include <stdio.h> #include <string.h> #include <unistd.h> #include <fcntl.h> #include <string.h> +#include <sys/time.h> #include "sane.h" #include "saneopts.h" #include "common.h" --- scan/sane/bb_ledm.c.orig 2015-05-19 13:47:53.000000000 +0200 +++ scan/sane/bb_ledm.c 2015-05-19 13:48:42.000000000 +0200 @@ -26,7 +26,7 @@ # include "http.h" # include "xml.h" # include <stdlib.h> - +# include <unistd.h> # include <stdint.h> # define _STRINGIZE(x) #x --- scan/sane/hpaio.c.orig 2015-04-14 11:53:17.000000000 +0200 +++ scan/sane/hpaio.c 2015-05-19 13:51:21.000000000 +0200 @@ -43,6 +43,7 @@ #include "hpaio.h" # include "ledm.h" #include "sclpml.h" +#include "io.h" #define DEBUG_DECLARE_ONLY #include "sanei_debug.h" --- io/hpmud/jd.c.orig 2015-05-19 13:46:39.000000000 +0200 +++ io/hpmud/jd.c 2015-05-19 13:47:01.000000000 +0200 @@ -31,6 +31,7 @@ #endif #include <signal.h> +#include <stdlib.h> #include "hpmud.h" #include "hpmudi.h" ++++++ hplip-3.15.2.tar.gz -> hplip-3.15.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/hplip/hplip-3.15.2.tar.gz /work/SRC/openSUSE:Factory/.hplip.new/hplip-3.15.4.tar.gz differ: char 5, line 1

1 0

commit cpphs for openSUSE:Factory
by root＠hilbert.suse.de 28 May '15

28 May '15

Hello community, here is the log from the commit of package cpphs for openSUSE:Factory checked in at 2015-05-28 09:58:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cpphs (Old) and /work/SRC/openSUSE:Factory/.cpphs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cpphs" Changes: -------- --- /work/SRC/openSUSE:Factory/cpphs/cpphs.changes 2015-05-21 08:14:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cpphs.new/cpphs.changes 2015-05-28 09:58:30.000000000 +0200 @@ -1,0 +2,10 @@ +Thu May 28 06:21:30 UTC 2015 - mimi.vx(a)gmail.com + +- correct license + +------------------------------------------------------------------- +Thu May 14 11:59:15 UTC 2015 - mimi.vx(a)gmail.com + +- regenerated spec with cabal-rpm + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cpphs.spec ++++++ --- /var/tmp/diff_new_pack.OUaKV2/_old 2015-05-28 09:58:31.000000000 +0200 +++ /var/tmp/diff_new_pack.OUaKV2/_new 2015-05-28 09:58:31.000000000 +0200 @@ -17,93 +17,80 @@ %global pkg_name cpphs -# no useful debuginfo for Haskell packages without C sources -%global debug_package %{nil} + Name: cpphs Version: 1.19 Release: 0 Summary: A liberalised re-implementation of cpp, the C pre-processor -License: GPL-2.0 +License: GPL-2.0+ Group: Development/Languages/Other -Url: http://hackage.haskell.org/package/%{name} -Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{ve… + +Url: https://hackage.haskell.org/package/%{name} +Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.t… +BuildRoot: %{_tmppath}/%{name}-%{version}-build + BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-directory-devel BuildRequires: ghc-old-locale-devel BuildRequires: ghc-old-time-devel BuildRequires: ghc-polyparse-devel -BuildRequires: ghc-rpm-macros -BuildRoot: %{_tmppath}/%{name}-%{version}-build # End cabal-rpm deps %description -Cpphs is a re-implementation of the C pre-processor that is both -more compatible with Haskell, and itself written in Haskell so -that it can be distributed with compilers. - -This version of the C pre-processor is pretty-much -feature-complete and compatible with traditional (K&R) -pre-processors. Additional features include: a plain-text mode; -an option to unlit literate code files; and an option to turn -off macro-expansion. +Cpphs is a re-implementation of the C pre-processor that is both more +compatible with Haskell, and itself written in Haskell so that it can be +distributed with compilers. + +This version of the C pre-processor is pretty-much feature-complete and +compatible with traditional (K&R) pre-processors. Additional features include: +a plain-text mode; an option to unlit literate code files; and an option to +turn off macro-expansion. + %package -n ghc-%{name} Summary: Haskell %{name} library -Group: Development/Languages/Other License: LGPL-2.1 +Group: System/Libraries %description -n ghc-%{name} -Cpphs is a re-implementation of the C pre-processor that is both -more compatible with Haskell, and itself written in Haskell so -that it can be distributed with compilers. - -This version of the C pre-processor is pretty-much -feature-complete and compatible with traditional (K&R) -pre-processors. Additional features include: a plain-text mode; -an option to unlit literate code files; and an option to turn -off macro-expansion. +This package provides the Haskell %{name} shared library. + %package -n ghc-%{name}-devel Summary: Haskell %{name} library development files -Group: Development/Languages/Other License: LGPL-2.1 -%{?ghc_devel_requires} - +Group: Development/Libraries/Other +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} +Requires: ghc-%{name} = %{version}-%{release} %description -n ghc-%{name}-devel -Cpphs is a re-implementation of the C pre-processor that is both -more compatible with Haskell, and itself written in Haskell so -that it can be distributed with compilers. - -This version of the C pre-processor is pretty-much -feature-complete and compatible with traditional (K&R) -pre-processors. Additional features include: a plain-text mode; -an option to unlit literate code files; and an option to turn -off macro-expansion. +This package provides the Haskell %{name} library development files. + %prep %setup -q -chmod a-x README CHANGELOG LICENCE-GPL LICENCE-LGPL LICENCE-commercial -chmod a-x docs/* %build -%{ghc_lib_build} +%ghc_lib_build %install -%{ghc_lib_install} +%ghc_lib_install install -D --mode=444 docs/cpphs.1 %{buildroot}%{_mandir}/man1/cpphs.1 %post -n ghc-%{name}-devel -%{ghc_pkg_recache} +%ghc_pkg_recache %postun -n ghc-%{name}-devel -%{ghc_pkg_recache} +%ghc_pkg_recache %files %defattr(-,root,root,-) %doc LICENCE-LGPL -%doc LICENCE-GPL LICENCE-commercial docs README +%doc LICENCE-GPL LICENCE-commercial README docs %{_bindir}/%{name} %{_mandir}/man1/cpphs.1.gz @@ -113,6 +100,6 @@ %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %defattr(-,root,root,-) -%doc LICENCE-GPL LICENCE-commercial docs README +%doc LICENCE-GPL LICENCE-commercial README docs %changelog

1 0

commit python-jmespath for openSUSE:Factory
by root＠hilbert.suse.de 28 May '15

28 May '15

Hello community, here is the log from the commit of package python-jmespath for openSUSE:Factory checked in at 2015-05-28 09:57:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-jmespath (Old) and /work/SRC/openSUSE:Factory/.python-jmespath.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-jmespath" Changes: -------- --- /work/SRC/openSUSE:Factory/python-jmespath/python-jmespath.changes 2015-04-27 13:05:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-jmespath.new/python-jmespath.changes 2015-05-28 09:57:57.000000000 +0200 @@ -1,0 +2,12 @@ +Wed May 27 17:04:07 UTC 2015 - rjschwei(a)suse.com + +- Update to version 0.7.1: + * Rename ``bin/jp`` to ``bin/jp.py`` + * Fix issue with precedence when parsing wildcard + projections + * Remove ordereddict and simplejson as py2.6 dependencies. + These were never actually used in the jmespath code base, + only in the unit tests. Unittests requirements are handled + via requirements26.txt. + +------------------------------------------------------------------- Old: ---- jmespath-0.7.0.tar.gz New: ---- jmespath-0.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-jmespath.spec ++++++ --- /var/tmp/diff_new_pack.6XGgDn/_old 2015-05-28 09:57:57.000000000 +0200 +++ /var/tmp/diff_new_pack.6XGgDn/_new 2015-05-28 09:57:57.000000000 +0200 @@ -19,7 +19,7 @@ %define baseName jmespath Name: python-jmespath -Version: 0.7.0 +Version: 0.7.1 Release: 0 Summary: Extract elements from JSON document License: MIT @@ -78,6 +78,9 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-scripts=%{_bindir} +pushd %{buildroot}/%{_bindir} +ln -s jp.py jp +popd %files %defattr(-,root,root,-) @@ -85,6 +88,7 @@ %dir %{python_sitelib}/jmespath %dir %{python_sitelib}/%{baseName}-%{version}-py%{py_ver}.egg-info %{_bindir}/jp +%{_bindir}/jp.py %{python_sitelib}/jmespath/* %{python_sitelib}/*egg-info/* ++++++ jmespath-0.7.0.tar.gz -> jmespath-0.7.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.7.0/PKG-INFO new/jmespath-0.7.1/PKG-INFO --- old/jmespath-0.7.0/PKG-INFO 2015-04-21 08:34:36.000000000 +0200 +++ new/jmespath-0.7.1/PKG-INFO 2015-04-27 19:29:56.000000000 +0200 @@ -1,8 +1,8 @@ Metadata-Version: 1.1 Name: jmespath -Version: 0.7.0 +Version: 0.7.1 Summary: JSON Matching Expressions -Home-page: https://github.com/boto/jmespath +Home-page: https://github.com/jmespath/jmespath.py Author: James Saryerwinnie Author-email: js(a)jamesls.com License: UNKNOWN @@ -121,3 +121,4 @@ Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.3 +Classifier: Programming Language :: Python :: 3.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.7.0/bin/jp new/jmespath-0.7.1/bin/jp --- old/jmespath-0.7.0/bin/jp 2015-04-18 20:54:14.000000000 +0200 +++ new/jmespath-0.7.1/bin/jp 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -#!/usr/bin/env python - -import sys -import json -import argparse - -import jmespath -from jmespath import exceptions -from jmespath.compat import OrderedDict - - -def main(): - parser = argparse.ArgumentParser() - parser.add_argument('expression') - parser.add_argument('-o', '--ordered', action='store_true', - help='Preserve the order of hash keys, which ' - 'are normally unordered.') - parser.add_argument('-f', '--filename', - help=('The filename containing the input data. ' - 'If a filename is not given then data is ' - 'read from stdin.')) - parser.add_argument('--ast', action='store_true', - help=('Pretty print the AST, do not search the data.')) - args = parser.parse_args() - expression = args.expression - if args.ast: - # Only print the AST - expression = jmespath.compile(args.expression) - sys.stdout.write(str(expression)) - sys.stdout.write('\n') - return 0 - if args.filename: - with open(args.filename, 'r') as f: - data = json.load(f) - else: - data = sys.stdin.read() - if args.ordered: - data = json.loads(data, object_pairs_hook=OrderedDict) - else: - data = json.loads(data) - try: - sys.stdout.write(json.dumps( - jmespath.search(expression, data), indent=4)) - sys.stdout.write('\n') - except exceptions.ArityError as e: - sys.stderr.write("invalid-arity: %s\n" % e) - return 1 - except exceptions.JMESPathTypeError as e: - sys.stderr.write("invalid-type: %s\n" % e) - return 1 - except exceptions.UnknownFunctionError as e: - sys.stderr.write("unknown-function: %s\n" % e) - return 1 - except exceptions.ParseError as e: - sys.stderr.write("syntax-error: %s\n" % e) - return 1 - - -if __name__ == '__main__': - sys.exit(main()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.7.0/bin/jp.py new/jmespath-0.7.1/bin/jp.py --- old/jmespath-0.7.0/bin/jp.py 1970-01-01 01:00:00.000000000 +0100 +++ new/jmespath-0.7.1/bin/jp.py 2015-04-27 19:27:03.000000000 +0200 @@ -0,0 +1,53 @@ +#!/usr/bin/env python + +import sys +import json +import argparse + +import jmespath +from jmespath import exceptions + + +def main(): + parser = argparse.ArgumentParser() + parser.add_argument('expression') + parser.add_argument('-f', '--filename', + help=('The filename containing the input data. ' + 'If a filename is not given then data is ' + 'read from stdin.')) + parser.add_argument('--ast', action='store_true', + help=('Pretty print the AST, do not search the data.')) + args = parser.parse_args() + expression = args.expression + if args.ast: + # Only print the AST + expression = jmespath.compile(args.expression) + sys.stdout.write(str(expression)) + sys.stdout.write('\n') + return 0 + if args.filename: + with open(args.filename, 'r') as f: + data = json.load(f) + else: + data = sys.stdin.read() + data = json.loads(data) + try: + sys.stdout.write(json.dumps( + jmespath.search(expression, data), indent=4)) + sys.stdout.write('\n') + except exceptions.ArityError as e: + sys.stderr.write("invalid-arity: %s\n" % e) + return 1 + except exceptions.JMESPathTypeError as e: + sys.stderr.write("invalid-type: %s\n" % e) + return 1 + except exceptions.UnknownFunctionError as e: + sys.stderr.write("unknown-function: %s\n" % e) + return 1 + except exceptions.ParseError as e: + sys.stderr.write("syntax-error: %s\n" % e) + return 1 + + +if __name__ == '__main__': + sys.exit(main()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.7.0/jmespath/__init__.py new/jmespath-0.7.1/jmespath/__init__.py --- old/jmespath-0.7.0/jmespath/__init__.py 2015-04-21 08:29:17.000000000 +0200 +++ new/jmespath-0.7.1/jmespath/__init__.py 2015-04-27 19:28:36.000000000 +0200 @@ -1,6 +1,6 @@ from jmespath import parser -__version__ = '0.7.0' +__version__ = '0.7.1' def compile(expression): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.7.0/jmespath/compat.py new/jmespath-0.7.1/jmespath/compat.py --- old/jmespath-0.7.0/jmespath/compat.py 2015-03-20 03:58:23.000000000 +0100 +++ new/jmespath-0.7.1/jmespath/compat.py 2015-04-27 19:27:03.000000000 +0200 @@ -54,11 +54,3 @@ for name, method in inspect.getmembers(cls, predicate=inspect.isfunction): yield name, method - - -if sys.version_info[:2] == (2, 6): - from ordereddict import OrderedDict - import simplejson as json -else: - from collections import OrderedDict - import json diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.7.0/jmespath/functions.py new/jmespath-0.7.1/jmespath/functions.py --- old/jmespath-0.7.0/jmespath/functions.py 2015-04-18 20:54:14.000000000 +0200 +++ new/jmespath-0.7.1/jmespath/functions.py 2015-04-27 19:27:03.000000000 +0200 @@ -1,4 +1,3 @@ -import inspect import math import json import weakref diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.7.0/jmespath/parser.py new/jmespath-0.7.1/jmespath/parser.py --- old/jmespath-0.7.0/jmespath/parser.py 2015-04-21 08:28:55.000000000 +0200 +++ new/jmespath-0.7.1/jmespath/parser.py 2015-04-27 19:27:03.000000000 +0200 @@ -57,7 +57,7 @@ 'or': 5, 'flatten': 6, 'star': 20, - 'filter': 20, + 'filter': 21, 'dot': 40, 'lbrace': 50, 'lbracket': 55, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.7.0/jmespath.egg-info/PKG-INFO new/jmespath-0.7.1/jmespath.egg-info/PKG-INFO --- old/jmespath-0.7.0/jmespath.egg-info/PKG-INFO 2015-04-21 08:34:35.000000000 +0200 +++ new/jmespath-0.7.1/jmespath.egg-info/PKG-INFO 2015-04-27 19:29:56.000000000 +0200 @@ -1,8 +1,8 @@ Metadata-Version: 1.1 Name: jmespath -Version: 0.7.0 +Version: 0.7.1 Summary: JSON Matching Expressions -Home-page: https://github.com/boto/jmespath +Home-page: https://github.com/jmespath/jmespath.py Author: James Saryerwinnie Author-email: js(a)jamesls.com License: UNKNOWN @@ -121,3 +121,4 @@ Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.3 +Classifier: Programming Language :: Python :: 3.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.7.0/jmespath.egg-info/SOURCES.txt new/jmespath-0.7.1/jmespath.egg-info/SOURCES.txt --- old/jmespath-0.7.0/jmespath.egg-info/SOURCES.txt 2015-04-21 08:34:36.000000000 +0200 +++ new/jmespath-0.7.1/jmespath.egg-info/SOURCES.txt 2015-04-27 19:29:56.000000000 +0200 @@ -3,7 +3,7 @@ README.rst setup.cfg setup.py -bin/jp +bin/jp.py jmespath/__init__.py jmespath/ast.py jmespath/compat.py @@ -15,5 +15,7 @@ jmespath.egg-info/PKG-INFO jmespath.egg-info/SOURCES.txt jmespath.egg-info/dependency_links.txt -jmespath.egg-info/pbr.json -jmespath.egg-info/top_level.txt \ No newline at end of file +jmespath.egg-info/top_level.txt +tests/__init__.py +tests/test_compliance.py +tests/test_parser.py \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.7.0/jmespath.egg-info/pbr.json new/jmespath-0.7.1/jmespath.egg-info/pbr.json --- old/jmespath-0.7.0/jmespath.egg-info/pbr.json 2015-04-21 08:34:36.000000000 +0200 +++ new/jmespath-0.7.1/jmespath.egg-info/pbr.json 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -{"is_release": true, "git_version": "0466cc1"} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.7.0/setup.py new/jmespath-0.7.1/setup.py --- old/jmespath-0.7.0/setup.py 2015-04-21 08:29:17.000000000 +0200 +++ new/jmespath-0.7.1/setup.py 2015-04-27 19:28:36.000000000 +0200 @@ -7,33 +7,16 @@ from setuptools import setup, find_packages -requires = [] - - -if sys.version_info[:2] == (2, 6): - # For python2.6 we have a few other dependencies. - # First we need an ordered dictionary so we use the - # 2.6 backport. - requires.append('ordereddict==1.1') - # Then we need simplejson. This is because we need - # a json version that allows us to specify we want to - # use an ordereddict instead of a normal dict for the - # JSON objects. The 2.7 json module has this. For 2.6 - # we need simplejson. - requires.append('simplejson==3.3.0') - - setup( name='jmespath', - version='0.7.0', + version='0.7.1', description='JSON Matching Expressions', long_description=io.open('README.rst', encoding='utf-8').read(), author='James Saryerwinnie', author_email='js(a)jamesls.com', - url='https://github.com/boto/jmespath', - scripts=['bin/jp'], + url='https://github.com/jmespath/jmespath.py', + scripts=['bin/jp.py'], packages=find_packages(exclude=['tests']), - install_requires=requires, classifiers=( 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', @@ -44,5 +27,6 @@ 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', ), ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.7.0/tests/__init__.py new/jmespath-0.7.1/tests/__init__.py --- old/jmespath-0.7.0/tests/__init__.py 1970-01-01 01:00:00.000000000 +0100 +++ new/jmespath-0.7.1/tests/__init__.py 2014-04-23 21:00:09.000000000 +0200 @@ -0,0 +1,40 @@ +import sys +from jmespath import ast + + +# The unittest module got a significant overhaul +# in 2.7, so if we're in 2.6 we can use the backported +# version unittest2. +if sys.version_info[:2] == (2, 6): + import unittest2 as unittest + import simplejson as json + from ordereddict import OrderedDict +else: + import unittest + import json + from collections import OrderedDict + + +# Helper method used to create an s-expression +# of the AST to make unit test assertions easier. +# You get a nice string diff on assert failures. +def as_s_expression(node): + parts = [] + _as_s_expression(node, parts) + return ''.join(parts) + + +def _as_s_expression(node, parts): + parts.append("(%s" % (node.__class__.__name__.lower())) + if isinstance(node, ast.Field): + parts.append(" %s" % node.name) + elif isinstance(node, ast.FunctionExpression): + parts.append(" %s" % node.name) + elif isinstance(node, ast.KeyValPair): + parts.append(" %s" % node.key_name) + for child in node.children: + parts.append(" ") + _as_s_expression(child, parts) + parts.append(")") + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.7.0/tests/test_compliance.py new/jmespath-0.7.1/tests/test_compliance.py --- old/jmespath-0.7.0/tests/test_compliance.py 1970-01-01 01:00:00.000000000 +0100 +++ new/jmespath-0.7.1/tests/test_compliance.py 2015-04-27 19:23:22.000000000 +0200 @@ -0,0 +1,96 @@ +import os +from pprint import pformat +from tests import OrderedDict +from tests import json + +from nose.tools import assert_equal + +import jmespath +from jmespath.visitor import TreeInterpreter + + +TEST_DIR = os.path.dirname(os.path.abspath(__file__)) +COMPLIANCE_DIR = os.path.join(TEST_DIR, 'compliance') +LEGACY_DIR = os.path.join(TEST_DIR, 'legacy') +NOT_SPECIFIED = object() +TreeInterpreter.MAP_TYPE = OrderedDict + + +def test_compliance(): + for full_path in _walk_files(): + if full_path.endswith('.json'): + for given, expression, result, error in _load_cases(full_path): + if error is NOT_SPECIFIED and result is not NOT_SPECIFIED: + yield (_test_expression, given, expression, + result, os.path.basename(full_path)) + elif result is NOT_SPECIFIED and error is not NOT_SPECIFIED: + yield (_test_error_expression, given, expression, + error, os.path.basename(full_path)) + else: + parts = (given, expression, result, error) + raise RuntimeError("Invalid test description: %s" % parts) + + +def _walk_files(): + # Check for a shortcut when running the tests interactively. + # If a JMESPATH_TEST is defined, that file is used as the + # only test to run. Useful when doing feature development. + single_file = os.environ.get('JMESPATH_TEST') + if single_file is not None: + yield os.path.abspath(single_file) + else: + for root, dirnames, filenames in os.walk(TEST_DIR): + for filename in filenames: + yield os.path.join(root, filename) + for root, dirnames, filenames in os.walk(LEGACY_DIR): + for filename in filenames: + yield os.path.join(root, filename) + + +def _load_cases(full_path): + all_test_data = json.load(open(full_path), object_pairs_hook=OrderedDict) + for test_data in all_test_data: + given = test_data['given'] + for case in test_data['cases']: + yield (given, case['expression'], + case.get('result', NOT_SPECIFIED), + case.get('error', NOT_SPECIFIED)) + + +def _test_expression(given, expression, expected, filename): + import jmespath.parser + try: + parsed = jmespath.compile(expression) + except ValueError as e: + raise AssertionError( + 'jmespath expression failed to compile: "%s", error: %s"' % + (expression, e)) + actual = parsed.search(given) + expected_repr = json.dumps(expected, indent=4) + actual_repr = json.dumps(actual, indent=4) + error_msg = ("\n\n (%s) The expression '%s' was suppose to give:\n%s\n" + "Instead it matched:\n%s\nparsed as:\n%s\ngiven:\n%s" % ( + filename, expression, expected_repr, + actual_repr, parsed, + json.dumps(given, indent=4))) + error_msg = error_msg.replace(r'\n', '\n') + assert_equal(actual, expected, error_msg) + + +def _test_error_expression(given, expression, error, filename): + import jmespath.parser + if error not in ('syntax', 'invalid-type', + 'unknown-function', 'invalid-arity', 'invalid-value'): + raise RuntimeError("Unknown error type '%s'" % error) + try: + parsed = jmespath.compile(expression) + parsed.search(given) + except ValueError as e: + # Test passes, it raised a parse error as expected. + pass + else: + error_msg = ("\n\n (%s) The expression '%s' was suppose to be a " + "syntax error, but it successfully parsed as:\n\n%s" % ( + filename, expression, parsed)) + error_msg = error_msg.replace(r'\n', '\n') + raise AssertionError(error_msg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.7.0/tests/test_parser.py new/jmespath-0.7.1/tests/test_parser.py --- old/jmespath-0.7.0/tests/test_parser.py 1970-01-01 01:00:00.000000000 +0100 +++ new/jmespath-0.7.1/tests/test_parser.py 2015-04-27 19:23:22.000000000 +0200 @@ -0,0 +1,352 @@ +#!/usr/bin/env python + +import re +from tests import unittest + +from jmespath import parser +from jmespath import ast +from jmespath import exceptions + + +class TestParser(unittest.TestCase): + def setUp(self): + self.parser = parser.Parser() + + def assert_parsed_ast(self, expression, expected_ast): + parsed = self.parser.parse(expression) + self.assertEqual(parsed.parsed, expected_ast) + + def test_parse_empty_string_raises_exception(self): + with self.assertRaises(exceptions.EmptyExpressionError): + self.parser.parse('') + + def test_field(self): + self.assert_parsed_ast('foo', ast.field('foo')) + + def test_dot_syntax(self): + self.assert_parsed_ast('foo.bar', + ast.subexpression([ast.field('foo'), + ast.field('bar')])) + + def test_multiple_dots(self): + parsed = self.parser.parse('foo.bar.baz') + self.assertEqual( + parsed.search({'foo': {'bar': {'baz': 'correct'}}}), 'correct') + + def test_index(self): + parsed = self.parser.parse('foo[1]') + self.assertEqual( + parsed.search({'foo': ['zero', 'one', 'two']}), + 'one') + + def test_quoted_subexpression(self): + self.assert_parsed_ast('"foo"."bar"', + ast.subexpression([ + ast.field('foo'), + ast.field('bar')])) + + def test_wildcard(self): + parsed = self.parser.parse('foo[*]') + self.assertEqual( + parsed.search({'foo': ['zero', 'one', 'two']}), + ['zero', 'one', 'two']) + + def test_wildcard_with_children(self): + parsed = self.parser.parse('foo[*].bar') + self.assertEqual( + parsed.search({'foo': [{'bar': 'one'}, {'bar': 'two'}]}), + ['one', 'two']) + + def test_or_expression(self): + parsed = self.parser.parse('foo || bar') + self.assertEqual(parsed.search({'foo': 'foo'}), 'foo') + self.assertEqual(parsed.search({'bar': 'bar'}), 'bar') + self.assertEqual(parsed.search({'foo': 'foo', 'bar': 'bar'}), 'foo') + self.assertEqual(parsed.search({'bad': 'bad'}), None) + + def test_complex_or_expression(self): + parsed = self.parser.parse('foo.foo || foo.bar') + self.assertEqual(parsed.search({'foo': {'foo': 'foo'}}), 'foo') + self.assertEqual(parsed.search({'foo': {'bar': 'bar'}}), 'bar') + self.assertEqual(parsed.search({'foo': {'baz': 'baz'}}), None) + + def test_or_repr(self): + self.assert_parsed_ast('foo || bar', ast.or_expression(ast.field('foo'), + ast.field('bar'))) + + def test_unicode_literals_escaped(self): + self.assert_parsed_ast(r'`"\u2713"`', ast.literal(u'\u2713')) + + def test_multiselect(self): + parsed = self.parser.parse('foo.{bar: bar,baz: baz}') + self.assertEqual( + parsed.search({'foo': {'bar': 'bar', 'baz': 'baz', 'qux': 'qux'}}), + {'bar': 'bar', 'baz': 'baz'}) + + def test_multiselect_subexpressions(self): + parsed = self.parser.parse('foo.{"bar.baz": bar.baz, qux: qux}') + self.assertEqual( + parsed.search({'foo': {'bar': {'baz': 'CORRECT'}, 'qux': 'qux'}}), + {'bar.baz': 'CORRECT', 'qux': 'qux'}) + + def test_multiselect_with_all_quoted_keys(self): + parsed = self.parser.parse('foo.{"bar": bar.baz, "qux": qux}') + result = parsed.search({'foo': {'bar': {'baz': 'CORRECT'}, 'qux': 'qux'}}) + self.assertEqual(result, {"bar": "CORRECT", "qux": "qux"}) + + +class TestErrorMessages(unittest.TestCase): + + def setUp(self): + self.parser = parser.Parser() + + def assert_error_message(self, expression, error_message, + exception=exceptions.ParseError): + try: + self.parser.parse(expression) + except exception as e: + self.assertEqual(error_message, str(e)) + return + except Exception as e: + self.fail( + "Unexpected error raised (%s: %s) for bad expression: %s" % + (e.__class__.__name__, e, expression)) + else: + self.fail( + "ParseError not raised for bad expression: %s" % expression) + + def test_bad_parse(self): + with self.assertRaises(exceptions.ParseError): + self.parser.parse('foo]baz') + + def test_bad_parse_error_message(self): + error_message = ( + 'Unexpected token: ]: Parse error at column 3, ' + 'token "]" (RBRACKET), for expression:\n' + '"foo]baz"\n' + ' ^') + self.assert_error_message('foo]baz', error_message) + + def test_bad_parse_error_message_with_multiselect(self): + error_message = ( + 'Invalid jmespath expression: Incomplete expression:\n' + '"foo.{bar: baz,bar: bar"\n' + ' ^') + self.assert_error_message('foo.{bar: baz,bar: bar', error_message) + + def test_incomplete_expression_with_missing_paren(self): + error_message = ( + 'Invalid jmespath expression: Incomplete expression:\n' + '"length(@,"\n' + ' ^') + self.assert_error_message('length(@,', error_message) + + def test_bad_lexer_values(self): + error_message = ( + 'Bad jmespath expression: ' + 'Starting quote is missing the ending quote:\n' + 'foo."bar\n' + ' ^') + self.assert_error_message('foo."bar', error_message, + exception=exceptions.LexerError) + + def test_bad_lexer_literal_value_with_json_object(self): + error_message = ('Bad jmespath expression: ' + 'Bad token `{{}`:\n`{{}`\n^') + self.assert_error_message('`{{}`', error_message, + exception=exceptions.LexerError) + + def test_bad_unicode_string(self): + # This error message is straight from the JSON parser + # and pypy has a slightly different error message, + # so we're not using assert_error_message. + error_message = re.compile( + r'Bad jmespath expression: ' + r'Invalid \\uXXXX escape.*\\uAZ12', re.DOTALL) + with self.assertRaisesRegexp(exceptions.LexerError, error_message): + self.parser.parse(r'"\uAZ12"') + + +class TestParserWildcards(unittest.TestCase): + def setUp(self): + self.parser = parser.Parser() + self.data = { + 'foo': [ + {'bar': [{'baz': 'one'}, {'baz': 'two'}]}, + {'bar': [{'baz': 'three'}, {'baz': 'four'}, {'baz': 'five'}]}, + ] + } + + def test_multiple_index_wildcards(self): + parsed = self.parser.parse('foo[*].bar[*].baz') + self.assertEqual(parsed.search(self.data), + [['one', 'two'], ['three', 'four', 'five']]) + + def test_wildcard_mix_with_indices(self): + parsed = self.parser.parse('foo[*].bar[0].baz') + self.assertEqual(parsed.search(self.data), + ['one', 'three']) + + def test_wildcard_mix_last(self): + parsed = self.parser.parse('foo[0].bar[*].baz') + self.assertEqual(parsed.search(self.data), + ['one', 'two']) + + def test_indices_out_of_bounds(self): + parsed = self.parser.parse('foo[*].bar[2].baz') + self.assertEqual(parsed.search(self.data), + ['five']) + + def test_root_indices(self): + parsed = self.parser.parse('[0]') + self.assertEqual(parsed.search(['one', 'two']), 'one') + + def test_root_wildcard(self): + parsed = self.parser.parse('*.foo') + data = {'top1': {'foo': 'bar'}, 'top2': {'foo': 'baz'}, + 'top3': {'notfoo': 'notfoo'}} + # Sorted is being used because the order of the keys are not + # required to be in any specific order. + self.assertEqual(sorted(parsed.search(data)), sorted(['bar', 'baz'])) + self.assertEqual(sorted(self.parser.parse('*.notfoo').search(data)), + sorted(['notfoo'])) + + def test_only_wildcard(self): + parsed = self.parser.parse('*') + data = {'foo': 'a', 'bar': 'b', 'baz': 'c'} + self.assertEqual(sorted(parsed.search(data)), sorted(['a', 'b', 'c'])) + + def test_escape_sequences(self): + self.assertEqual(self.parser.parse(r'"foo\tbar"').search( + {'foo\tbar': 'baz'}), 'baz') + self.assertEqual(self.parser.parse(r'"foo\nbar"').search( + {'foo\nbar': 'baz'}), 'baz') + self.assertEqual(self.parser.parse(r'"foo\bbar"').search( + {'foo\bbar': 'baz'}), 'baz') + self.assertEqual(self.parser.parse(r'"foo\fbar"').search( + {'foo\fbar': 'baz'}), 'baz') + self.assertEqual(self.parser.parse(r'"foo\rbar"').search( + {'foo\rbar': 'baz'}), 'baz') + + def test_consecutive_escape_sequences(self): + parsed = self.parser.parse(r'"foo\\nbar"') + self.assertEqual(parsed.search({'foo\\nbar': 'baz'}), 'baz') + + parsed = self.parser.parse(r'"foo\n\t\rbar"') + self.assertEqual(parsed.search({'foo\n\t\rbar': 'baz'}), 'baz') + + def test_escape_sequence_at_end_of_string_not_allowed(self): + with self.assertRaises(ValueError): + self.parser.parse('foobar\\') + + def test_wildcard_with_multiselect(self): + parsed = self.parser.parse('foo.*.{a: a, b: b}') + data = { + 'foo': { + 'one': { + 'a': {'c': 'CORRECT', 'd': 'other'}, + 'b': {'c': 'ALSOCORRECT', 'd': 'other'}, + }, + 'two': { + 'a': {'c': 'CORRECT', 'd': 'other'}, + 'c': {'c': 'WRONG', 'd': 'other'}, + }, + } + } + match = parsed.search(data) + self.assertEqual(len(match), 2) + self.assertIn('a', match[0]) + self.assertIn('b', match[0]) + self.assertIn('a', match[1]) + self.assertIn('b', match[1]) + + +class TestMergedLists(unittest.TestCase): + def setUp(self): + self.parser = parser.Parser() + self.data = { + "foo": [ + [["one", "two"], ["three", "four"]], + [["five", "six"], ["seven", "eight"]], + [["nine"], ["ten"]] + ] + } + + def test_merge_with_indices(self): + parsed = self.parser.parse('foo[][0]') + match = parsed.search(self.data) + self.assertEqual(match, ["one", "three", "five", "seven", + "nine", "ten"]) + + def test_trailing_merged_operator(self): + parsed = self.parser.parse('foo[]') + match = parsed.search(self.data) + self.assertEqual( + match, + [["one", "two"], ["three", "four"], + ["five", "six"], ["seven", "eight"], + ["nine"], ["ten"]]) + + +class TestParserCaching(unittest.TestCase): + def test_compile_lots_of_expressions(self): + # We have to be careful here because this is an implementation detail + # that should be abstracted from the user, but we need to make sure we + # exercise the code and that it doesn't blow up. + p = parser.Parser() + compiled = [] + compiled2 = [] + for i in range(parser.Parser._MAX_SIZE + 1): + compiled.append(p.parse('foo%s' % i)) + # Rerun the test and half of these entries should be from the + # cache but they should still be equal to compiled. + for i in range(parser.Parser._MAX_SIZE + 1): + compiled2.append(p.parse('foo%s' % i)) + self.assertEqual(len(compiled), len(compiled2)) + self.assertEqual( + [expr.parsed for expr in compiled], + [expr.parsed for expr in compiled2]) + + def test_cache_purge(self): + p = parser.Parser() + first = p.parse('foo') + cached = p.parse('foo') + p.purge() + second = p.parse('foo') + self.assertEqual(first.parsed, + second.parsed) + self.assertEqual(first.parsed, + cached.parsed) + + +class TestParserAddsExpressionAttribute(unittest.TestCase): + def test_expression_available_from_parser(self): + p = parser.Parser() + parsed = p.parse('foo.bar') + self.assertEqual(parsed.expression, 'foo.bar') + + +class TestRenderGraphvizFile(unittest.TestCase): + def test_dot_file_rendered(self): + p = parser.Parser() + result = p.parse('foo') + dot_contents = result._render_dot_file() + self.assertEqual(dot_contents, + 'digraph AST {\nfield1 [label="field(foo)"]\n}') + + def test_dot_file_subexpr(self): + p = parser.Parser() + result = p.parse('foo.bar') + dot_contents = result._render_dot_file() + self.assertEqual( + dot_contents, + 'digraph AST {\n' + 'subexpression1 [label="subexpression()"]\n' + ' subexpression1 -> field2\n' + 'field2 [label="field(foo)"]\n' + ' subexpression1 -> field3\n' + 'field3 [label="field(bar)"]\n}') + + +if __name__ == '__main__': + unittest.main()

1 0

commit libvirt for openSUSE:Factory
by root＠hilbert.suse.de 28 May '15

28 May '15

Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2015-05-28 09:57:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvirt" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2015-05-15 07:44:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2015-05-28 09:57:23.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 20 08:29:00 UTC 2015 - dmacvicar(a)suse.de + +- qemu: fix regression defaulting to host arch + 8910e063-arch-caps.patch + rhb#1219191 + +------------------------------------------------------------------- New: ---- 8910e063-arch-caps.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.RcDtBr/_old 2015-05-28 09:57:24.000000000 +0200 +++ /var/tmp/diff_new_pack.RcDtBr/_new 2015-05-28 09:57:24.000000000 +0200 @@ -445,6 +445,7 @@ Source99: baselibs.conf # Upstream patches Patch0: c0d3f608-libxl-soundhw.patch +Patch1: 8910e063-arch-caps.patch # Patches pending upstream review # Need to go upstream Patch150: xen-pv-cdrom.patch @@ -975,6 +976,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %patch150 -p1 %patch151 -p1 %patch152 -p1 ++++++ 8910e063-arch-caps.patch ++++++ commit 8910e063dbafc09695b2100c80213be569abb7ef Author: Cole Robinson <crobinso(a)redhat.com> Date: Wed May 6 18:32:05 2015 -0400 caps: Fix regression defaulting to host arch My commit 747761a79 (v1.2.15 only) dropped this bit of logic when filling in a default arch in the XML: - /* First try to find one matching host arch */ - for (i = 0; i < caps->nguests; i++) { - if (caps->guests[i]->ostype == ostype) { - for (j = 0; j < caps->guests[i]->arch.ndomains; j++) { - if (caps->guests[i]->arch.domains[j]->type == domain && - caps->guests[i]->arch.id == caps->host.arch) - return caps->guests[i]->arch.id; - } - } - } That attempt to match host.arch is important, otherwise we end up defaulting to i686 on x86_64 host for KVM, which is not intended. Duplicate it in the centralized CapsLookup function. Additionally add some testcases that would have caught this. https://bugzilla.redhat.com/show_bug.cgi?id=1219191 Index: libvirt-1.2.15/src/conf/capabilities.c =================================================================== --- libvirt-1.2.15.orig/src/conf/capabilities.c +++ libvirt-1.2.15/src/conf/capabilities.c @@ -607,25 +607,13 @@ virCapsDomainDataCompare(virCapsGuestPtr return true; } -/** - * virCapabilitiesDomainDataLookup: - * @caps: capabilities to query - * @ostype: guest operating system type, of enum VIR_DOMAIN_OSTYPE - * @arch: Architecture to search for - * @domaintype: domain type to search for, of enum VIR_DOMAIN_VIRT - * @emulator: Emulator path to search for - * @machinetype: Machine type to search for - * - * Search capabilities for the passed values, and if found return - * virCapabilitiesDomainDataLookup filled in with the default values - */ -virCapsDomainDataPtr -virCapabilitiesDomainDataLookup(virCapsPtr caps, - int ostype, - virArch arch, - int domaintype, - const char *emulator, - const char *machinetype) +static virCapsDomainDataPtr +virCapabilitiesDomainDataLookupInternal(virCapsPtr caps, + int ostype, + virArch arch, + int domaintype, + const char *emulator, + const char *machinetype) { virCapsGuestPtr foundguest = NULL; virCapsGuestDomainPtr founddomain = NULL; @@ -730,6 +718,43 @@ virCapabilitiesDomainDataLookup(virCapsP return ret; } +/** + * virCapabilitiesDomainDataLookup: + * @caps: capabilities to query + * @ostype: guest operating system type, of enum VIR_DOMAIN_OSTYPE + * @arch: Architecture to search for + * @domaintype: domain type to search for, of enum VIR_DOMAIN_VIRT + * @emulator: Emulator path to search for + * @machinetype: Machine type to search for + * + * Search capabilities for the passed values, and if found return + * virCapabilitiesDomainDataLookup filled in with the default values + */ +virCapsDomainDataPtr +virCapabilitiesDomainDataLookup(virCapsPtr caps, + int ostype, + virArch arch, + int domaintype, + const char *emulator, + const char *machinetype) +{ + virCapsDomainDataPtr ret; + + if (arch == VIR_ARCH_NONE) { + /* Prefer host arch if its available */ + ret = virCapabilitiesDomainDataLookupInternal(caps, ostype, + caps->host.arch, + domaintype, + emulator, machinetype); + if (ret) + return ret; + } + + return virCapabilitiesDomainDataLookupInternal(caps, ostype, + arch, domaintype, + emulator, machinetype); +} + static int virCapabilitiesFormatNUMATopology(virBufferPtr buf, size_t ncells, Index: libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args =================================================================== --- /dev/null +++ libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/kvm -S -machine pc,accel=kvm -m 4096 -smp 4 -nographic \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -net none \ +-serial none -parallel none Index: libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.xml =================================================================== --- /dev/null +++ libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.xml @@ -0,0 +1,11 @@ +<domain type='kvm'> + <name>kvm</name> + <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type>hvm</type> + <boot dev='hd'/> + </os> +</domain> Index: libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args =================================================================== --- /dev/null +++ libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 -S -machine pc-0.11,accel=tcg -m 4096 -smp 4 \ +-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-usb -net none -serial none -parallel none Index: libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.xml =================================================================== --- /dev/null +++ libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.xml @@ -0,0 +1,11 @@ +<domain type='qemu'> + <name>qemu-host</name> + <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type>hvm</type> + <boot dev='hd'/> + </os> +</domain> Index: libvirt-1.2.15/tests/qemuxml2argvtest.c =================================================================== --- libvirt-1.2.15.orig/tests/qemuxml2argvtest.c +++ libvirt-1.2.15/tests/qemuxml2argvtest.c @@ -595,6 +595,8 @@ mymain(void) DO_TEST("machine-usb-opt", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACHINE_USB_OPT); DO_TEST("kvm", QEMU_CAPS_MACHINE_OPT); + DO_TEST("default-kvm-host-arch", QEMU_CAPS_MACHINE_OPT); + DO_TEST("default-qemu-host-arch", QEMU_CAPS_MACHINE_OPT); DO_TEST("boot-cdrom", NONE); DO_TEST("boot-network", NONE); DO_TEST("boot-floppy", NONE); Index: libvirt-1.2.15/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml =================================================================== --- /dev/null +++ libvirt-1.2.15/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml @@ -0,0 +1,21 @@ +<domain type='kvm'> + <name>kvm</name> + <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/kvm</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> Index: libvirt-1.2.15/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml =================================================================== --- /dev/null +++ libvirt-1.2.15/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml @@ -0,0 +1,21 @@ +<domain type='qemu'> + <name>qemu-host</name> + <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='x86_64' machine='pc-0.11'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> Index: libvirt-1.2.15/tests/qemuxml2xmltest.c =================================================================== --- libvirt-1.2.15.orig/tests/qemuxml2xmltest.c +++ libvirt-1.2.15/tests/qemuxml2xmltest.c @@ -346,6 +346,8 @@ mymain(void) DO_TEST("minimal"); DO_TEST("machine-core-on"); DO_TEST("machine-core-off"); + DO_TEST_DIFFERENT("default-kvm-host-arch"); + DO_TEST_DIFFERENT("default-qemu-host-arch"); DO_TEST("boot-cdrom"); DO_TEST("boot-network"); DO_TEST("boot-floppy"); Index: libvirt-1.2.15/tests/testutilsqemu.c =================================================================== --- libvirt-1.2.15.orig/tests/testutilsqemu.c +++ libvirt-1.2.15/tests/testutilsqemu.c @@ -354,6 +354,18 @@ virCapsPtr testQemuCapsInit(void) NULL) == NULL) goto cleanup; + if ((machines = testQemuAllocMachines(&nmachines)) == NULL) + goto cleanup; + + if (virCapabilitiesAddGuestDomain(guest, + VIR_DOMAIN_VIRT_KVM, + "/usr/bin/qemu-kvm", + NULL, + nmachines, + machines) == NULL) + goto cleanup; + machines = NULL; + if ((machines = testQemuAllocNewerMachines(&nmachines)) == NULL) goto cleanup;

1 0

commit openwsman for openSUSE:Factory
by root＠hilbert.suse.de 28 May '15

28 May '15

Hello community, here is the log from the commit of package openwsman for openSUSE:Factory checked in at 2015-05-28 09:57:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openwsman (Old) and /work/SRC/openSUSE:Factory/.openwsman.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openwsman" Changes: -------- --- /work/SRC/openSUSE:Factory/openwsman/openwsman.changes 2015-02-25 02:18:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openwsman.new/openwsman.changes 2015-05-28 09:57:05.000000000 +0200 @@ -1,0 +2,30 @@ +Wed May 20 10:54:43 UTC 2015 - kkaempf(a)suse.com + +- Update to 2.5.0 + - Drop 'openwsmand' service name, use 'openwsman' only + (was never properly supported by systemd anyways) + - Features + - Rewrite selector and property handling to keep + them in order (#49) + Selectors and properties can now handle EndpointReferences + as values. This increases compatibility with Intel AMT 7.0 + and later. + - ABI change, .so version 3 + - Ruby: Add EndPointReference#to_s + +------------------------------------------------------------------- +Wed May 20 09:55:12 UTC 2015 - kkaempf(a)suse.com + +- Update to 2.4.15 + - Features + - Ruby: Add Fault#to_s + - Ruby: Enable ClientOptions#properties= + - Cim: New config option "cim_client_cql' to select CQL query + identifier ('CQL' - default, 'DMTF:CQL' - standards-compliant) + - Bugfixes + - Fix segfault in wsmc_add_property + - Fix memleak in xpath handling + - Fix typo in parsing max_connections_per_thread (vcrhonek) + - Ruby: ClientOptions#properties= + +------------------------------------------------------------------- Old: ---- openwsman-2.4.14.tar.bz2 New: ---- openwsman-2.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openwsman.spec ++++++ --- /var/tmp/diff_new_pack.Na751d/_old 2015-05-28 09:57:06.000000000 +0200 +++ /var/tmp/diff_new_pack.Na751d/_new 2015-05-28 09:57:06.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package openwsman # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX 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,11 +82,11 @@ %if 0%{?suse_version} > 0 BuildRequires: java-devel # No jni_md.h on SLE10 :-/ -#%if 0%{?suse_version} < 1100 +#%%if 0%{?suse_version} < 1100 #BuildRequires: java-1_5_0-ibm-devel #BuildRequires: libgcj-devel #BuildRequires: update-alternatives -#%endif +#%%endif %if 0%{?suse_version} > 1010 BuildRequires: fdupes @@ -122,10 +122,10 @@ %endif Requires(pre): sed coreutils grep /bin/hostname -Version: 2.4.14 +Version: 2.5.0 Release: 0 # Mandriva: -# Release %mkrel 1 +# Release %%mkrel 1 Url: http://www.openwsman.org/ Summary: Opensource Implementation of WS-Management License: BSD-3-Clause @@ -146,13 +146,13 @@ Opensource Implementation of WS-Management protocol stack -%package -n libwsman1 +%package -n libwsman3 Summary: Opensource Implementation of WS-Management Group: System/Management Provides: openwsman = %{version} Obsoletes: openwsman < %{version} -%description -n libwsman1 +%description -n libwsman3 Opensource Implementation of WS-Management protocol stack (Common libraries) @@ -162,7 +162,7 @@ Provides: openwsman-devel = %{version} Obsoletes: openwsman-devel < %{version} Requires: %{name}-server = %{version} -Requires: libwsman1 = %{version} +Requires: libwsman3 = %{version} Requires: libxml2-devel Requires: pam-devel Requires: sblim-sfcc-devel @@ -298,7 +298,7 @@ %package java Requires: java -Requires: libwsman1 = %{version} +Requires: libwsman3 = %{version} Summary: Java bindings for openwsman client API Group: System/Management @@ -358,11 +358,8 @@ [ -d $RPM_BUILD_ROOT%{ruby_vendorlib} ] && rm -f $RPM_BUILD_ROOT%{ruby_vendorlib}/openwsmanplugin.rb %if 0%{?has_systemd} install -D -m 644 %{S:4} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service -# alias openwsman and openwsmand -ln -s %{_unitdir}/%{name}.service $RPM_BUILD_ROOT%{_unitdir}/%{name}d.service -# rcopenwsman, rcopenwsmand +# rcopenwsman ln -sf %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rc%{name} -ln -sf %{_sbindir}/rcopenwsman $RPM_BUILD_ROOT%{_sbindir}/rc%{name}d %else mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d install -m 755 build/etc/init/openwsmand.sh $RPM_BUILD_ROOT%{_sysconfdir}/init.d/openwsmand @@ -376,9 +373,9 @@ install -D -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/openwsman %endif -%post -n libwsman1 -p /sbin/ldconfig +%post -n libwsman3 -p /sbin/ldconfig -%postun -n libwsman1 +%postun -n libwsman3 /sbin/ldconfig exit 0 @@ -431,7 +428,7 @@ %postun -n libwsman_clientpp1 -p /sbin/ldconfig -%files -n libwsman1 +%files -n libwsman3 %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog README.md TODO src/plugins/redirect/redirect-README %{_libdir}/libwsman.so.* @@ -495,14 +492,10 @@ %endif %if 0%{?has_systemd} %{_unitdir}/%{name}.service -%{_unitdir}/%{name}d.service %{_sbindir}/rc%{name} -%{_sbindir}/rc%{name}d %else %attr(0755,root,root) %{_sysconfdir}/init.d/openwsmand %endif -# backwards compatibility -%{_sbindir}/rcopenwsmand %dir %{_libdir}/openwsman %dir %{_libdir}/openwsman/authenticators %{_libdir}/openwsman/authenticators/*.so ++++++ openwsman-2.4.14.tar.bz2 -> openwsman-2.5.0.tar.bz2 ++++++ ++++ 2693 lines of diff (skipped)

1 0

commit gpsbabel for openSUSE:Factory
by root＠hilbert.suse.de 28 May '15

28 May '15

Hello community, here is the log from the commit of package gpsbabel for openSUSE:Factory checked in at 2015-05-28 09:56:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpsbabel (Old) and /work/SRC/openSUSE:Factory/.gpsbabel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gpsbabel" Changes: -------- --- /work/SRC/openSUSE:Factory/gpsbabel/gpsbabel.changes 2015-01-30 15:08:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gpsbabel.new/gpsbabel.changes 2015-05-28 09:56:49.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 27 12:22:52 UTC 2015 - dimstar(a)opensuse.org + +- Build Position Independent Code (as required by Qt5): inject + -fPIC into CXXFLAGS. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpsbabel.spec ++++++ --- /var/tmp/diff_new_pack.OdWxCc/_old 2015-05-28 09:56:50.000000000 +0200 +++ /var/tmp/diff_new_pack.OdWxCc/_new 2015-05-28 09:56:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gpsbabel # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -55,6 +55,7 @@ %setup -q %build +export CXXFLAGS="%{optflags} -fPIC" %configure\ --with-zlib=system make

1 0

commit google-noto-fonts for openSUSE:Factory
by root＠hilbert.suse.de 28 May '15

28 May '15

Hello community, here is the log from the commit of package google-noto-fonts for openSUSE:Factory checked in at 2015-05-28 09:56:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/google-noto-fonts (Old) and /work/SRC/openSUSE:Factory/.google-noto-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "google-noto-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/google-noto-fonts/google-noto-fonts.changes 2015-02-16 21:22:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.google-noto-fonts.new/google-noto-fonts.changes 2015-05-28 09:56:33.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 27 09:43:39 UTC 2015 - aj(a)ajaissle.de + +- Fix rpm group classification (X11/Font -> X11/Fonts) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ google-noto-fonts.spec ++++++ ++++ 866 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/google-noto-fonts/google-noto-fonts.spec ++++ and /work/SRC/openSUSE:Factory/.google-noto-fonts.new/google-noto-fonts.spec ++++++ generate-specfile.sh ++++++ --- /var/tmp/diff_new_pack.cSkveF/_old 2015-05-28 09:56:35.000000000 +0200 +++ /var/tmp/diff_new_pack.cSkveF/_new 2015-05-28 09:56:35.000000000 +0200 @@ -29,7 +29,7 @@ sed -i "s/@SUBPACKAGE_HEADERS@/%package -n $packagename\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec sed -i "s/@SUBPACKAGE_HEADERS@/Summary: $summary\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec - sed -i "s;@SUBPACKAGE_HEADERS@;Group: System/X11/Font\n@SUBPACKAGE_HEADERS@;" $pkg_name.spec + sed -i "s;@SUBPACKAGE_HEADERS@;Group: System/X11/Fonts\n@SUBPACKAGE_HEADERS@;" $pkg_name.spec sed -i "s/@SUBPACKAGE_HEADERS@/Requires: $pkg_name\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec sed -i "s/@SUBPACKAGE_HEADERS@/\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec sed -i "s/@SUBPACKAGE_HEADERS@/%description -n $packagename\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec

1 0

commit docker for openSUSE:Factory
by root＠hilbert.suse.de 28 May '15

28 May '15

Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2015-05-28 09:56:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "docker" Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2015-05-26 12:33:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.docker.new/docker.changes 2015-05-28 09:56:16.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 27 10:02:51 UTC 2015 - dmacvicar(a)suse.de + +- build and install man pages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.Uesrn7/_old 2015-05-28 09:56:17.000000000 +0200 +++ /var/tmp/diff_new_pack.Uesrn7/_new 2015-05-28 09:56:17.000000000 +0200 @@ -44,6 +44,7 @@ BuildRequires: device-mapper-devel >= 1.2.68 BuildRequires: glibc-devel-static BuildRequires: go >= 1.3 +BuildRequires: go-go-md2man BuildRequires: libapparmor-devel BuildRequires: libbtrfs-devel >= 3.8 BuildRequires: procps @@ -108,6 +109,7 @@ export DOCKER_BUILDTAGS="exclude_graphdriver_aufs apparmor selinux" export DOCKER_GITCOMMIT=%{git_version} ./hack/make.sh dynbinary +docs/man/md2man-all.sh %install install -d %{buildroot}%{go_contribdir} @@ -139,6 +141,12 @@ # sysconfig file install -D -m 644 %SOURCE4 %{buildroot}/var/adm/fillup-templates/sysconfig.docker +# install manpages +install -d %{buildroot}%{_mandir}/man1 +install -p -m 644 docs/man/man1/*.1 %{buildroot}%{_mandir}/man1 +install -d %{buildroot}%{_mandir}/man5 +install -p -m 644 docs/man/man5/Dockerfile.5 %{buildroot}%{_mandir}/man5 + %pre echo "creating group docker..." groupadd -r docker 2>/dev/null || : @@ -165,6 +173,9 @@ %{_unitdir}/%{name}.socket %{_prefix}/lib/udev/rules.d/80-%{name}.rules /var/adm/fillup-templates/sysconfig.docker +%{_mandir}/man1/docker-*.1.gz +%{_mandir}/man1/docker.1.gz +%{_mandir}/man5/Dockerfile.5.gz %files bash-completion %defattr(-,root,root)

1 0

commit gts for openSUSE:Factory
by root＠hilbert.suse.de 28 May '15

28 May '15

Hello community, here is the log from the commit of package gts for openSUSE:Factory checked in at 2015-05-28 09:55:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gts (Old) and /work/SRC/openSUSE:Factory/.gts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gts" Changes: -------- --- /work/SRC/openSUSE:Factory/gts/gts.changes 2013-12-03 16:11:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gts.new/gts.changes 2015-05-28 09:55:43.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 27 09:38:23 UTC 2015 - aj(a)ajaissle.de + +- Uppercase rpm group + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gts.spec ++++++ --- /var/tmp/diff_new_pack.4KuJfV/_old 2015-05-28 09:55:43.000000000 +0200 +++ /var/tmp/diff_new_pack.4KuJfV/_new 2015-05-28 09:55:43.000000000 +0200 @@ -62,7 +62,7 @@ %package -n %{libname} Summary: GTS Runtime Library -Group: System/libraries +Group: System/Libraries %description -n %{libname} This package provides the GTS runtime library.

1 0