December 2013 - openSUSE Commits - openSUSE Mailing Lists

commit libqt5-qtdoc for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package libqt5-qtdoc for openSUSE:Factory checked in at 2013-12-30 10:08:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtdoc (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtdoc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtdoc" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtdoc/libqt5-qtdoc.changes 2013-12-02 07:22:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtdoc.new/libqt5-qtdoc.changes 2013-12-30 10:08:58.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Dec 21 20:00:39 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Update to 5.2.0 final: + * For more details please see: + http://blog.qt.digia.com/blog/2013/12/12/qt-5-2-released-the-best-qt-yet/ + http://qt-project.org/qt5/qt52 + http://qt.digia.com/Product/Whats-New/Qt-52/ + +------------------------------------------------------------------- Old: ---- qt-docs-qchs-5.2.0-rc1.tar.xz qtdoc-opensource-src-5.2.0-rc1.tar.xz New: ---- qt-docs-qchs-5.2.0.tar.xz qtdoc-opensource-src-5.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtdoc.spec ++++++ --- /var/tmp/diff_new_pack.awXaJZ/_old 2013-12-30 10:09:05.000000000 +0100 +++ /var/tmp/diff_new_pack.awXaJZ/_new 2013-12-30 10:09:05.000000000 +0100 @@ -18,10 +18,10 @@ Name: libqt5-qtdoc -Version: 5.2.0~rc1 +Version: 5.2.0 Release: 0 %define base_name libqt5 -%define real_version 5.2.0-rc1 +%define real_version 5.2.0 %define tar_version qtdoc-opensource-src-%{real_version} BuildRequires: fdupes BuildRequires: libqt5-qtbase-devel ++++++ qt-docs-qchs-5.2.0-rc1.tar.xz -> qt-docs-qchs-5.2.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-qtdoc/qt-docs-qchs-5.2.0-rc1.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtdoc.new/qt-docs-qchs-5.2.0.tar.xz differ: char 26, line 1 ++++++ qtdoc-opensource-src-5.2.0-rc1.tar.xz -> qtdoc-opensource-src-5.2.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-qtdoc/qtdoc-opensource-src-5.2.0-rc1.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtdoc.new/qtdoc-opensource-src-5.2.0.tar.xz differ: char 27, 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 libpng16 for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package libpng16 for openSUSE:Factory checked in at 2013-12-30 10:08:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpng16 (Old) and /work/SRC/openSUSE:Factory/.libpng16.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libpng16" Changes: -------- --- /work/SRC/openSUSE:Factory/libpng16/libpng16.changes 2013-12-02 15:08:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libpng16.new/libpng16.changes 2013-12-30 10:08:41.000000000 +0100 @@ -1,0 +2,19 @@ +Fri Dec 20 07:08:48 UTC 2013 - pgajdos(a)suse.com + +- updated to 1.6.8: + Changed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpread.c to + #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED to be consistent with + what is in pngpriv.h. + Moved prototype for png_handle_unknown() in pngpriv.h outside of + the #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED/#endif block. + Enabled WRITE_INVERT and WRITE_PACK in contrib/pngminim/encoder. + Fixed pngvalid 'fail' function declaration on the Intel C Compiler. + This reverts to the previous 'static' implementation and works round + the 'unused static function' warning by using PNG_UNUSED(). + Handle zero-length PLTE chunk or NULL palette with png_error() + instead of png_chunk_report(), which by default issues a warning + rather than an error, leading to later reading from a NULL pointer + (png_ptr->palette) in png_do_expand_palette(). This is CVE-2013-6954 + and VU#650142. + +------------------------------------------------------------------- Old: ---- libpng-1.6.7.tar.xz libpng-1.6.7.tar.xz.asc New: ---- libpng-1.6.8.tar.xz libpng-1.6.8.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpng16.spec ++++++ --- /var/tmp/diff_new_pack.waCoVU/_old 2013-12-30 10:08:42.000000000 +0100 +++ /var/tmp/diff_new_pack.waCoVU/_new 2013-12-30 10:08:42.000000000 +0100 @@ -19,7 +19,7 @@ # %define major 1 %define minor 6 -%define micro 7 +%define micro 8 %define branch %{major}%{minor} %define libname libpng%{branch}-%{branch} ++++++ libpng-1.6.7.tar.xz -> libpng-1.6.8.tar.xz ++++++ ++++ 3681 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 libnfc for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package libnfc for openSUSE:Factory checked in at 2013-12-30 10:08:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnfc (Old) and /work/SRC/openSUSE:Factory/.libnfc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libnfc" Changes: -------- --- /work/SRC/openSUSE:Factory/libnfc/libnfc.changes 2013-06-05 17:45:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libnfc.new/libnfc.changes 2013-12-30 10:08:28.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Dec 24 17:28:36 UTC 2013 - jengelh(a)inai.de + +- Update to final release 1.7.0 +* pn53x: only create a current target when at least one have been + found +* pn532_uart: fix 'operation abort' feature with this driver +* pn532_uart: let more time to PN532 to wake-up, this fix some + specific cases where PN532 shown one of two runs +* usb: fix USB enumeration issue +* Fix pn53x_initiator_transceive_bytes_timed() measures for TypeB + +------------------------------------------------------------------- Old: ---- libnfc-1.7.0-rc7.tar.xz New: ---- libnfc-1.7.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnfc.spec ++++++ --- /var/tmp/diff_new_pack.NG8SDX/_old 2013-12-30 10:08:28.000000000 +0100 +++ /var/tmp/diff_new_pack.NG8SDX/_new 2013-12-30 10:08:28.000000000 +0100 @@ -17,16 +17,16 @@ Name: libnfc -%define lname libnfc4 +%define lname libnfc5 Summary: Library for Near Field Communication License: LGPL-3.0+ and GPL-2.0+ Group: Development/Libraries/C and C++ -Version: 1.7.0~rc7 +Version: 1.7.0 Release: 0 Url: http://libnfc.org/ #Git-Clone: http://code.google.com/p/libnfc/ -Source: %name-1.7.0-rc7.tar.xz +Source: %name-1.7.0.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -98,7 +98,7 @@ This package contains the NFC utilities. %prep -%setup -qn %name-1.7.0-rc7 +%setup -q %build if [ ! -e configure ]; then @@ -117,7 +117,7 @@ %files -n %lname %defattr(-,root,root) -%_libdir/libnfc.so.4* +%_libdir/libnfc.so.5* %files devel %defattr(-,root,root) ++++++ libnfc-1.7.0-rc7.tar.xz -> libnfc-1.7.0.tar.xz ++++++ ++++ 4446 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 libmatewnck for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package libmatewnck for openSUSE:Factory checked in at 2013-12-30 10:07:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmatewnck (Old) and /work/SRC/openSUSE:Factory/.libmatewnck.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmatewnck" Changes: -------- --- /work/SRC/openSUSE:Factory/libmatewnck/libmatewnck.changes 2013-12-18 19:21:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libmatewnck.new/libmatewnck.changes 2013-12-30 10:07:50.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Oct 29 16:26:14 UTC 2013 - p.drouand(a)gmail.com + +- Remove matekbd-common = %{version} Requires tag; just a mistake + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmatewnck.spec ++++++ --- /var/tmp/diff_new_pack.ehP3Yc/_old 2013-12-30 10:07:50.000000000 +0100 +++ /var/tmp/diff_new_pack.ehP3Yc/_new 2013-12-30 10:07:50.000000000 +0100 @@ -68,7 +68,6 @@ Summary: The MATE shared libraries Group: System/Libraries Provides: %{name} = %{version} -Requires: matekbd-common = %{version} Recommends: %{name}-lang %description -n %{_name} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgdata for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package libgdata for openSUSE:Factory checked in at 2013-12-30 10:07:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgdata (Old) and /work/SRC/openSUSE:Factory/.libgdata.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgdata" Changes: -------- --- /work/SRC/openSUSE:Factory/libgdata/libgdata.changes 2013-09-23 15:23:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgdata.new/libgdata.changes 2013-12-30 10:07:25.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Dec 19 23:17:13 UTC 2013 - zaitor(a)opensuse.org + +- Update to version 0.14.1: + + Fix build with recent gnome-common versions. + + Fix build and installed header files for C++. + + Remove deprecated function calls. + + Fix compilation with -fstrict-aliasing. + + Bugs fixed: bgo#712565, bgo#719647. + +------------------------------------------------------------------- Old: ---- libgdata-0.14.0.tar.xz New: ---- libgdata-0.14.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgdata.spec ++++++ --- /var/tmp/diff_new_pack.q48rzF/_old 2013-12-30 10:07:25.000000000 +0100 +++ /var/tmp/diff_new_pack.q48rzF/_new 2013-12-30 10:07:25.000000000 +0100 @@ -20,7 +20,7 @@ %define _sover 13 Name: libgdata -Version: 0.14.0 +Version: 0.14.1 Release: 0 Summary: GLib-based library for accessing online service APIs using the GData protocol License: LGPL-2.1+ ++++++ libgdata-0.14.0.tar.xz -> libgdata-0.14.1.tar.xz ++++++ ++++ 50354 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 leveldb for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package leveldb for openSUSE:Factory checked in at 2013-12-30 10:05:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/leveldb (Old) and /work/SRC/openSUSE:Factory/.leveldb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "leveldb" Changes: -------- --- /work/SRC/openSUSE:Factory/leveldb/leveldb.changes 2013-11-14 14:22:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.leveldb.new/leveldb.changes 2013-12-30 10:05:24.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 18 17:49:35 CET 2013 - ro(a)suse.de + +- add support for other archs (taken from debian, 0001-debian-ports.patch) + +------------------------------------------------------------------- New: ---- 0001-debian-ports.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ leveldb.spec ++++++ --- /var/tmp/diff_new_pack.U5vgvh/_old 2013-12-30 10:05:24.000000000 +0100 +++ /var/tmp/diff_new_pack.U5vgvh/_new 2013-12-30 10:05:24.000000000 +0100 @@ -19,11 +19,12 @@ Name: leveldb Version: 1.14.0 Release: 0 -License: BSD-3-Clause Summary: A key/value-store -Url: http://code.google.com/p/leveldb/ +License: BSD-3-Clause Group: Development/Libraries/C and C++ +Url: http://code.google.com/p/leveldb/ Source: leveldb-%{version}.tar.gz +Patch0: 0001-debian-ports.patch BuildRequires: gcc-c++ BuildRequires: snappy-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -65,6 +66,7 @@ %prep %setup -q +%patch0 -p1 %build make %{?_smp_flags} OPT="%{optflags}" ++++++ 0001-debian-ports.patch ++++++ Description: Add support for most of Debian architectures Author: Nobuhiro Iwamatsu <iwamatsu(a)debian.org> --- port/atomic_pointer.h | 136 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 126 insertions(+), 10 deletions(-) --- leveldb.orig/port/atomic_pointer.h +++ leveldb/port/atomic_pointer.h @@ -38,6 +38,18 @@ #define ARCH_CPU_ARM_FAMILY 1 #elif defined(__ppc__) || defined(__powerpc__) || defined(__powerpc64__) #define ARCH_CPU_PPC_FAMILY 1 +#elif defined(__ia64__) +#define ARCH_CPU_IA64_FAMILY 1 +#elif defined(__alpha__) +#define ARCH_CPU_ALPHA_FAMILY 1 +#elif defined(__s390x__) || defined(__s390__) +#define ARCH_CPU_S390_FAMILY 1 +#elif defined(__sparc__) || defined(__sparc64__) +#define ARCH_CPU_SPARC_FAMILY 1 +#elif defined(__sh__) +#define ARCH_CPU_SH_FAMILY 1 +#elif defined(__hppa__) || defined(__parisc__) +#define ARCH_CPU_PARISC_FAMILY 1 #endif namespace leveldb { @@ -50,9 +62,17 @@ namespace port { // http://msdn.microsoft.com/en-us/library/ms684208(v=vs.85).aspx #define LEVELDB_HAVE_MEMORY_BARRIER +#define ReadMemoryBarrier MemoryBarrier() +#define WriteMemoryBarrier MemoryBarrier() + // Gcc on x86 #elif defined(ARCH_CPU_X86_FAMILY) && defined(__GNUC__) -inline void MemoryBarrier() { +inline void ReadMemoryBarrier() { + // See http://gcc.gnu.org/ml/gcc/2003-04/msg01180.html for a discussion on + // this idiom. Also see http://en.wikipedia.org/wiki/Memory_ordering. + __asm__ __volatile__("" : : : "memory"); +} +inline void WriteMemoryBarrier() { // See http://gcc.gnu.org/ml/gcc/2003-04/msg01180.html for a discussion on // this idiom. Also see http://en.wikipedia.org/wiki/Memory_ordering. __asm__ __volatile__("" : : : "memory"); @@ -61,7 +81,12 @@ inline void MemoryBarrier() { // Sun Studio #elif defined(ARCH_CPU_X86_FAMILY) && defined(__SUNPRO_CC) -inline void MemoryBarrier() { +inline void ReadMemoryBarrier() { + // See http://gcc.gnu.org/ml/gcc/2003-04/msg01180.html for a discussion on + // this idiom. Also see http://en.wikipedia.org/wiki/Memory_ordering. + asm volatile("" : : : "memory"); +} +inline void WriteMemoryBarrier() { // See http://gcc.gnu.org/ml/gcc/2003-04/msg01180.html for a discussion on // this idiom. Also see http://en.wikipedia.org/wiki/Memory_ordering. asm volatile("" : : : "memory"); @@ -70,7 +95,10 @@ inline void MemoryBarrier() { // Mac OS #elif defined(OS_MACOSX) -inline void MemoryBarrier() { +inline void ReadMemoryBarrier() { + OSMemoryBarrier(); +} +inline void WriteMemoryBarrier() { OSMemoryBarrier(); } #define LEVELDB_HAVE_MEMORY_BARRIER @@ -88,17 +116,99 @@ typedef void (*LinuxKernelMemoryBarrierF // shows that the extra function call cost is completely negligible on // multi-core devices. // -inline void MemoryBarrier() { +inline void ReadMemoryBarrier() { + (*(LinuxKernelMemoryBarrierFunc)0xffff0fa0)(); +} +inline void WriteMemoryBarrier() { (*(LinuxKernelMemoryBarrierFunc)0xffff0fa0)(); } #define LEVELDB_HAVE_MEMORY_BARRIER // PPC #elif defined(ARCH_CPU_PPC_FAMILY) && defined(__GNUC__) -inline void MemoryBarrier() { - // TODO for some powerpc expert: is there a cheaper suitable variant? - // Perhaps by having separate barriers for acquire and release ops. - asm volatile("sync" : : : "memory"); + +inline void ReadMemoryBarrier() { +#ifdef __powerpc64__ + __asm__ __volatile__ ("lwsync" : : : "memory"); +#else + __asm__ __volatile__ ("sync" : : : "memory"); +#endif +} +inline void WriteMemoryBarrier() { + __asm__ __volatile__ ("sync" : : : "memory"); +} +#define LEVELDB_HAVE_MEMORY_BARRIER + +// IA64 +#elif defined(ARCH_CPU_IA64_FAMILY) +inline void ReadMemoryBarrier() { + __asm__ __volatile__ ("mf" : : : "memory"); +} +inline void WriteMemoryBarrier() { + __asm__ __volatile__ ("mf" : : : "memory"); +} +#define LEVELDB_HAVE_MEMORY_BARRIER + +// ALPHA +#elif defined(ARCH_CPU_ALPHA_FAMILY) + +inline void ReadMemoryBarrier() { + __asm__ __volatile__("mb" : : : "memory"); +} +inline void WriteMemoryBarrier() { + __asm__ __volatile__("wmb" : : : "memory"); +} +#define LEVELDB_HAVE_MEMORY_BARRIER + +// S390 +#elif defined(ARCH_CPU_S390_FAMILY) + +inline void ReadMemoryBarrier() { + asm volatile("bcr 15,0" : : : "memory"); +} +inline void WriteMemoryBarrier() { + asm volatile("bcr 15,0" : : : "memory"); +} +#define LEVELDB_HAVE_MEMORY_BARRIER + +// SPARC +#elif defined(ARCH_CPU_SPARC_FAMILY) + +inline void ReadMemoryBarrier() { + __asm__ __volatile__("" : : : "memory"); +} +inline void WriteMemoryBarrier() { + __asm__ __volatile__("" : : : "memory"); +} +#define LEVELDB_HAVE_MEMORY_BARRIER + +// SH +#elif defined(ARCH_CPU_SH_FAMILY) +#if defined(__SH4A__) || defined(__SH5__) +inline void ReadMemoryBarrier() { + __asm__ __volatile__ ("synco": : :"memory"); +} +inline void WriteMemoryBarrier() { + __asm__ __volatile__ ("synco": : :"memory"); +} +#else +inline void ReadMemoryBarrier() { + __asm__ __volatile__ ("": : :"memory"); +} +inline void WriteMemoryBarrier() { + __asm__ __volatile__ ("": : :"memory"); +} +#endif +#define LEVELDB_HAVE_MEMORY_BARRIER + +// PARISC +#elif defined(ARCH_CPU_PARISC_FAMILY) + +inline void ReadMemoryBarrier() { + __asm__ __volatile__("" : : : "memory") +} +inline void WriteMemoryBarrier() { + __asm__ __volatile__("" : : : "memory") } #define LEVELDB_HAVE_MEMORY_BARRIER @@ -116,11 +226,11 @@ class AtomicPointer { inline void NoBarrier_Store(void* v) { rep_ = v; } inline void* Acquire_Load() const { void* result = rep_; - MemoryBarrier(); + ReadMemoryBarrier(); return result; } inline void Release_Store(void* v) { - MemoryBarrier(); + WriteMemoryBarrier(); rep_ = v; } }; @@ -217,6 +327,12 @@ class AtomicPointer { #undef ARCH_CPU_X86_FAMILY #undef ARCH_CPU_ARM_FAMILY #undef ARCH_CPU_PPC_FAMILY +#undef ARCH_CPU_IA64_FAMILY +#undef ARCH_CPU_ALPHA_FAMILY +#undef ARCH_CPU_S390_FAMILY +#undef ARCH_CPU_SPARC_FAMILY +#undef ARCH_CPU_SH_FAMILY +#undef ARCH_CPU_PARISC_FAMILY } // namespace port } // namespace leveldb -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit itstool for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package itstool for openSUSE:Factory checked in at 2013-12-30 10:02:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/itstool (Old) and /work/SRC/openSUSE:Factory/.itstool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "itstool" Changes: -------- --- /work/SRC/openSUSE:Factory/itstool/itstool.changes 2013-11-26 06:10:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.itstool.new/itstool.changes 2013-12-30 10:02:10.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Dec 24 19:28:51 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 2.0.2: + + Fixed crash in locale filter and drop rule (bgo#715116). + + Don't hardcode python path (fdo#72533). + + Updated man page. +- Drop itstool-fix-crash.patch: fixed upstream. +- No longer replace the shebang in itstool and itstool.in: the + upstream provided solution sets it based on configure's findings. + +------------------------------------------------------------------- @@ -5 +16 @@ - drop rule (bgo#71511). + drop rule (bgo#715116). Old: ---- itstool-2.0.1.tar.bz2 itstool-fix-crash.patch New: ---- itstool-2.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ itstool.spec ++++++ --- /var/tmp/diff_new_pack.3qC1Y8/_old 2013-12-30 10:02:11.000000000 +0100 +++ /var/tmp/diff_new_pack.3qC1Y8/_new 2013-12-30 10:02:11.000000000 +0100 @@ -17,15 +17,13 @@ Name: itstool -Version: 2.0.1 +Version: 2.0.2 Release: 0 Summary: Tool to translate XML documents using PO files License: GPL-3.0+ Group: Development/Tools/Other Url: http://itstool.org Source: http://files.itstool.org/itstool/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM itstool-fix-crash.patch bgo#715116 dimstar(a)opensuse.org -- Fixed crash in locale filter and drop rule -Patch0: itstool-fix-crash.patch BuildRequires: libxml2-python Requires: libxml2-python BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,8 +37,6 @@ %prep %setup -q -%patch0 -p1 -sed -i "s:#!/usr/bin/env python:#!/usr/bin/python:" itstool itstool.in %build %configure ++++++ itstool-2.0.1.tar.bz2 -> itstool-2.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.1/ChangeLog new/itstool-2.0.2/ChangeLog --- old/itstool-2.0.1/ChangeLog 2013-11-18 17:21:03.000000000 +0100 +++ new/itstool-2.0.2/ChangeLog 2013-12-18 04:16:54.000000000 +0100 @@ -1,3 +1,50 @@ +commit 6596a9cd30e4c1ff8599caf724e2aed3dd6947bf +Author: Shaun McCance <shaunm(a)gnome.org> +Date: Tue Dec 17 22:14:43 2013 -0500 + + itstool.1: Update man page + + itstool.1.in | 137 ++++++++++++++++++++++++++++++++++++++-------------------- + itstool.in | 2 +- + 2 files changed, 91 insertions(+), 48 deletions(-) + +commit 1cce05f8c3d2b52f030b3e253d37ae5a6eee8003 +Author: Ryan Lortie <desrt(a)desrt.ca> +Date: Mon Dec 9 13:17:55 2013 -0500 + + Don't hardcode python path + + Instead, use automake to find it at runtime and put #!@PYTHON@ at the top of + itstool.in. + + https://bugs.freedesktop.org/show_bug.cgi?id=72533 + + configure.ac | 2 ++ + itstool.in | 2 +- + 2 files changed, 3 insertions(+), 1 deletions(-) + +commit 46067ed60cbe1e5e3efe176da1f40f8219336490 +Author: Shaun McCance <shaunm(a)gnome.org> +Date: Sun Nov 24 14:10:03 2013 -0500 + + Fixed crash in locale filter and drop rule, #715116 + + When the dropped node has no preceding sibling, itstool crashes + because it tries to unlink prev node if it's blank. + + itstool.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 6d90f59ee2fcd9492501b337a15c65bfce78afcd +Author: Shaun McCance <shaunm(a)gnome.org> +Date: Mon Nov 18 11:21:10 2013 -0500 + + Version 2.0.1 + + NEWS | 4 ++++ + configure.ac | 2 +- + 2 files changed, 5 insertions(+), 1 deletions(-) + commit b317a7c7362938098379f2f8db42f0f94d6f98dd Author: Shaun McCance <shaunm(a)gnome.org> Date: Mon Nov 4 16:32:34 2013 -0500 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.1/Makefile.in new/itstool-2.0.2/Makefile.in --- old/itstool-2.0.1/Makefile.in 2013-11-18 17:21:01.000000000 +0100 +++ new/itstool-2.0.2/Makefile.in 2013-12-18 04:16:51.000000000 +0100 @@ -155,6 +155,11 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -187,9 +192,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.1/NEWS new/itstool-2.0.2/NEWS --- old/itstool-2.0.1/NEWS 2013-11-18 17:20:44.000000000 +0100 +++ new/itstool-2.0.2/NEWS 2013-12-18 04:16:37.000000000 +0100 @@ -1,3 +1,9 @@ +2.0.2 +===== +* Fixed crash in locale filter and drop rule, #715116 +* Don't hardcode python path, #72533 (Ryan Lortie) +* Updated man page + 2.0.1 ===== * Reworked default ITS rules for better performance diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.1/aclocal.m4 new/itstool-2.0.2/aclocal.m4 --- old/itstool-2.0.1/aclocal.m4 2013-11-18 17:21:00.000000000 +0100 +++ new/itstool-2.0.2/aclocal.m4 2013-12-18 04:16:49.000000000 +0100 @@ -391,6 +391,228 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 +# Free Software Foundation, Inc. +# +# This file 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. + +# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# --------------------------------------------------------------------------- +# Adds support for distributing Python modules and packages. To +# install modules, copy them to $(pythondir), using the python_PYTHON +# automake variable. To install a package with the same name as the +# automake package, install to $(pkgpythondir), or use the +# pkgpython_PYTHON automake variable. +# +# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as +# locations to install python extension modules (shared libraries). +# Another macro is required to find the appropriate flags to compile +# extension modules. +# +# If your package is configured with a different prefix to python, +# users will have to add the install directory to the PYTHONPATH +# environment variable, or create a .pth file (see the python +# documentation for details). +# +# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will +# cause an error if the version of python installed on the system +# doesn't meet the requirement. MINIMUM-VERSION should consist of +# numbers and dots only. +AC_DEFUN([AM_PATH_PYTHON], + [ + dnl Find a Python interpreter. Python versions prior to 2.0 are not + dnl supported. (2.0 was released on October 16, 2000). + m4_define_default([_AM_PYTHON_INTERPRETER_LIST], + [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl +python2.1 python2.0]) + + m4_if([$1],[],[ + dnl No version check is needed. + # Find any Python interpreter. + if test -z "$PYTHON"; then + AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :) + fi + am_display_PYTHON=python + ], [ + dnl A version check is needed. + if test -n "$PYTHON"; then + # If the user set $PYTHON, use it and don't search something else. + AC_MSG_CHECKING([whether $PYTHON version >= $1]) + AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], + [AC_MSG_RESULT(yes)], + [AC_MSG_ERROR(too old)]) + am_display_PYTHON=$PYTHON + else + # Otherwise, try each interpreter until we find one that satisfies + # VERSION. + AC_CACHE_CHECK([for a Python interpreter with version >= $1], + [am_cv_pathless_PYTHON],[ + for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do + test "$am_cv_pathless_PYTHON" = none && break + AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break]) + done]) + # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. + if test "$am_cv_pathless_PYTHON" = none; then + PYTHON=: + else + AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) + fi + am_display_PYTHON=$am_cv_pathless_PYTHON + fi + ]) + + if test "$PYTHON" = :; then + dnl Run any user-specified action, or abort. + m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) + else + + dnl Query Python for its version number. Getting [:3] seems to be + dnl the best way to do this; it's what "site.py" does in the standard + dnl library. + + AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], + [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) + AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) + + dnl Use the values of $prefix and $exec_prefix for the corresponding + dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made + dnl distinct variables so they can be overridden if need be. However, + dnl general consensus is that you shouldn't need this ability. + + AC_SUBST([PYTHON_PREFIX], ['${prefix}']) + AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) + + dnl At times (like when building shared libraries) you may want + dnl to know which OS platform Python thinks this is. + + AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], + [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) + AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) + + + dnl Set up 4 directories: + + dnl pythondir -- where to install python scripts. This is the + dnl site-packages directory, not the python standard library + dnl directory like in previous automake betas. This behavior + dnl is more consistent with lispdir.m4 for example. + dnl Query distutils for this directory. distutils does not exist in + dnl Python 1.5, so we fall back to the hardcoded directory if it + dnl doesn't work. + AC_CACHE_CHECK([for $am_display_PYTHON script directory], + [am_cv_python_pythondir], + [if test "x$prefix" = xNONE + then + am_py_prefix=$ac_default_prefix + else + am_py_prefix=$prefix + fi + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; + *) + case $am_py_prefix in + /usr|/System*) ;; + *) + am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac + ]) + AC_SUBST([pythondir], [$am_cv_python_pythondir]) + + dnl pkgpythondir -- $PACKAGE directory under pythondir. Was + dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is + dnl more consistent with the rest of automake. + + AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) + + dnl pyexecdir -- directory for installing python extension modules + dnl (shared libraries) + dnl Query distutils for this directory. distutils does not exist in + dnl Python 1.5, so we fall back to the hardcoded directory if it + dnl doesn't work. + AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], + [am_cv_python_pyexecdir], + [if test "x$exec_prefix" = xNONE + then + am_py_exec_prefix=$am_py_prefix + else + am_py_exec_prefix=$exec_prefix + fi + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; + *) + case $am_py_exec_prefix in + /usr|/System*) ;; + *) + am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac + ]) + AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) + + dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) + + AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) + + dnl Run any user-specified action. + $2 + fi + +]) + + +# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# --------------------------------------------------------------------------- +# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION. +# Run ACTION-IF-FALSE otherwise. +# This test uses sys.hexversion instead of the string equivalent (first +# word of sys.version), in order to cope with versions such as 2.2c1. +# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000). +AC_DEFUN([AM_PYTHON_CHECK_VERSION], + [prog="import sys +# split strings by '.' and convert to numeric. Append some zeros +# because we need at least 4 digits for the hex conversion. +# map returns an iterator in Python 3.0 and a list in 2.x +minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]] +minverhex = 0 +# xrange is not present in Python 3.0 and range returns an iterator +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] +sys.exit(sys.hexversion < minverhex)" + AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file 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. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.1/configure new/itstool-2.0.2/configure --- old/itstool-2.0.1/configure 2013-11-18 17:21:01.000000000 +0100 +++ new/itstool-2.0.2/configure 2013-12-18 04:16:50.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.66 for itstool 2.0.1. +# Generated by GNU Autoconf 2.66 for itstool 2.0.2. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -548,13 +548,22 @@ # Identity of this package. PACKAGE_NAME='itstool' PACKAGE_TARNAME='itstool' -PACKAGE_VERSION='2.0.1' -PACKAGE_STRING='itstool 2.0.1' +PACKAGE_VERSION='2.0.2' +PACKAGE_STRING='itstool 2.0.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' ac_subst_vars='LTLIBOBJS LIBOBJS +pkgpyexecdir +pyexecdir +pkgpythondir +pythondir +PYTHON_PLATFORM +PYTHON_EXEC_PREFIX +PYTHON_PREFIX +PYTHON_VERSION +PYTHON DATADIR am__untar am__tar @@ -1165,7 +1174,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 itstool 2.0.1 to adapt to many kinds of systems. +\`configure' configures itstool 2.0.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1231,7 +1240,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of itstool 2.0.1:";; + short | recursive ) echo "Configuration of itstool 2.0.2:";; esac cat <<\_ACEOF @@ -1298,7 +1307,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -itstool configure 2.0.1 +itstool configure 2.0.2 generated by GNU Autoconf 2.66 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1315,7 +1324,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by itstool $as_me 2.0.1, which was +It was created by itstool $as_me 2.0.2, which was generated by GNU Autoconf 2.66. Invocation command line was $ $0 $@ @@ -2130,7 +2139,7 @@ # Define the identity of the package. PACKAGE='itstool' - VERSION='2.0.1' + VERSION='2.0.2' cat >>confdefs.h <<_ACEOF @@ -2180,6 +2189,233 @@ )` + + + + + if test -n "$PYTHON"; then + # If the user set $PYTHON, use it and don't search something else. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.6" >&5 +$as_echo_n "checking whether $PYTHON version >= 2.6... " >&6; } + prog="import sys +# split strings by '.' and convert to numeric. Append some zeros +# because we need at least 4 digits for the hex conversion. +# map returns an iterator in Python 3.0 and a list in 2.x +minver = list(map(int, '2.6'.split('.'))) + [0, 0, 0] +minverhex = 0 +# xrange is not present in Python 3.0 and range returns an iterator +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] +sys.exit(sys.hexversion < minverhex)" + if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5 + ($PYTHON -c "$prog") >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + as_fn_error $? "too old" "$LINENO" 5 +fi + am_display_PYTHON=$PYTHON + else + # Otherwise, try each interpreter until we find one that satisfies + # VERSION. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.6" >&5 +$as_echo_n "checking for a Python interpreter with version >= 2.6... " >&6; } +if test "${am_cv_pathless_PYTHON+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + test "$am_cv_pathless_PYTHON" = none && break + prog="import sys +# split strings by '.' and convert to numeric. Append some zeros +# because we need at least 4 digits for the hex conversion. +# map returns an iterator in Python 3.0 and a list in 2.x +minver = list(map(int, '2.6'.split('.'))) + [0, 0, 0] +minverhex = 0 +# xrange is not present in Python 3.0 and range returns an iterator +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] +sys.exit(sys.hexversion < minverhex)" + if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5 + ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then : + break +fi + done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 +$as_echo "$am_cv_pathless_PYTHON" >&6; } + # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. + if test "$am_cv_pathless_PYTHON" = none; then + PYTHON=: + else + # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. +set dummy $am_cv_pathless_PYTHON; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PYTHON+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $PYTHON in + [\\/]* | ?:[\\/]*) + ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PYTHON=$ac_cv_path_PYTHON +if test -n "$PYTHON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi + am_display_PYTHON=$am_cv_pathless_PYTHON + fi + + + if test "$PYTHON" = :; then + as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 + else + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 +$as_echo_n "checking for $am_display_PYTHON version... " >&6; } +if test "${am_cv_python_version+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 +$as_echo "$am_cv_python_version" >&6; } + PYTHON_VERSION=$am_cv_python_version + + + + PYTHON_PREFIX='${prefix}' + + PYTHON_EXEC_PREFIX='${exec_prefix}' + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 +$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } +if test "${am_cv_python_platform+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 +$as_echo "$am_cv_python_platform" >&6; } + PYTHON_PLATFORM=$am_cv_python_platform + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 +$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } +if test "${am_cv_python_pythondir+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "x$prefix" = xNONE + then + am_py_prefix=$ac_default_prefix + else + am_py_prefix=$prefix + fi + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; + *) + case $am_py_prefix in + /usr|/System*) ;; + *) + am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 +$as_echo "$am_cv_python_pythondir" >&6; } + pythondir=$am_cv_python_pythondir + + + + pkgpythondir=\${pythondir}/$PACKAGE + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 +$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } +if test "${am_cv_python_pyexecdir+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "x$exec_prefix" = xNONE + then + am_py_exec_prefix=$am_py_prefix + else + am_py_exec_prefix=$exec_prefix + fi + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; + *) + case $am_py_exec_prefix in + /usr|/System*) ;; + *) + am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 +$as_echo "$am_cv_python_pyexecdir" >&6; } + pyexecdir=$am_cv_python_pyexecdir + + + + pkgpyexecdir=\${pyexecdir}/$PACKAGE + + + + fi + + + py_module=libxml2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python module $py_module" >&5 $as_echo_n "checking for python module $py_module... " >&6; } @@ -2739,7 +2975,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by itstool $as_me 2.0.1, which was +This file was extended by itstool $as_me 2.0.2, which was generated by GNU Autoconf 2.66. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2792,7 +3028,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -itstool config.status 2.0.1 +itstool config.status 2.0.2 configured by $0, generated by GNU Autoconf 2.66, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.1/configure.ac new/itstool-2.0.2/configure.ac --- old/itstool-2.0.1/configure.ac 2013-11-18 17:20:49.000000000 +0100 +++ new/itstool-2.0.2/configure.ac 2013-12-18 04:16:41.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([itstool], [2.0.1], []) +AC_INIT([itstool], [2.0.2], []) AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2]) DATADIR=`( @@ -10,6 +10,8 @@ )` AC_SUBST([DATADIR]) +AM_PATH_PYTHON([2.6]) + py_module=libxml2 AC_MSG_CHECKING(for python module $py_module) echo "import $py_module" | python - &>/dev/null diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.1/its/Makefile.in new/itstool-2.0.2/its/Makefile.in --- old/itstool-2.0.1/its/Makefile.in 2013-11-18 17:21:01.000000000 +0100 +++ new/itstool-2.0.2/its/Makefile.in 2013-12-18 04:16:51.000000000 +0100 @@ -97,6 +97,11 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -129,9 +134,13 @@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.1/itstool new/itstool-2.0.2/itstool --- old/itstool-2.0.1/itstool 2013-11-18 17:21:03.000000000 +0100 +++ new/itstool-2.0.2/itstool 2013-12-18 04:16:53.000000000 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/python -s # -# Copyright (c) 2010-2011 Shaun McCance <shaunm(a)gnome.org> +# Copyright (c) 2010-2013 Shaun McCance <shaunm(a)gnome.org> # # ITS Tool program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by the @@ -17,7 +17,7 @@ # Place, Suite 330, Boston, MA 0211-1307 USA. # -VERSION="2.0.1" +VERSION="2.0.2" DATADIR="/usr/local/share" import gettext @@ -859,7 +859,7 @@ prev = node.prev node.unlinkNode() node.freeNode() - if prev.isBlankNode(): + if prev is not None and prev.isBlankNode(): prev.unlinkNode() prev.freeNode() return @@ -914,7 +914,7 @@ prev = node.prev node.unlinkNode() node.freeNode() - if prev.isBlankNode(): + if prev is not None and prev.isBlankNode(): prev.unlinkNode() prev.freeNode() return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.1/itstool.1 new/itstool-2.0.2/itstool.1 --- old/itstool-2.0.1/itstool.1 2013-11-18 17:21:03.000000000 +0100 +++ new/itstool-2.0.2/itstool.1 2013-12-18 04:16:53.000000000 +0100 @@ -1,77 +1,120 @@ -.TH ITSTOOL "1" "May 2011" "itstool 2.0.1" -.SH NAME +.TH "ITSTOOL" "1" "December 2013" "itstool 2.0.2" + +.SH "NAME" itstool \- convert between XML and PO using ITS -.SH SYNOPSIS -itstool [OPTIONS] [XMLFILES] + +.SH "SYNOPSIS" +itstool [OPTIONS] XMLFILES... +.br +itstool \fB\-m\fR <MOFILE> [OPTIONS] XMLFILES... .br -itstool \fB\-m\fR <MOFILE> [OPTIONS] [XMLFILES] +itstool \fB\-j\fR <XMLFILE> [OPTIONS] MOFILES... -.SH DESCRIPTION -.BR itstool -extracts messages from XML files and outputs PO template files, then merges -translations from MO files to create translated XML files. It determines what -to translate and how to chunk it into messages using the W3C Internationalization -Tag Set (ITS). -To extract messages from XML files \fBFILES\fR and output them to \fBOUT.pot\fR: +.SH "DESCRIPTION" +\fBitstool \fR extracts messages from XML files and outputs PO template files, +then merges translations from MO files to create translated XML files. It +determines what to translate and how to chunk it into messages using the W3C +Internationalization Tag Set (ITS). -\fBitstool -o OUT.pot FILES\fR +To extract messages from XML files \fBXMLFILES\fR and output them to \fBOUT.pot\fR: + +.BR "itstool \-o OUT.pot XMLFILES" After merging with existing translations or translating strings, generate an MO file with \fBmsgfmt(1)\fR, then output translated files to the directory \fBDIR\fR: -\fBitstool -m OUT.mo -o DIR FILES\fR +.BR "itstool \-m OUT.mo \-o DIR XMLFILES" + +You can also create a single multilingual XML output file using an input XML +file and a set of MO files: + +.BR "itstool \-j FILE.xml \-o OUT.xml MOFILES" ITS definitions are loaded from the built-in rules, rules embedded in the source XML files, files passed with the \fB-i\fR option, and ITS attributes in the source -XML files. Later definitions take precedence. +XML files. Later definitions take precedence. You can disable built-in rules by +passing the \fB-n\fR option. + + +.SH "OPTIONS" -.SH OPTIONS .SS "Extracting" -.IP "\fB\-o \fIFILE\fR" 4 + +.IP "\fB\-o \fIOUT.pot\fR" 4 .PD 0 -.IP "\fB\-\-out=\fIFILE \fR" 4 -.PD -output PO template to the file -.BR OUT +.IP "\fB\-\-out \fIOUT.pot\fR" 4 +output PO template to the file \fBOUT.pot\fR + .SS "Merging" -.IP "\fB\-m \fIFILE\fR" 4 + +.IP "\fB\-m \fIMOFILE\fR \fIXMLFILES\fR" 4 .PD 0 -.IP "\fB\-\-merge=\fIFILE \fR" 4 -.PD -merge from an MO file -.BR FILE -and output XML files -.TP +.IP "\fB\-\-merge \fIMOFILE\fR \fIXMLFILES\fR" 4 +merge from an MO file \fBMOFILE\fR and output translated XML files for source \fBXMLFILES\fR + .IP "\fB\-l \fILANG\fR" 4 .PD 0 -.IP "\fB\-\-lang=\fILANG \fR" 4 -.PD +.IP "\fB\-\-lang \fILANG \fR" 4 explicitly set the language code output to XML -.TP -.IP "\fB\-o \fIFILE\fR" 4 + +.IP "\fB\-o \fIOUT\fR" 4 .PD 0 -.IP "\fB\-\-out=\fIFILE \fR" 4 -.PD -output XML files in the directory -.BR OUT +.IP "\fB\-\-out \fIOUT \fR" 4 +output XML files in the directory \fBOUT\fR + +.SS "Joining" + +.IP "\fB\-j \fXMLIFILE\fR \fIMOFILES\fR" 4 +.PD 0 +.IP "\fB\-\-join \fIXMLFILE\fR \fIMOFILES\fR" 4 +join translations from \fBMOFILES\fR into a multilingual file based on source \fBXMLFILE\fR + +.IP "\fB\-o \fIOUT.xml\fR" 4 +.PD 0 +.IP "\fB\-\-out \fIOUT.xml\fR" 4 +output to the XML file \fBOUT.xml\fR + .SS "Common" + .IP "\fB\-i \fIITS\fR" 4 .PD 0 -.IP "\fB\-\-its=\fIITS \fR" 4 -.PD -load the ITS rules in the file ITS (can specify -multiple times) +.IP "\fB\-\-its \fIITS\fR" 4 +load the ITS rules in the file \fBITS\fR (can specify multiple times) + +.IP "\fB\-n\fR" 4 +.PD 0 +.IP "\fB\-\-no\-builtins\fR" 4 +do not apply the built-in ITS rules that ship with itstool + +.IP "\fB\-s\fR" 4 +.PD 0 +.IP "\fB\-\-strict\fR" 4 +exit with error when PO files contain broken XML + +.IP "\fB\-d\fR" 4 +.PD 0 +.IP "\fB\-\-load\-dtd\fR" 4 +load external DTDs used by input XML files + +.IP "\fB\-k\fR" 4 +.PD 0 +.IP "\fB\-\-keep\-entities\fR" 4 +keep entity references unexpanded in PO files + +.IP "\fB\-p \fINAME VALUE\fR" 4 +.PD 0 +.IP "\fB\-\-param \fINAME VALUE\fR" 4 +define ITS parameter \fBNAME\fR to the value \fBVALUE\fR (can specify multiple times) + -.SH AUTHOR +.SH "AUTHOR" Shaun McCance <shaunm(a)gnome.org> + .SH "SEE ALSO" -More documentation for -.B itstool -is maintained online. For more information, see: -.IP -.B http://itstool.org/documentation/ -.PP +More documentation for \fBitstool\fR is maintained online. For more information, see: + +.BR "http://itstool.org/documentation/" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.1/itstool.1.in new/itstool-2.0.2/itstool.1.in --- old/itstool-2.0.1/itstool.1.in 2011-05-09 22:24:10.000000000 +0200 +++ new/itstool-2.0.2/itstool.1.in 2013-12-17 18:17:42.000000000 +0100 @@ -1,77 +1,120 @@ -.TH ITSTOOL "1" "May 2011" "itstool @VERSION@" -.SH NAME +.TH "ITSTOOL" "1" "December 2013" "itstool @VERSION@" + +.SH "NAME" itstool \- convert between XML and PO using ITS -.SH SYNOPSIS -itstool [OPTIONS] [XMLFILES] + +.SH "SYNOPSIS" +itstool [OPTIONS] XMLFILES... +.br +itstool \fB\-m\fR <MOFILE> [OPTIONS] XMLFILES... .br -itstool \fB\-m\fR <MOFILE> [OPTIONS] [XMLFILES] +itstool \fB\-j\fR <XMLFILE> [OPTIONS] MOFILES... -.SH DESCRIPTION -.BR itstool -extracts messages from XML files and outputs PO template files, then merges -translations from MO files to create translated XML files. It determines what -to translate and how to chunk it into messages using the W3C Internationalization -Tag Set (ITS). -To extract messages from XML files \fBFILES\fR and output them to \fBOUT.pot\fR: +.SH "DESCRIPTION" +\fBitstool \fR extracts messages from XML files and outputs PO template files, +then merges translations from MO files to create translated XML files. It +determines what to translate and how to chunk it into messages using the W3C +Internationalization Tag Set (ITS). -\fBitstool -o OUT.pot FILES\fR +To extract messages from XML files \fBXMLFILES\fR and output them to \fBOUT.pot\fR: + +.BR "itstool \-o OUT.pot XMLFILES" After merging with existing translations or translating strings, generate an MO file with \fBmsgfmt(1)\fR, then output translated files to the directory \fBDIR\fR: -\fBitstool -m OUT.mo -o DIR FILES\fR +.BR "itstool \-m OUT.mo \-o DIR XMLFILES" + +You can also create a single multilingual XML output file using an input XML +file and a set of MO files: + +.BR "itstool \-j FILE.xml \-o OUT.xml MOFILES" ITS definitions are loaded from the built-in rules, rules embedded in the source XML files, files passed with the \fB-i\fR option, and ITS attributes in the source -XML files. Later definitions take precedence. +XML files. Later definitions take precedence. You can disable built-in rules by +passing the \fB-n\fR option. + + +.SH "OPTIONS" -.SH OPTIONS .SS "Extracting" -.IP "\fB\-o \fIFILE\fR" 4 + +.IP "\fB\-o \fIOUT.pot\fR" 4 .PD 0 -.IP "\fB\-\-out=\fIFILE \fR" 4 -.PD -output PO template to the file -.BR OUT +.IP "\fB\-\-out \fIOUT.pot\fR" 4 +output PO template to the file \fBOUT.pot\fR + .SS "Merging" -.IP "\fB\-m \fIFILE\fR" 4 + +.IP "\fB\-m \fIMOFILE\fR \fIXMLFILES\fR" 4 .PD 0 -.IP "\fB\-\-merge=\fIFILE \fR" 4 -.PD -merge from an MO file -.BR FILE -and output XML files -.TP +.IP "\fB\-\-merge \fIMOFILE\fR \fIXMLFILES\fR" 4 +merge from an MO file \fBMOFILE\fR and output translated XML files for source \fBXMLFILES\fR + .IP "\fB\-l \fILANG\fR" 4 .PD 0 -.IP "\fB\-\-lang=\fILANG \fR" 4 -.PD +.IP "\fB\-\-lang \fILANG \fR" 4 explicitly set the language code output to XML -.TP -.IP "\fB\-o \fIFILE\fR" 4 + +.IP "\fB\-o \fIOUT\fR" 4 .PD 0 -.IP "\fB\-\-out=\fIFILE \fR" 4 -.PD -output XML files in the directory -.BR OUT +.IP "\fB\-\-out \fIOUT \fR" 4 +output XML files in the directory \fBOUT\fR + +.SS "Joining" + +.IP "\fB\-j \fXMLIFILE\fR \fIMOFILES\fR" 4 +.PD 0 +.IP "\fB\-\-join \fIXMLFILE\fR \fIMOFILES\fR" 4 +join translations from \fBMOFILES\fR into a multilingual file based on source \fBXMLFILE\fR + +.IP "\fB\-o \fIOUT.xml\fR" 4 +.PD 0 +.IP "\fB\-\-out \fIOUT.xml\fR" 4 +output to the XML file \fBOUT.xml\fR + .SS "Common" + .IP "\fB\-i \fIITS\fR" 4 .PD 0 -.IP "\fB\-\-its=\fIITS \fR" 4 -.PD -load the ITS rules in the file ITS (can specify -multiple times) +.IP "\fB\-\-its \fIITS\fR" 4 +load the ITS rules in the file \fBITS\fR (can specify multiple times) + +.IP "\fB\-n\fR" 4 +.PD 0 +.IP "\fB\-\-no\-builtins\fR" 4 +do not apply the built-in ITS rules that ship with itstool + +.IP "\fB\-s\fR" 4 +.PD 0 +.IP "\fB\-\-strict\fR" 4 +exit with error when PO files contain broken XML + +.IP "\fB\-d\fR" 4 +.PD 0 +.IP "\fB\-\-load\-dtd\fR" 4 +load external DTDs used by input XML files + +.IP "\fB\-k\fR" 4 +.PD 0 +.IP "\fB\-\-keep\-entities\fR" 4 +keep entity references unexpanded in PO files + +.IP "\fB\-p \fINAME VALUE\fR" 4 +.PD 0 +.IP "\fB\-\-param \fINAME VALUE\fR" 4 +define ITS parameter \fBNAME\fR to the value \fBVALUE\fR (can specify multiple times) + -.SH AUTHOR +.SH "AUTHOR" Shaun McCance <shaunm(a)gnome.org> + .SH "SEE ALSO" -More documentation for -.B itstool -is maintained online. For more information, see: -.IP -.B http://itstool.org/documentation/ -.PP +More documentation for \fBitstool\fR is maintained online. For more information, see: + +.BR "http://itstool.org/documentation/" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/itstool-2.0.1/itstool.in new/itstool-2.0.2/itstool.in --- old/itstool-2.0.1/itstool.in 2013-11-01 16:56:42.000000000 +0100 +++ new/itstool-2.0.2/itstool.in 2013-12-16 20:37:23.000000000 +0100 @@ -1,6 +1,6 @@ -#!/usr/bin/python -s +#!@PYTHON@ -s # -# Copyright (c) 2010-2011 Shaun McCance <shaunm(a)gnome.org> +# Copyright (c) 2010-2013 Shaun McCance <shaunm(a)gnome.org> # # ITS Tool program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by the @@ -859,7 +859,7 @@ prev = node.prev node.unlinkNode() node.freeNode() - if prev.isBlankNode(): + if prev is not None and prev.isBlankNode(): prev.unlinkNode() prev.freeNode() return @@ -914,7 +914,7 @@ prev = node.prev node.unlinkNode() node.freeNode() - if prev.isBlankNode(): + if prev is not None and prev.isBlankNode(): prev.unlinkNode() prev.freeNode() return -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hicolor-icon-theme for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package hicolor-icon-theme for openSUSE:Factory checked in at 2013-12-30 10:01:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hicolor-icon-theme (Old) and /work/SRC/openSUSE:Factory/.hicolor-icon-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hicolor-icon-theme" Changes: -------- --- /work/SRC/openSUSE:Factory/hicolor-icon-theme/hicolor-icon-theme.changes 2013-04-02 11:51:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hicolor-icon-theme.new/hicolor-icon-theme.changes 2013-12-30 10:01:24.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Dec 24 19:45:10 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 0.13: + + Icon-theme-spec: Add icon scale support. + + Support 512x512 bitmaps for high density display age. +- Rebase hicolor-scalable-sizes.patch. + +------------------------------------------------------------------- Old: ---- hicolor-icon-theme-0.12.tar.gz New: ---- hicolor-icon-theme-0.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hicolor-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.k9Jym2/_old 2013-12-30 10:01:25.000000000 +0100 +++ /var/tmp/diff_new_pack.k9Jym2/_new 2013-12-30 10:01:25.000000000 +0100 @@ -20,7 +20,7 @@ Summary: Fallback Icon Theme License: GPL-2.0+ Group: System/X11/Utilities -Version: 0.12 +Version: 0.13 Release: 0 Url: http://icon-theme.freedesktop.org/wiki/HicolorTheme Source: http://icon-theme.freedesktop.org/releases/%{name}-%{version}.tar.gz ++++++ hicolor-icon-theme-0.12.tar.gz -> hicolor-icon-theme-0.13.tar.gz ++++++ ++++ 2811 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hicolor-icon-theme-0.12/configure.ac new/hicolor-icon-theme-0.13/configure.ac --- old/hicolor-icon-theme-0.12/configure.ac 2010-01-13 11:18:27.000000000 +0100 +++ new/hicolor-icon-theme-0.13/configure.ac 2013-12-17 10:57:46.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([hicolor-icon-theme], [0.12]) +AC_INIT([hicolor-icon-theme], [0.13]) AC_PROG_INSTALL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hicolor-icon-theme-0.12/index.theme new/hicolor-icon-theme-0.13/index.theme --- old/hicolor-icon-theme-0.12/index.theme 2010-01-13 11:18:27.000000000 +0100 +++ new/hicolor-icon-theme-0.13/index.theme 2013-12-17 10:57:46.000000000 +0100 @@ -2,7 +2,7 @@ Name=Hicolor Comment=Fallback icon theme Hidden=true -Directories=16x16/actions,16x16/animations,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/emotes,16x16/filesystems,16x16/intl,16x16/mimetypes,16x16/places,16x16/status,16x16/stock/chart,16x16/stock/code,16x16/stock/data,16x16/stock/form,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,22x22/actions,22x22/animations,22x22/apps,22x22/categories,22x22/devices,22x22/emblems,22x22/emotes,22x22/filesystems,22x22/intl,22x22/mimetypes,22x22/places,22x22/status,22x22/stock/chart,22x22/stock/code,22x22/stock/data,22x22/stock/form,22x22/stock/image,22x22/stock/io,22x22/stock/media,22x22/stock/navigation,22x22/stock/net,22x22/stock/object,22x22/stock/table,22x22/stock/text,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/emotes,24x24/filesystems,24x24/intl,24x24/mimetypes,24x24/places,24x24/status,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/form,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/actions,32x32/animations,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/emotes,32x32/filesystems,32x32/intl,32x32/mimetypes,32x32/places,32x32/status,32x32/stock/chart,32x32/stock/code,32x32/stock/data,32x32/stock/form,32x32/stock/image,32x32/stock/io,32x32/stock/media,32x32/stock/navigation,32x32/stock/net,32x32/stock/object,32x32/stock/table,32x32/stock/text,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/emblems,36x36/emotes,36x36/filesystems,36x36/intl,36x36/mimetypes,36x36/places,36x36/status,36x36/stock/chart,36x36/stock/code,36x36/stock/data,36x36/stock/form,36x36/stock/image,36x36/stock/io,36x36/stock/media,36x36/stock/navigation,36x36/stock/net,36x36/stock/object,36x36/stock/table,36x36/stock/text,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/emotes,48x48/filesystems,48x48/intl,48x48/mimetypes,48x48/places,48x48/status,48x48/stock/chart,48x48/stock/code,48x48/stock/data,48x48/stock/form,48x48/stock/image,48x48/stock/io,48x48/stock/media,48x48/stock/navigation,48x48/stock/net,48x48/stock/object,48x48/stock/table,48x48/stock/text,64x64/actions,64x64/animations,64x64/apps,64x64/categories,64x64/devices,64x64/emblems,64x64/emotes,64x64/filesystems,64x64/intl,64x64/mimetypes,64x64/places,64x64/status,64x64/stock/chart,64x64/stock/code,64x64/stock/data,64x64/stock/form,64x64/stock/image,64x64/stock/io,64x64/stock/media,64x64/stock/navigation,64x64/stock/net,64x64/stock/object,64x64/stock/table,64x64/stock/text,72x72/actions,72x72/animations,72x72/apps,72x72/categories,72x72/devices,72x72/emblems,72x72/emotes,72x72/filesystems,72x72/intl,72x72/mimetypes,72x72/places,72x72/status,72x72/stock/chart,72x72/stock/code,72x72/stock/data,72x72/stock/form,72x72/stock/image,72x72/stock/io,72x72/stock/media,72x72/stock/navigation,72x72/stock/net,72x72/stock/object,72x72/stock/table,72x72/stock/text,96x96/actions,96x96/animations,96x96/apps,96x96/categories,96x96/devices,96x96/emblems,96x96/emotes,96x96/filesystems,96x96/intl,96x96/mimetypes,96x96/places,96x96/status,96x96/stock/chart,96x96/stock/code,96x96/stock/data,96x96/stock/form,96x96/stock/image,96x96/stock/io,96x96/stock/media,96x96/stock/navigation,96x96/stock/net,96x96/stock/object,96x96/stock/table,96x96/stock/text,128x128/actions,128x128/animations,128x128/apps,128x128/categories,128x128/devices,128x128/emblems,128x128/emotes,128x128/filesystems,128x128/intl,128x128/mimetypes,128x128/places,128x128/status,128x128/stock/chart,128x128/stock/code,128x128/stock/data,128x128/stock/form,128x128/stock/image,128x128/stock/io,128x128/stock/media,128x128/stock/navigation,128x128/stock/net,128x128/stock/object,128x128/stock/table,128x128/stock/text,192x192/actions,192x192/animations,192x192/apps,192x192/categories,192x192/devices,192x192/emblems,192x192/emotes,192x192/filesystems,192x192/intl,192x192/mimetypes,192x192/places,192x192/status,192x192/stock/chart,192x192/stock/code,192x192/stock/data,192x192/stock/form,192x192/stock/image,192x192/stock/io,192x192/stock/media,192x192/stock/navigation,192x192/stock/net,192x192/stock/object,192x192/stock/table,192x192/stock/text,256x256/actions,256x256/animations,256x256/apps,256x256/categories,256x256/devices,256x256/emblems,256x256/emotes,256x256/filesystems,256x256/intl,256x256/mimetypes,256x256/places,256x256/status,256x256/stock/chart,256x256/stock/code,256x256/stock/data,256x256/stock/form,256x256/stock/image,256x256/stock/io,256x256/stock/media,256x256/stock/navigation,256x256/stock/net,256x256/stock/object,256x256/stock/table,256x256/stock/text,scalable/actions,scalable/animations,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/emotes,scalable/filesystems,scalable/intl,scalable/mimetypes,scalable/places,scalable/status,scalable/stock/chart,scalable/stock/code,scalable/stock/data,scalable/stock/form,scalable/stock/image,scalable/stock/io,scalable/stock/media,scalable/stock/navigation,scalable/stock/net,scalable/stock/object,scalable/stock/table,scalable/stock/text +Directories=16x16/actions,16x16/animations,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/emotes,16x16/filesystems,16x16/intl,16x16/mimetypes,16x16/places,16x16/status,16x16/stock/chart,16x16/stock/code,16x16/stock/data,16x16/stock/form,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,22x22/actions,22x22/animations,22x22/apps,22x22/categories,22x22/devices,22x22/emblems,22x22/emotes,22x22/filesystems,22x22/intl,22x22/mimetypes,22x22/places,22x22/status,22x22/stock/chart,22x22/stock/code,22x22/stock/data,22x22/stock/form,22x22/stock/image,22x22/stock/io,22x22/stock/media,22x22/stock/navigation,22x22/stock/net,22x22/stock/object,22x22/stock/table,22x22/stock/text,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/emotes,24x24/filesystems,24x24/intl,24x24/mimetypes,24x24/places,24x24/status,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/form,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/actions,32x32/animations,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/emotes,32x32/filesystems,32x32/intl,32x32/mimetypes,32x32/places,32x32/status,32x32/stock/chart,32x32/stock/code,32x32/stock/data,32x32/stock/form,32x32/stock/image,32x32/stock/io,32x32/stock/media,32x32/stock/navigation,32x32/stock/net,32x32/stock/object,32x32/stock/table,32x32/stock/text,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/emblems,36x36/emotes,36x36/filesystems,36x36/intl,36x36/mimetypes,36x36/places,36x36/status,36x36/stock/chart,36x36/stock/code,36x36/stock/data,36x36/stock/form,36x36/stock/image,36x36/stock/io,36x36/stock/media,36x36/stock/navigation,36x36/stock/net,36x36/stock/object,36x36/stock/table,36x36/stock/text,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/emotes,48x48/filesystems,48x48/intl,48x48/mimetypes,48x48/places,48x48/status,48x48/stock/chart,48x48/stock/code,48x48/stock/data,48x48/stock/form,48x48/stock/image,48x48/stock/io,48x48/stock/media,48x48/stock/navigation,48x48/stock/net,48x48/stock/object,48x48/stock/table,48x48/stock/text,64x64/actions,64x64/animations,64x64/apps,64x64/categories,64x64/devices,64x64/emblems,64x64/emotes,64x64/filesystems,64x64/intl,64x64/mimetypes,64x64/places,64x64/status,64x64/stock/chart,64x64/stock/code,64x64/stock/data,64x64/stock/form,64x64/stock/image,64x64/stock/io,64x64/stock/media,64x64/stock/navigation,64x64/stock/net,64x64/stock/object,64x64/stock/table,64x64/stock/text,72x72/actions,72x72/animations,72x72/apps,72x72/categories,72x72/devices,72x72/emblems,72x72/emotes,72x72/filesystems,72x72/intl,72x72/mimetypes,72x72/places,72x72/status,72x72/stock/chart,72x72/stock/code,72x72/stock/data,72x72/stock/form,72x72/stock/image,72x72/stock/io,72x72/stock/media,72x72/stock/navigation,72x72/stock/net,72x72/stock/object,72x72/stock/table,72x72/stock/text,96x96/actions,96x96/animations,96x96/apps,96x96/categories,96x96/devices,96x96/emblems,96x96/emotes,96x96/filesystems,96x96/intl,96x96/mimetypes,96x96/places,96x96/status,96x96/stock/chart,96x96/stock/code,96x96/stock/data,96x96/stock/form,96x96/stock/image,96x96/stock/io,96x96/stock/media,96x96/stock/navigation,96x96/stock/net,96x96/stock/object,96x96/stock/table,96x96/stock/text,128x128/actions,128x128/animations,128x128/apps,128x128/categories,128x128/devices,128x128/emblems,128x128/emotes,128x128/filesystems,128x128/intl,128x128/mimetypes,128x128/places,128x128/status,128x128/stock/chart,128x128/stock/code,128x128/stock/data,128x128/stock/form,128x128/stock/image,128x128/stock/io,128x128/stock/media,128x128/stock/navigation,128x128/stock/net,128x128/stock/object,128x128/stock/table,128x128/stock/text,192x192/actions,192x192/animations,192x192/apps,192x192/categories,192x192/devices,192x192/emblems,192x192/emotes,192x192/filesystems,192x192/intl,192x192/mimetypes,192x192/places,192x192/status,192x192/stock/chart,192x192/stock/code,192x192/stock/data,192x192/stock/form,192x192/stock/image,192x192/stock/io,192x192/stock/media,192x192/stock/navigation,192x192/stock/net,192x192/stock/object,192x192/stock/table,192x192/stock/text,256x256/actions,256x256/animations,256x256/apps,256x256/categories,256x256/devices,256x256/emblems,256x256/emotes,256x256/filesystems,256x256/intl,256x256/mimetypes,256x256/places,256x256/status,256x256/stock/chart,256x256/stock/code,256x256/stock/data,256x256/stock/form,256x256/stock/image,256x256/stock/io,256x256/stock/media,256x256/stock/navigation,256x256/stock/net,256x256/stock/object,256x256/stock/table,256x256/stock/text,512x512/actions,512x512/animations,512x512/apps,512x512/categories,512x512/devices,512x512/emblems,512x512/emotes,512x512/filesystems,512x512/intl,512x512/mimetypes,512x512/places,512x512/status,512x512/stock/chart,512x512/stock/code,512x512/stock/data,512x512/stock/form,512x512/stock/image,512x512/stock/io,512x512/stock/media,512x512/stock/navigation,512x512/stock/net,512x512/stock/object,512x512/stock/table,512x512/stock/text,scalable/actions,scalable/animations,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/emotes,scalable/filesystems,scalable/intl,scalable/mimetypes,scalable/places,scalable/status,scalable/stock/chart,scalable/stock/code,scalable/stock/data,scalable/stock/form,scalable/stock/image,scalable/stock/io,scalable/stock/media,scalable/stock/navigation,scalable/stock/net,scalable/stock/object,scalable/stock/table,scalable/stock/text [16x16/actions] @@ -1492,6 +1492,174 @@ Context=Stock Type=Scalable +[512x512/actions] +MinSize=64 +Size=512 +MaxSize=512 +Context=Actions +Type=Scalable + +[512x512/animations] +MinSize=64 +Size=512 +MaxSize=512 +Context=Animations +Type=Scalable + +[512x512/apps] +MinSize=64 +Size=512 +MaxSize=512 +Context=Applications +Type=Scalable + +[512x512/categories] +MinSize=64 +Size=512 +MaxSize=512 +Context=Categories +Type=Scalable + +[512x512/devices] +MinSize=64 +Size=512 +MaxSize=512 +Context=Devices +Type=Scalable + +[512x512/emblems] +MinSize=64 +Size=512 +MaxSize=512 +Context=Emblems +Type=Scalable + +[512x512/emotes] +MinSize=64 +Size=512 +MaxSize=512 +Context=Emotes +Type=Scalable + +[512x512/filesystems] +MinSize=64 +Size=512 +MaxSize=512 +Context=FileSystems +Type=Scalable + +[512x512/intl] +MinSize=64 +Size=512 +MaxSize=512 +Context=International +Type=Scalable + +[512x512/mimetypes] +MinSize=64 +Size=512 +MaxSize=512 +Context=MimeTypes +Type=Scalable + +[512x512/places] +MinSize=64 +Size=512 +MaxSize=512 +Context=Places +Type=Scalable + +[512x512/status] +MinSize=64 +Size=512 +MaxSize=512 +Context=Status +Type=Scalable + +[512x512/stock/chart] +MinSize=64 +Size=512 +MaxSize=512 +Context=Stock +Type=Scalable + +[512x512/stock/code] +MinSize=64 +Size=512 +MaxSize=512 +Context=Stock +Type=Scalable + +[512x512/stock/data] +MinSize=64 +Size=512 +MaxSize=512 +Context=Stock +Type=Scalable + +[512x512/stock/form] +MinSize=64 +Size=512 +MaxSize=512 +Context=Stock +Type=Scalable + +[512x512/stock/image] +MinSize=64 +Size=512 +MaxSize=512 +Context=Stock +Type=Scalable + +[512x512/stock/io] +MinSize=64 +Size=512 +MaxSize=512 +Context=Stock +Type=Scalable + +[512x512/stock/media] +MinSize=64 +Size=512 +MaxSize=512 +Context=Stock +Type=Scalable + +[512x512/stock/navigation] +MinSize=64 +Size=512 +MaxSize=512 +Context=Stock +Type=Scalable + +[512x512/stock/net] +MinSize=64 +Size=512 +MaxSize=512 +Context=Stock +Type=Scalable + +[512x512/stock/object] +MinSize=64 +Size=512 +MaxSize=512 +Context=Stock +Type=Scalable + +[512x512/stock/table] +MinSize=64 +Size=512 +MaxSize=512 +Context=Stock +Type=Scalable + +[512x512/stock/text] +MinSize=64 +Size=512 +MaxSize=512 +Context=Stock +Type=Scalable + [scalable/actions] MinSize=1 Size=128 @@ -1523,7 +1691,7 @@ [scalable/devices] MinSize=1 Size=128 -MaxSize=256 +MaxSize=512 Context=Devices Type=Scalable @@ -1537,7 +1705,7 @@ [scalable/emotes] MinSize=1 Size=128 -MaxSize=256 +MaxSize=512 Context=Emotes Type=Scalable @@ -1551,7 +1719,7 @@ [scalable/intl] MinSize=1 Size=128 -MaxSize=256 +MaxSize=512 Context=International Type=Scalable @@ -1565,7 +1733,7 @@ [scalable/places] MinSize=1 Size=128 -MaxSize=256 +MaxSize=512 Context=Places Type=Scalable @@ -1579,7 +1747,7 @@ [scalable/stock/chart] MinSize=1 Size=128 -MaxSize=256 +MaxSize=512 Context=Stock Type=Scalable @@ -1593,7 +1761,7 @@ [scalable/stock/data] MinSize=1 Size=128 -MaxSize=256 +MaxSize=512 Context=Stock Type=Scalable @@ -1607,7 +1775,7 @@ [scalable/stock/image] MinSize=1 Size=128 -MaxSize=256 +MaxSize=512 Context=Stock Type=Scalable @@ -1621,7 +1789,7 @@ [scalable/stock/media] MinSize=1 Size=128 -MaxSize=256 +MaxSize=512 Context=Stock Type=Scalable @@ -1635,7 +1803,7 @@ [scalable/stock/net] MinSize=1 Size=128 -MaxSize=256 +MaxSize=512 Context=Stock Type=Scalable @@ -1649,7 +1817,7 @@ [scalable/stock/table] MinSize=1 Size=128 -MaxSize=256 +MaxSize=512 Context=Stock Type=Scalable ++++++ hicolor-scalable-sizes.patch ++++++ --- /var/tmp/diff_new_pack.k9Jym2/_old 2013-12-30 10:01:25.000000000 +0100 +++ /var/tmp/diff_new_pack.k9Jym2/_new 2013-12-30 10:01:25.000000000 +0100 @@ -1,8 +1,8 @@ -Index: hicolor-icon-theme-0.11/index.theme +Index: hicolor-icon-theme-0.13/index.theme =================================================================== ---- hicolor-icon-theme-0.11.orig/index.theme -+++ hicolor-icon-theme-0.11/index.theme -@@ -1493,169 +1493,169 @@ Context=Stock +--- hicolor-icon-theme-0.13.orig/index.theme ++++ hicolor-icon-theme-0.13/index.theme +@@ -1661,169 +1661,169 @@ Context=Stock Type=Scalable [scalable/actions] @@ -46,7 +46,7 @@ -Size=128 +MinSize=32 +Size=48 - MaxSize=256 + MaxSize=512 Context=Devices Type=Scalable @@ -64,7 +64,7 @@ -Size=128 +MinSize=32 +Size=48 - MaxSize=256 + MaxSize=512 Context=Emotes Type=Scalable @@ -82,7 +82,7 @@ -Size=128 +MinSize=32 +Size=48 - MaxSize=256 + MaxSize=512 Context=International Type=Scalable @@ -100,7 +100,7 @@ -Size=128 +MinSize=32 +Size=48 - MaxSize=256 + MaxSize=512 Context=Places Type=Scalable @@ -118,7 +118,7 @@ -Size=128 +MinSize=32 +Size=48 - MaxSize=256 + MaxSize=512 Context=Stock Type=Scalable @@ -136,7 +136,7 @@ -Size=128 +MinSize=32 +Size=48 - MaxSize=256 + MaxSize=512 Context=Stock Type=Scalable @@ -154,7 +154,7 @@ -Size=128 +MinSize=32 +Size=48 - MaxSize=256 + MaxSize=512 Context=Stock Type=Scalable @@ -172,7 +172,7 @@ -Size=128 +MinSize=32 +Size=48 - MaxSize=256 + MaxSize=512 Context=Stock Type=Scalable @@ -190,7 +190,7 @@ -Size=128 +MinSize=32 +Size=48 - MaxSize=256 + MaxSize=512 Context=Stock Type=Scalable @@ -208,7 +208,7 @@ -Size=128 +MinSize=32 +Size=48 - MaxSize=256 + MaxSize=512 Context=Stock Type=Scalable -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hawk for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package hawk for openSUSE:Factory checked in at 2013-12-30 09:58:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hawk (Old) and /work/SRC/openSUSE:Factory/.hawk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hawk" Changes: -------- --- /work/SRC/openSUSE:Factory/hawk/hawk.changes 2013-12-08 19:27:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes 2013-12-30 09:58:51.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Dec 19 13:10:51 UTC 2013 - tserong(a)suse.com + +- GUI: explorer: Warn if transition from different Pacemaker version + (fate#314392) +- GUI: explorer: Show diff link on every line +- Upstream version cs:5cd8197 + +------------------------------------------------------------------- Old: ---- hawk-0.6.2+git.1386336132.d28c6e8.tar.bz2 New: ---- hawk-0.6.2+git.1387458085.5cd8197.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk.spec ++++++ --- /var/tmp/diff_new_pack.5neBbG/_old 2013-12-30 09:58:52.000000000 +0100 +++ /var/tmp/diff_new_pack.5neBbG/_new 2013-12-30 09:58:52.000000000 +0100 @@ -41,7 +41,7 @@ Summary: HA Web Konsole License: GPL-2.0 Group: %{pkg_group} -Version: 0.6.2+git.1386336132.d28c6e8 +Version: 0.6.2+git.1387458085.5cd8197 Release: 0 Url: http://www.clusterlabs.org/wiki/Hawk Source: %{name}-%{version}.tar.bz2 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.5neBbG/_old 2013-12-30 09:58:52.000000000 +0100 +++ /var/tmp/diff_new_pack.5neBbG/_new 2013-12-30 09:58:52.000000000 +0100 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="exclude">.git</param> <param name="versionformat">0.6.2+git.%ct.%h</param> - <param name="revision">master</param> + <param name="revision">5cd8197</param> </service> <service name="recompress" mode="disabled"> ++++++ hawk-0.6.2+git.1386336132.d28c6e8.tar.bz2 -> hawk-0.6.2+git.1387458085.5cd8197.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.6.2+git.1386336132.d28c6e8/hawk/Gemfile new/hawk-0.6.2+git.1387458085.5cd8197/hawk/Gemfile --- old/hawk-0.6.2+git.1386336132.d28c6e8/hawk/Gemfile 2013-12-06 13:01:27.000000000 +0100 +++ new/hawk-0.6.2+git.1387458085.5cd8197/hawk/Gemfile 2013-12-19 14:10:44.000000000 +0100 @@ -5,6 +5,9 @@ # sucks, but it's the least-worst solution I can find right now for # making Bundler go away when we neither need nor want it. # +# TODO(must): On openSUSE Factory, running `script/rails s` without a Gemfile +# doesn't work. It just sits there, and never answers any requests. +# # Have I mentioned lately that while Bundler may be "the best way to # manage a Ruby application's gems", it's an absolute menace if you're # trying to build packaged software? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.6.2+git.1386336132.d28c6e8/hawk/app/controllers/explorer_controller.rb new/hawk-0.6.2+git.1387458085.5cd8197/hawk/app/controllers/explorer_controller.rb --- old/hawk-0.6.2+git.1386336132.d28c6e8/hawk/app/controllers/explorer_controller.rb 2013-12-06 12:20:30.000000000 +0100 +++ new/hawk-0.6.2+git.1387458085.5cd8197/hawk/app/controllers/explorer_controller.rb 2013-12-19 14:10:44.000000000 +0100 @@ -73,7 +73,13 @@ # Now we either generate if a report for that time doesn't exist, or display if one does. # TODO(must): this doesn't handle the case where a generate run fails utterly; it'll # probably just keep trying to generate the hb_report indefinitely. + pcmk_version = nil + m = %x[cibadmin -!].match(/^Pacemaker ([^ ]+) $Build: ([^)]+)$/) + pcmk_version = "#{m[1]}-#{m[2]}" if m if File.exists?(@report_path) + # Have to blow this away if it exists (i.e. is a cached report), else + # prior cibadmin calls on individual PE inputs will have wrecked their mtimes. + FileUtils.remove_entry_secure((a)hb_report.path) if File.exists?((a)hb_report.path) @peinputs = [] stdin, stdout, stderr, thread = Util.popen3("crm", "history") stdin.write("source #{@report_path}\npeinputs\n") @@ -90,6 +96,10 @@ :basename => File.basename(path, ".bz2"), :node => path.split(File::SEPARATOR)[-3] } + v = peinput_version(path) + @peinputs[-1][:info] = v == pcmk_version ? nil : (v ? + _("PE Input created by different Pacemaker version (%{version})" % { :version => v }) : + _("Pacemaker version not present in PE Input")) end # sort is going to be off for identical mtimes (stripped back to the second), # so need secondary sort by filename @@ -277,4 +287,10 @@ @hb_report.path = "#{@@x_path}/#{@report_name}" end + def peinput_version(path) + nvpair = %x[CIB_file=#{path} cibadmin -Q --xpath "/cib/configuration//crm_config//nvpair[@name='dc-version']" 2>/dev/null] + m = nvpair.match(/value="([^"]+)"/) + return nil unless m + m[1] + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.6.2+git.1386336132.d28c6e8/hawk/app/views/explorer/_pe_list.html.erb new/hawk-0.6.2+git.1387458085.5cd8197/hawk/app/views/explorer/_pe_list.html.erb --- old/hawk-0.6.2+git.1386336132.d28c6e8/hawk/app/views/explorer/_pe_list.html.erb 2013-08-20 10:32:04.000000000 +0200 +++ new/hawk-0.6.2+git.1387458085.5cd8197/hawk/app/views/explorer/_pe_list.html.erb 2013-12-19 14:10:44.000000000 +0100 @@ -8,7 +8,7 @@ <div style="float: left; padding-right: 2em;"> <table id="peinputs" style="white-space: nowrap;"> <tr> - <th><%=h _('Time') %></th> + <th colspan="2"><%=h _('Time') %></th> <th><%=h _('PE Input') %></th> <th><%=h _('Node') %></th> </tr> @@ -19,6 +19,9 @@ %> <tr> <td><%=h peinput[:timestamp] %></td> + <td><span class="ui-icon ui-icon-info " <%=raw( + peinput[:info] ? "title=\"#{h peinput[:info]}\"" : 'style="display: none;"' + )%>></span></td> <td><%= link_to peinput[:basename], pe_get_path( :from_time => @from_time, :to_time => @to_time, :basename => peinput[:basename], :node => peinput[:node], @@ -40,8 +43,8 @@ :from_time => @from_time, :to_time => @to_time, :basename => peinput[:basename], :node => peinput[:node], :file => "graph", :format => "xml"), :target => "hawk-hist-info", :class => "pe-graph" %></td> - <% if (i % 2 == 0 && i < peinputs.count-1) %> - <td rowspan="2">} <%= link_to _("Diff"), pe_diff_path( + <% if i < peinputs.count-1 %> + <td><%= link_to _("Diff"), pe_diff_path( :from_time => @from_time, :to_time => @to_time, :left => peinputs[i+1][:basename], :right => peinput[:basename]), :target => "hawk-hist-info", :class => "pe-diff" %></td> <% end %> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gupnp-av for openSUSE:Factory
by root＠hilbert.suse.de 30 Dec '13

30 Dec '13

Hello community, here is the log from the commit of package gupnp-av for openSUSE:Factory checked in at 2013-12-30 09:55:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gupnp-av (Old) and /work/SRC/openSUSE:Factory/.gupnp-av.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gupnp-av" Changes: -------- --- /work/SRC/openSUSE:Factory/gupnp-av/gupnp-av.changes 2013-10-17 17:38:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gupnp-av.new/gupnp-av.changes 2013-12-30 09:55:57.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Nov 19 20:17:33 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 0.12.4: + + Add support for pv:subtitleFileUri and pv:subtitleFileType. + + Bugs fixed: bgo#695990. + +------------------------------------------------------------------- Old: ---- gupnp-av-0.12.3.tar.xz New: ---- gupnp-av-0.12.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gupnp-av.spec ++++++ --- /var/tmp/diff_new_pack.2bFZCZ/_old 2013-12-30 09:55:57.000000000 +0100 +++ /var/tmp/diff_new_pack.2bFZCZ/_new 2013-12-30 09:55:57.000000000 +0100 @@ -17,7 +17,7 @@ Name: gupnp-av -Version: 0.12.3 +Version: 0.12.4 Release: 0 Summary: Library to ease the handling and implementation of UPnP A/V profiles License: LGPL-2.0+ ++++++ gupnp-av-0.12.3.tar.xz -> gupnp-av-0.12.4.tar.xz ++++++ ++++ 6743 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