February 2011 - openSUSE Commits - openSUSE Mailing Lists

commit java-1_6_0-openjdk for openSUSE:11.2
by root＠hilbert.suse.de 28 Feb '11

28 Feb '11

Hello community, here is the log from the commit of package java-1_6_0-openjdk for openSUSE:11.2 checked in at Mon Feb 28 17:19:21 CET 2011. -------- --- old-versions/11.2/UPDATES/all/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2011-02-01 15:15:37.000000000 +0100 +++ 11.2/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2011-02-24 16:20:57.000000000 +0100 @@ -1,0 +2,35 @@ +Thu Feb 24 13:03:12 UTC 2011 - mvyskocil(a)suse.cz + +- fix bnc#671714 - VUL-0: java-1_6_0-openjdk: permissions assigned to applets + with multiple JARs (icedtea6-1.9.7) +- Security updates + * S6878713, CVE-2010-4469: Hotspot backward jsr heap corruption + * S6907662, CVE-2010-4465: Swing timer-based security manager bypass + * S6994263, CVE-2010-4472: Untrusted code allowed to replace DSIG/C14N implementation + * S6981922, CVE-2010-4448: DNS cache poisoning by untrusted applets + * S6983554, CVE-2010-4450: Launcher incorrect processing of empty library path entries + * S6985453, CVE-2010-4471: Java2D font-related system property leak + * S6927050, CVE-2010-4470: JAXP untrusted component state manipulation + * RH677332, CVE-2011-0706: Multiple signers privilege escalation +- Bug fixes + * RH676659: Pass -export-dynamic flag to linker using -Wl, as option in gcc 4.6+ is broken + * G344659: Fix issue when building on SPARC + * Fix latent JAXP bug caused by missing import +- patches changes: + * obsoletes stack-protector patches (already upstreamed) + * modified openjdk-6-src-b20-initialized-after.patch + * modified openjdk-6-src-b20-no-werror.patch + * openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch + * add openjdk-6-src-b20-stringcompare.patch + * add openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch + * add openjdk-6-src-b20-gcj-workaround.patch (11.2/x86_64 workaround) + +------------------------------------------------------------------- +Tue Feb 15 09:28:02 UTC 2011 - mvyskocil(a)suse.cz + +- fix bnc#670304 - VUL-1: java-1_6_0-openjdk: denial of service using floats + icedtea6-1.9.6 +- Security updates + * S4421494, CVE-2010-4476: infinite loop while parsing double literal. + +------------------------------------------------------------------- calling whatdependson for 11.2-i586 Old: ---- 0803c0f69b51.tar.gz icedtea6-1.9.5.tar.bz2 openjdk-6-src-b17-stack-protector-fclose.patch openjdk-6-src-b17-stack-protector.patch New: ---- 13edc857b967.tar.gz icedtea6-1.9.7.tar.gz openjdk-6-src-b20-gcj-workaround.patch openjdk-6-src-b20-stringcompare.patch openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.3yy7cY/_old 2011-02-28 17:18:29.000000000 +0100 +++ /var/tmp/diff_new_pack.3yy7cY/_new 2011-02-28 17:18:29.000000000 +0100 @@ -16,6 +16,8 @@ # +%define gcjbootstrap 1 + %define jit_arches %{ix86} x86_64 # Turn on/off some features depending on openSUSE version %define with_systemtap 0 @@ -26,12 +28,15 @@ %endif %endif -%define gcjbootstrap 0 +# XXX: systemtap does not work with gcj +%if %{gcjbootstrap} +%define with_systemtap 0 +%endif # If runtests is 0 test suites will not be run. %define runtests 0 -%define icedteaver 1.9.5 +%define icedteaver 1.9.7 %define icedteasnapshot %{nil} %define openjdkver b20 %define openjdkdate 21_jun_2010 @@ -139,9 +144,7 @@ Group: Development/Languages/Java License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception Url: http://openjdk.java.net/ -# hg clone http://icedtea.classpath.org/hg/icedtea6-%{icedteaver} icedtea6-%{icedteaver} -# tar --exclude-vcs -cjf icedtea6-%{icedteaver}%{icedteasnapshot}.tar.bz2 icedtea6-%{icedteaver} -Source0: %{url}icedtea6-%{icedteaver}%{icedteasnapshot}.tar.bz2 +Source0: %{url}icedtea6-%{icedteaver}%{icedteasnapshot}.tar.gz # # download the openjdk from http://download.java.net/openjdk/jdk6/promoted/latest/ # sh generate-fedora-zip.sh openjdk-6-src-%{openjdkver}-%{openjdkdate}.tar.gz Source1: %{fedorazip} @@ -152,7 +155,7 @@ Source5: mauve-%{mauvedate}.tar.bz2 # from Fedora rpm Source6: mauve_tests -Source7: %{hotspoturl}0803c0f69b51.tar.gz +Source7: %{hotspoturl}13edc857b967.tar.gz Source8: %{jaxpurl}jdk6-jaxp-%{openjdkver}.zip Source9: %{jafurl}jdk6-jaf-%{openjdkver}.zip Source10: %{jaxwsurl}jdk6-jaxws-%{openjdkver}.zip @@ -198,12 +201,6 @@ Patch123: openjdk-6-src-b20-no-werror.patch # PATCH-FIX-OPENSUSE: the no-return-in-non-void againd - sent to upstream Patch124: icedtea6-1.7-no-return-in-non-void.patch -# PATCH-FIX-UPSTREAM: bnc#589021 -# http://cr.openjdk.java.net/~aph/6929067-jdk7-webrev-4/ -Patch125: openjdk-6-src-b17-stack-protector.patch -# PATCH-FIX-OPENSUSE: bnc#603316 -# The stack protector patch did not close the /proc/self/maps correctly -Patch126: openjdk-6-src-b17-stack-protector-fclose.patch # PATCH-FIX-OPENSUSE: gcc 4.5 warnings Patch127: openjdk-6-src-b20-defined-but-not-used.patch # PATCH-FIX-OPENSUSE: gcc 4.5 warnings @@ -216,6 +213,12 @@ # https://bugzilla.mozilla.org/show_bug.cgi?id=582130 # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=622 Patch131: icedtea6-1.9.4-moonlight-symbol-clash.patch +# PATCH-FIX-OPENSUSE: the no-return-in-non-void again - now in openjdk-ecj +Patch132: openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch +# PATCH-FIX-OPENSUSE: the string and literal compare fix +Patch133: openjdk-6-src-b20-stringcompare.patch +# PATCH-FIX-OPENSUSE: gcj on 11.2/x86_64 returns the NPE on this file - assume because of comments +Patch134: openjdk-6-src-b20-gcj-workaround.patch # PATCH-FIX-UPSTREAM bnc#524505 Patch1000: java-1_6_0-openjdk-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -517,11 +520,17 @@ --enable-nss \ --enable-plugin \ %endif + --with-hotspot-build=hs19 \ --with-hotspot-src-zip=%{SOURCE7} \ --with-jaf-drop-zip=%{SOURCE9} \ --with-jaxp-drop-zip=%{SOURCE8} \ --with-jaxws-drop-zip=%{SOURCE10} \ +%if %{gcjbootstrap} + --with-gcj-home=%{_jvmdir}/java-gcj \ + --with-xerces2-jar=%{_javadir}/xerces-j2-bootstrap.jar \ +%else --with-openjdk=%{_jvmdir}/%{sdkdir} \ +%endif --with-openjdk-src-zip=%{SOURCE1} \ --with-pkgversion=suse-%{release}-%{_arch} @@ -559,11 +568,12 @@ %{PATCH121} \ %{PATCH122} \ %{PATCH123} \ - %{PATCH125} \ - %{PATCH126} \ %{PATCH127} \ %{PATCH128} \ - %{PATCH129} + %{PATCH129} \ + %{PATCH132} \ + %{PATCH133} \ + %{PATCH134} do qpatch -p1 ${PATCH} done @@ -834,6 +844,11 @@ %post #bnc#648260 - workaround sed -i '/pack200/d' /var/lib/rpm/alternatives/java +#fix of the previous workaround ;-) bnc#669716 +#this will collect all empty lines in Sun Java alternatives +if [ -f %{_libexecdir}/%{name}/javafix ]; then + /bin/sh %{_libexecdir}/%{name}/javafix +fi ext=.gz update-alternatives \ --install %{_bindir}/java java %{jrebindir}/java %{priority} \ ++++++ 0803c0f69b51.tar.gz -> 13edc857b967.tar.gz ++++++ old-versions/11.2/UPDATES/all/java-1_6_0-openjdk/0803c0f69b51.tar.gz 11.2/java-1_6_0-openjdk/13edc857b967.tar.gz differ: char 5, line 1 ++++++ openjdk-6-src-b20-gcj-workaround.patch ++++++ Index: icedtea6-1.9.7/openjdk-ecj/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java +++ icedtea6-1.9.7/openjdk-ecj/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java @@ -1,28 +1,3 @@ -/* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - package com.sun.source.tree; /** ++++++ openjdk-6-src-b20-initialized-after.patch ++++++ --- /var/tmp/diff_new_pack.3yy7cY/_old 2011-02-28 17:18:31.000000000 +0100 +++ /var/tmp/diff_new_pack.3yy7cY/_new 2011-02-28 17:18:31.000000000 +0100 @@ -1,7 +1,7 @@ -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp @@ -234,18 +234,18 @@ class ReferenceProcessor : public CHeapO // constructor ReferenceProcessor(): @@ -26,10 +26,10 @@ {} ReferenceProcessor(MemRegion span, bool atomic_discovery, -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/code/dependencies.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/code/dependencies.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/code/dependencies.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/code/dependencies.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/code/dependencies.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/code/dependencies.hpp @@ -411,15 +411,15 @@ class Dependencies: public ResourceObj { public: @@ -50,10 +50,10 @@ _bytes(code->dependencies_begin()) { initial_asserts(code->dependencies_size()); -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp @@ -151,7 +151,7 @@ class FilterIntoCSClosure: public OopClo public: FilterIntoCSClosure( DirtyCardToOopClosure* dcto_cl, @@ -72,11 +72,11 @@ template <class T> void do_oop_nv(T* p); virtual void do_oop(oop* p) { do_oop_nv(p); } -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp -@@ -514,7 +514,7 @@ class SymbolHashMapEntry : public CHeapO +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp +@@ -589,7 +589,7 @@ class SymbolHashMapEntry : public CHeapO void set_value(u2 value) { _value = value; } SymbolHashMapEntry(unsigned int hash, symbolOop symbol, u2 value) @@ -85,11 +85,11 @@ }; // End SymbolHashMapEntry class -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/generation.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/generation.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/memory/generation.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/generation.hpp -@@ -671,7 +671,8 @@ class OneContigSpaceCardGeneration: publ +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/generation.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/generation.hpp +@@ -673,7 +673,8 @@ class OneContigSpaceCardGeneration: publ int level, GenRemSet* remset, ContiguousSpace* space) : CardGeneration(rs, initial_byte_size, level, remset), @@ -99,10 +99,10 @@ {} inline bool is_in(const void* p) const; -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/watermark.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/watermark.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/memory/watermark.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/watermark.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/watermark.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/watermark.hpp @@ -40,8 +40,8 @@ class WaterMark VALUE_OBJ_CLASS_SPEC { void set_point(HeapWord* p) { _point = p; } @@ -114,29 +114,28 @@ }; inline bool operator==(const WaterMark& x, const WaterMark& y) { -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp -@@ -70,11 +70,11 @@ class CollectorPolicy : public CHeapObj - size_t _max_alignment; +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp +@@ -83,11 +83,11 @@ class CollectorPolicy : public CHeapObj + bool _all_soft_refs_clear; CollectorPolicy() : - _min_alignment(1), - _max_alignment(1), _initial_heap_byte_size(0), _max_heap_byte_size(0), -- _min_heap_byte_size(0) -+ _min_heap_byte_size(0), + _min_heap_byte_size(0), + _min_alignment(1), -+ _max_alignment(1) - {} - - public: -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp ++ _max_alignment(1), + _size_policy(NULL), + _should_clear_all_soft_refs(false), + _all_soft_refs_clear(false) +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp @@ -44,7 +44,7 @@ class GenerationCounters: public CHeapOb // This constructor is only meant for use with the PSGenerationCounters // constructor. The need for such an constructor should be eliminated @@ -146,10 +145,10 @@ public: GenerationCounters(const char* name, int ordinal, int spaces, -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/space.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/space.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/memory/space.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/memory/space.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/memory/space.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/memory/space.hpp @@ -328,7 +328,7 @@ public: DirtyCardToOopClosure(Space* sp, OopClosure* cl, CardTableModRefBS::PrecisionStyle precision, @@ -159,10 +158,10 @@ _min_done(NULL) { NOT_PRODUCT(_last_bottom = NULL); NOT_PRODUCT(_last_explicit_min_done = NULL); -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp @@ -314,8 +314,8 @@ class VM_FindDeadlocks: public VM_Operat outputStream* _out; @@ -174,10 +173,10 @@ ~VM_FindDeadlocks(); DeadlockCycle* result() { return _deadlocks; }; -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/callnode.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/callnode.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/callnode.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/callnode.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/callnode.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/callnode.hpp @@ -309,8 +309,8 @@ public: // A plain safepoint advertises no memory effects (NULL): const TypePtr* adr_type = NULL) @@ -199,10 +198,10 @@ { #ifndef PRODUCT _counter = NULL; -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/type.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/type.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/type.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/type.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/type.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/type.hpp @@ -575,7 +575,7 @@ class TypePtr : public Type { public: enum PTR { TopPTR, AnyNull, Constant, Null, NotNull, BotPTR, lastPTR }; @@ -212,10 +211,10 @@ virtual bool eq( const Type *t ) const; virtual int hash() const; // Type specific hashing static const PTR ptr_meet[lastPTR][lastPTR]; -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/machnode.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/machnode.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/machnode.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/machnode.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/machnode.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/machnode.hpp @@ -780,7 +780,7 @@ public: uint _block_num; @@ -225,10 +224,10 @@ labelOper(Label* label, uint block_num) : _label(label), _block_num(block_num) {} -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/runtime.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/runtime.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/runtime.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/runtime.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/runtime.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/runtime.hpp @@ -64,8 +64,8 @@ private: NamedCounter(const char *n, CounterTag tag = NoTag): _name(n), @@ -240,10 +239,10 @@ const char * name() const { return _name; } int count() const { return _count; } -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/block.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/block.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/block.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/block.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/block.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/block.hpp @@ -47,7 +47,7 @@ protected: public: Arena *_arena; // Arena to allocate in @@ -277,10 +276,10 @@ set_next(b, NULL); set_prev(b, NULL); }; -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/loopnode.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/loopnode.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/loopnode.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/loopnode.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/loopnode.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/loopnode.hpp @@ -299,9 +299,9 @@ public: : _parent(0), _next(0), _child(0), _head(head), _tail(tail), @@ -293,10 +292,10 @@ { } // Is 'l' a member of 'this'? -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/subnode.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/subnode.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/opto/subnode.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/opto/subnode.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/opto/subnode.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/opto/subnode.hpp @@ -278,7 +278,7 @@ class BoolNode : public Node { virtual uint size_of() const; public: @@ -306,10 +305,10 @@ init_class_id(Class_Bool); } // Convert an arbitrary int value to a Bool or other suitable predicate. -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp @@ -139,7 +139,7 @@ class ImplicitExceptionTable VALUE_OBJ_C implicit_null_entry *adr( uint idx ) const { return &_data[2*idx]; } ReallocMark _nesting; // assertion check for reallocations @@ -319,11 +318,11 @@ // (run-time) construction from nmethod ImplicitExceptionTable( const nmethod *nm ); -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp -@@ -165,13 +165,13 @@ void MatchList::output(FILE *fp) { +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/archDesc.cpp +@@ -166,13 +166,13 @@ void MatchList::output(FILE *fp) { ArchDesc::ArchDesc() : _globalNames(cmpstr,hashstr, Form::arena), @@ -341,10 +340,10 @@ // Initialize the opcode to MatchList table with NULLs for( int i=0; i<_last_opcode; ++i ) { -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/forms.hpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/forms.hpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/forms.hpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/forms.hpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/forms.hpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/forms.hpp @@ -142,7 +142,7 @@ public: // Public Methods @@ -354,10 +353,10 @@ ~Form() {}; virtual bool ideal_only() const { -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp @@ -29,8 +29,8 @@ //----------------------------ADLParser---------------------------------------- // Create a new ADL parser @@ -369,10 +368,10 @@ _AD._syntax_errs = _AD._semantic_errs = 0; // No errors so far this file _AD._warnings = 0; // No warnings either _curline = _ptr = NULL; // No pointers into buffer yet -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/arena.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/arena.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/arena.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/arena.cpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/arena.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/arena.cpp @@ -71,7 +71,7 @@ Arena::Arena() { } @@ -382,10 +381,10 @@ set_size_in_bytes(a->size_in_bytes()); } -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/dict2.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/dict2.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/dict2.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/dict2.cpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/dict2.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/dict2.cpp @@ -52,11 +52,11 @@ public: // doubled in size; the total amount of EXTRA times all hash functions are // computed for the doubling is no more than the current size - thus the @@ -400,10 +399,10 @@ init(); } -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/filebuff.cpp @@ -29,7 +29,7 @@ using namespace std; //------------------------------FileBuff--------------------------------------- @@ -422,10 +421,10 @@ _next = NULL; // No chained regions } -Index: icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp +Index: icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp -+++ icedtea6-1.9.1/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp +--- icedtea6-1.9.7.orig/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp ++++ icedtea6-1.9.7/openjdk/hotspot/src/share/vm/adlc/formsopt.cpp @@ -182,8 +182,8 @@ void RegisterForm::output(FILE *fp) { RegDef::RegDef(char *regname, char *callconv, char *c_conv, char * idealtype, char * encode, char * concrete) : _regname(regname), _callconv(callconv), _c_conv(c_conv), ++++++ openjdk-6-src-b20-no-werror.patch ++++++ --- /var/tmp/diff_new_pack.3yy7cY/_old 2011-02-28 17:18:31.000000000 +0100 +++ /var/tmp/diff_new_pack.3yy7cY/_new 2011-02-28 17:18:31.000000000 +0100 @@ -1,8 +1,17 @@ -Index: icedtea6-1.9.1/openjdk/hotspot/make/linux/makefiles/gcc.make +Index: icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/gcc.make =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/make/linux/makefiles/gcc.make -+++ icedtea6-1.9.1/openjdk/hotspot/make/linux/makefiles/gcc.make -@@ -111,7 +111,8 @@ else +--- icedtea6-1.9.7.orig/openjdk/hotspot/make/linux/makefiles/gcc.make ++++ icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/gcc.make +@@ -118,7 +118,7 @@ else + endif + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++WARNINGS_ARE_ERRORS = -Wall + + # Except for a few acceptable ones + # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit +@@ -130,7 +130,8 @@ else ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare endif @@ -12,10 +21,10 @@ # Special cases CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) -Index: icedtea6-1.9.1/openjdk/jdk/make/common/Defs-linux.gmk +Index: icedtea6-1.9.7/openjdk/jdk/make/common/Defs-linux.gmk =================================================================== ---- icedtea6-1.9.1.orig/openjdk/jdk/make/common/Defs-linux.gmk -+++ icedtea6-1.9.1/openjdk/jdk/make/common/Defs-linux.gmk +--- icedtea6-1.9.7.orig/openjdk/jdk/make/common/Defs-linux.gmk ++++ icedtea6-1.9.7/openjdk/jdk/make/common/Defs-linux.gmk @@ -153,9 +153,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G # # Treat compiler warnings as errors, if warnings not allowed @@ -24,29 +33,29 @@ - GCC_WARNINGS += -Werror -endif +#ifeq ($(COMPILER_WARNINGS_FATAL),true) -+# GCC_WARNINGS += -Werror ++# GCC_WARNINGS += -Wall +#endif # # Misc compiler options -Index: icedtea6-1.9.1/openjdk/hotspot/make/linux/makefiles/adlc.make +Index: icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/adlc.make =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/make/linux/makefiles/adlc.make -+++ icedtea6-1.9.1/openjdk/hotspot/make/linux/makefiles/adlc.make +--- icedtea6-1.9.7.orig/openjdk/hotspot/make/linux/makefiles/adlc.make ++++ icedtea6-1.9.7/openjdk/hotspot/make/linux/makefiles/adlc.make @@ -62,7 +62,8 @@ CPPFLAGS += -DASSERT # CFLAGS_WARN holds compiler options to suppress/enable warnings. # Compiler warnings are treated as errors -CFLAGS_WARN = -Werror +# XXX: Who could fix all those stupid errors on gcc 4.5? -+#CFLAGS_WARN = -Werror ++#CFLAGS_WARN = -Wall CFLAGS += $(CFLAGS_WARN) OBJECTNAMES = \ -Index: icedtea6-1.9.1/openjdk/corba/make/common/Defs-linux.gmk +Index: icedtea6-1.9.7/openjdk/corba/make/common/Defs-linux.gmk =================================================================== ---- icedtea6-1.9.1.orig/openjdk/corba/make/common/Defs-linux.gmk -+++ icedtea6-1.9.1/openjdk/corba/make/common/Defs-linux.gmk +--- icedtea6-1.9.7.orig/openjdk/corba/make/common/Defs-linux.gmk ++++ icedtea6-1.9.7/openjdk/corba/make/common/Defs-linux.gmk @@ -143,9 +143,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G # # Treat compiler warnings as errors, if warnings not allowed @@ -55,17 +64,21 @@ - GCC_WARNINGS += -Werror -endif +#ifeq ($(COMPILER_WARNINGS_FATAL),true) -+# GCC_WARNINGS += -Werror ++# GCC_WARNINGS += -Wall +#endif # # Misc compiler options -Index: icedtea6-1.9.1/openjdk/hotspot/make/solaris/makefiles/gcc.make +Index: icedtea6-1.9.7/openjdk/hotspot/make/solaris/makefiles/gcc.make =================================================================== ---- icedtea6-1.9.1.orig/openjdk/hotspot/make/solaris/makefiles/gcc.make -+++ icedtea6-1.9.1/openjdk/hotspot/make/solaris/makefiles/gcc.make -@@ -114,7 +114,7 @@ endif - WARNINGS_ARE_ERRORS = -Werror +--- icedtea6-1.9.7.orig/openjdk/hotspot/make/solaris/makefiles/gcc.make ++++ icedtea6-1.9.7/openjdk/hotspot/make/solaris/makefiles/gcc.make +@@ -111,10 +111,10 @@ endif + + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++WARNINGS_ARE_ERRORS = -Wall # Enable these warnings. See 'info gcc' about details on these options ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare -CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS) @@ -73,3 +86,68 @@ # Special cases CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) +Index: icedtea6-1.9.7/openjdk-ecj/corba/make/common/Defs-linux.gmk +=================================================================== +--- icedtea6-1.9.7.orig/openjdk-ecj/corba/make/common/Defs-linux.gmk ++++ icedtea6-1.9.7/openjdk-ecj/corba/make/common/Defs-linux.gmk +@@ -144,7 +144,7 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G + # Treat compiler warnings as errors, if warnings not allowed + # + ifeq ($(COMPILER_WARNINGS_FATAL),true) +- GCC_WARNINGS += -Werror ++ GCC_WARNINGS += -Wall + endif + + # +Index: icedtea6-1.9.7/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make +=================================================================== +--- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make ++++ icedtea6-1.9.7/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make +@@ -62,7 +62,7 @@ CPPFLAGS += -DASSERT + + # CFLAGS_WARN holds compiler options to suppress/enable warnings. + # Compiler warnings are treated as errors +-CFLAGS_WARN = -Werror ++CFLAGS_WARN = -Wall + CFLAGS += $(CFLAGS_WARN) + + OBJECTNAMES = \ +Index: icedtea6-1.9.7/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make +=================================================================== +--- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make ++++ icedtea6-1.9.7/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make +@@ -118,7 +118,7 @@ else + endif + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++WARNINGS_ARE_ERRORS = -Wall + + # Except for a few acceptable ones + # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit +Index: icedtea6-1.9.7/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make +=================================================================== +--- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make ++++ icedtea6-1.9.7/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make +@@ -111,7 +111,7 @@ endif + + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++WARNINGS_ARE_ERRORS = -Wall + # Enable these warnings. See 'info gcc' about details on these options + ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare + CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS) +Index: icedtea6-1.9.7/openjdk-ecj/jdk/make/common/Defs-linux.gmk +=================================================================== +--- icedtea6-1.9.7.orig/openjdk-ecj/jdk/make/common/Defs-linux.gmk ++++ icedtea6-1.9.7/openjdk-ecj/jdk/make/common/Defs-linux.gmk +@@ -154,7 +154,7 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G + # Treat compiler warnings as errors, if warnings not allowed + # + ifeq ($(COMPILER_WARNINGS_FATAL),true) +- GCC_WARNINGS += -Werror ++ GCC_WARNINGS += -Wall + endif + + # ++++++ openjdk-6-src-b20-stringcompare.patch ++++++ Index: icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/awt/awt_Font.c =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/jdk/src/solaris/native/sun/awt/awt_Font.c +++ icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/awt/awt_Font.c @@ -574,7 +574,7 @@ awtJNI_GetFontData(JNIEnv * env, jobject jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10, nativename, size * 10); - if (nativename != NULL && nativename != "") + if (nativename != NULL && strcmp(nativename, "")) JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename); /* ++++++ openjdk-ecj-6-src-b20-no-return-in-nonvoid-function.patch ++++++ Index: icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/bin/jexec.c =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/jdk/src/solaris/bin/jexec.c +++ icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/bin/jexec.c @@ -221,6 +221,9 @@ int main(int argc, const char * argv[]) * implies an error in the exec. */ free(nargv); errorExit(errno, BAD_EXEC_MSG); + + /* Just supress compiler warning */ + return 0; } Index: icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c +++ icedtea6-1.9.7/openjdk-ecj/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c @@ -138,10 +138,12 @@ jboolean XShared_initIDs(JNIEnv *env, jb } } - return JNI_TRUE; #endif /* MITSHM */ #endif /* !HEADLESS */ + + /* Supress compiler warning */ + return JNI_TRUE; } @@ -463,8 +465,10 @@ jboolean XShared_initSurface(JNIEnv *env return JNI_FALSE; } - return JNI_TRUE; #endif /* !HEADLESS */ + + /* Suppress compiler warning */ + return JNI_TRUE; } Index: icedtea6-1.9.7/openjdk-ecj/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp +++ icedtea6-1.9.7/openjdk-ecj/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp @@ -494,6 +494,9 @@ JVM_handle_linux_signal(int sig, err.report_and_die(); ShouldNotReachHere(); + + /*Supress compiler warnings*/ + return -1; } void os::Linux::init_thread_fpu_state(void) { Index: icedtea6-1.9.7/openjdk-ecj/hotspot/src/cpu/x86/vm/x86_32.ad =================================================================== --- icedtea6-1.9.7.orig/openjdk-ecj/hotspot/src/cpu/x86/vm/x86_32.ad +++ icedtea6-1.9.7/openjdk-ecj/hotspot/src/cpu/x86/vm/x86_32.ad @@ -1133,6 +1133,7 @@ uint MachSpillCopyNode::implementation( Unimplemented(); + return -1; //avoid compiler warning } #ifndef PRODUCT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit build for openSUSE:11.2
by root＠hilbert.suse.de 28 Feb '11

28 Feb '11

Hello community, here is the log from the commit of package build for openSUSE:11.2 checked in at Mon Feb 28 17:17:56 CET 2011. -------- --- old-versions/11.2/UPDATES/all/build/build.changes 2010-07-28 15:48:13.000000000 +0200 +++ 11.2/build/build.changes 2011-02-28 09:11:59.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 21 06:52:07 UTC 2011 - lnussel(a)suse.de + +- force use of bsdtar for VMs (bnc#665768, CVE-2010-4226) + +------------------------------------------------------------------- calling whatdependson for 11.2-i586 New: ---- 0001-force-use-of-bsdtar-for-VMs.diff build-emptyvmswap.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.oFteIv/_old 2011-02-28 17:17:48.000000000 +0100 +++ /var/tmp/diff_new_pack.oFteIv/_new 2011-02-28 17:17:48.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package build (Version 2010.07.28) +# spec file for package build # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs Version: 2010.07.28 -Release: 1.<RELEASE1> +Release: 1.<RELEASE3> # osc rm build-*tar.bz2 # REVISION=$(svn info https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build | sed -ne "/Revision: /s///p") # VERSION="$(date +"%Y.%m.%d").r$REVISION" @@ -40,6 +40,8 @@ # osc submitreq create -m"current svn snapshot." openSUSE:Tools build openSUSE:Factory #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz +Patch0: 0001-force-use-of-bsdtar-for-VMs.diff +Patch1: build-emptyvmswap.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch # Manual requires to avoid hard require to bash-static @@ -50,6 +52,7 @@ Requires: perl-TimeDate Requires: binutils Requires: tar +Recommends: bsdtar %description This package provides a script for building RPMs for SUSE Linux in a @@ -72,6 +75,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build ++++++ 0001-force-use-of-bsdtar-for-VMs.diff ++++++ >From da60f9f18958fecdb51091dbca4be01b612699f0 Mon Sep 17 00:00:00 2001 From: Michael Schroeder <mls(a)suse.de> Date: Tue, 7 Dec 2010 18:06:45 +0100 Subject: [PATCH] force use of bsdtar for VMs --- init_buildsystem | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diff --git a/init_buildsystem b/init_buildsystem index c1c7e33..426fa2b 100755 --- a/init_buildsystem +++ b/init_buildsystem @@ -129,7 +129,20 @@ preinstall() check_exit echo "preinstalling $1..." cd $BUILD_ROOT || cleanup_and_exit 1 - CPIO="cpio --extract --unconditional --preserve-modification-time --make-directories --no-absolute-filenames --quiet" + if test -x /usr/bin/bsdtar ; then + CPIO="/usr/bin/bsdtar --chroot -o --numeric-owner -x -f-" + TAR="/usr/bin/bsdtar --chroot -o --numeric-owner -x" + else + # cpio isn't safe so we require bsdtar for VMs. chroot is + # unsafe anyways so it's ok for that. + if [ -n "$PREPARE_VM" ]; then + echo "Error: setting up a VM requires bsdtar for security reasons." + echo "Please install bsdtar" + cleanup_and_exit 1 + fi + CPIO="cpio --extract --unconditional --preserve-modification-time --make-directories --no-absolute-filenames --quiet" + TAR="tar -x" + fi if test -e "$BUILD_ROOT/.init_b_cache/rpms/$1.rpm" ; then PAYLOADDECOMPRESS=cat case `rpm -qp --nodigest --nosignature --qf "%{PAYLOADCOMPRESSOR}\n" "$BUILD_ROOT/.init_b_cache/rpms/$1.rpm"` in @@ -151,22 +164,22 @@ preinstall() else rpm2cpio "$BUILD_ROOT/.init_b_cache/rpms/$1.rpm" | $PAYLOADDECOMPRESS | $CPIO fi - if test -e .init_b_cache/scripts/$1.run ; then - rpm -qp --nodigest --nosignature --qf "%{PREIN}" "$BUILD_ROOT/.init_b_cache/rpms/$1.rpm" > .init_b_cache/scripts/$1.pre - rpm -qp --nodigest --nosignature --qf "%{POSTIN}" "$BUILD_ROOT/.init_b_cache/rpms/$1.rpm" > .init_b_cache/scripts/$1.post + if test -e ".init_b_cache/scripts/$1.run" ; then + rpm -qp --nodigest --nosignature --qf "%{PREIN}" "$BUILD_ROOT/.init_b_cache/rpms/$1.rpm" > ".init_b_cache/scripts/$1.pre" + rpm -qp --nodigest --nosignature --qf "%{POSTIN}" "$BUILD_ROOT/.init_b_cache/rpms/$1.rpm" > ".init_b_cache/scripts/$1.post" echo -n '(none)' > .init_b_cache/scripts/.none - cmp -s .init_b_cache/scripts/$1.pre .init_b_cache/scripts/.none && rm -f .init_b_cache/scripts/$1.pre - cmp -s .init_b_cache/scripts/$1.post .init_b_cache/scripts/.none && rm -f .init_b_cache/scripts/$1.post + cmp -s ".init_b_cache/scripts/$1.pre" .init_b_cache/scripts/.none && rm -f ".init_b_cache/scripts/$1.pre" + cmp -s ".init_b_cache/scripts/$1.post" .init_b_cache/scripts/.none && rm -f ".init_b_cache/scripts/$1.post" rm -f .init_b_cache/scripts/.none fi elif test -e "$BUILD_ROOT/.init_b_cache/rpms/$1.deb" ; then ar x "$BUILD_ROOT/.init_b_cache/rpms/$1.deb" control.tar.gz data.tar.gz mkdir -p .init_b_cache/scripts/control - tar -C .init_b_cache/scripts/control -xzf control.tar.gz - tar xzf data.tar.gz - if test -e .init_b_cache/scripts/$1.run ; then - test -e .init_b_cache/scripts/control/preinst && mv .init_b_cache/scripts/control/preinst .init_b_cache/scripts/$1.pre - test -e .init_b_cache/scripts/control/postinst && mv .init_b_cache/scripts/control/postinst .init_b_cache/scripts/$1.post + $TAR -C .init_b_cache/scripts/control -z -f control.tar.gz + $TAR -z -f data.tar.gz + if test -e ".init_b_cache/scripts/$1.run" ; then + test -e .init_b_cache/scripts/control/preinst && mv .init_b_cache/scripts/control/preinst ".init_b_cache/scripts/$1.pre" + test -e .init_b_cache/scripts/control/postinst && mv .init_b_cache/scripts/control/postinst ".init_b_cache/scripts/$1.post" fi rm -rf .init_b_cache/scripts/control control.tar.gz data.tar.gz else -- 1.7.1 ++++++ build-emptyvmswap.diff ++++++ Index: build-2010.07.28/build =================================================================== --- build-2010.07.28.orig/build +++ build-2010.07.28/build @@ -1138,7 +1138,7 @@ if test -z "$RUNNING_IN_VM" ; then vm_img_mkfs "$VMDISK_FILESYSTEM" "$VM_IMAGE" || cleanup_and_exit 3 fi fi - if test ! -e "$VM_SWAP"; then + if test -n "$VM_SWAP" -a ! -e "$VM_SWAP"; then # setup VM_SWAP echo "Creating $VM_SWAP (${VMDISK_SWAPSIZE}M)" mkdir -p "${VM_SWAP%/*}" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit logwatch for openSUSE:11.2
by root＠hilbert.suse.de 28 Feb '11

28 Feb '11

Hello community, here is the log from the commit of package logwatch for openSUSE:11.2 checked in at Mon Feb 28 17:17:31 CET 2011. -------- --- old-versions/11.2/all/logwatch/logwatch.changes 2009-08-30 20:06:42.000000000 +0200 +++ 11.2/logwatch/logwatch.changes 2011-02-25 12:54:53.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Feb 25 12:36:14 CET 2011 - pth(a)suse.de + +- Add patch to fix the handling of special characters in log files + (CVE-2011-1018, bnc#674984). +- Make files in Logwatch_Dmeventd_Setup_Files tarball 644 and + repack with bzip2. + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.2/all/logwatch Destination is old-versions/11.2/UPDATES/all/logwatch calling whatdependson for 11.2-i586 Old: ---- Logwatch_Dmeventd_Setup_Files.tgz New: ---- Logwatch_Dmeventd_Setup_Files.tar.bz2 logwatch-CVE-2011-1018.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ logwatch.spec ++++++ --- /var/tmp/diff_new_pack.VKlnHx/_old 2011-02-28 17:16:51.000000000 +0100 +++ /var/tmp/diff_new_pack.VKlnHx/_new 2011-02-28 17:16:51.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package logwatch (Version 7.3.6) +# spec file for package logwatch # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,17 +21,18 @@ Name: logwatch Summary: Analyzes and Reports on system logs Version: 7.3.6 -Release: 66 +Release: 67.<RELEASE5> License: MIT License (or similar) Group: System/Monitoring Url: http://www.logwatch.org BuildArch: noarch Source0: logwatch-%{version}.tar.bz2 Source1: %{name}-rpmlintrc -Source2: Logwatch_Dmeventd_Setup_Files.tgz +Source2: Logwatch_Dmeventd_Setup_Files.tar.bz2 Patch0: logwatch-firewall.patch Patch1: logwatch-full_path_to_sendmail.patch Patch2: logwatch-timestamp_in_var.patch +Patch3: logwatch-CVE-2011-1018.patch Requires: perl textutils sh-utils grep mailx cron BuildRequires: dos2unix BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -54,6 +55,7 @@ %patch0 %patch1 %patch2 +%patch3 dos2unix scripts/services/courier %build ++++++ logwatch-CVE-2011-1018.patch ++++++ Index: scripts/logwatch.pl =================================================================== --- scripts/logwatch.pl.orig 2011-02-25 12:30:40.934525836 +0100 +++ scripts/logwatch.pl 2011-02-25 12:34:45.979948361 +0100 @@ -845,6 +845,10 @@ foreach $LogFile (@LogFileList) { my $DestFile = $TempDir . $LogFile . "-archive"; my $Archive; foreach $Archive (@{$LogFileData{$LogFile}{'archives'}}) { + if ($Archive =~ /'/) { + print "File $Archive has invalid embedded quotes. File ignored.\n"; + next; + } my $CheckTime; # We need to find out what's the earliest log we need my @time_t = TimeBuild(); @@ -872,18 +876,18 @@ foreach $LogFile (@LogFileList) { #These system calls are not secure but we are getting closer #What needs to go is all the pipes and instead we need a command loop #For each filter to apply -mgt - my $arguments = "$Archive >> $DestFile"; + my $arguments = "'${Archive}' >> $DestFile"; system("$Config{'pathtozcat'} $arguments") == 0 or die "system $Config{'pathtozcat'} failed: $?" } elsif (($Archive =~ m/bz2$/) && (-f "$Archive")) { #These system calls are not secure but we are getting closer #What needs to go is all the pipes and instead we need a command loop #For each filter to apply -mgt - my $arguments = "$Archive 2>/dev/null >> $DestFile"; + my $arguments = "'${Archive}' 2>/dev/null >> $DestFile"; system("$Config{'pathtobzcat'} $arguments") == 0 or die "system $Config{'pathtobzcat'} failed: $?" - } elsif (-f "$Archive") { - my $arguments = "$Archive >> $DestFile"; + } elsif (-f "$Archive") && (-s "$Archive")) { + my $arguments = "'${Archive}' >> $DestFile"; system("$Config{'pathtocat'} $arguments") == 0 or die "system $Config{'pathtocat'} failed: $?" } #End if/elsif existence @@ -895,6 +899,10 @@ foreach $LogFile (@LogFileList) { foreach my $ThisFile (@FileList) { #Existence check for files -mgt next unless (-f $ThisFile); + if ($ThisFile =~ /'/) { + print "File $ThisFile has invalid embedded quotes. File ignored.\n"; + next; + } if (! -r $ThisFile) { print "File $ThisFile is not readable. Check permissions."; if ($> != 0) { @@ -903,7 +911,7 @@ foreach $LogFile (@LogFileList) { print "\n"; next; } - $FileText .= ($ThisFile . " "); + $FileText .= ("'" . $ThisFile . "' "); } #End foreach ThisFile # remove the ENV entries set by previous service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bundle-lang-common for openSUSE:11.4
by root＠hilbert.suse.de 28 Feb '11

28 Feb '11

Hello community, here is the log from the commit of package bundle-lang-common for openSUSE:11.4 checked in at Mon Feb 28 16:41:12 CET 2011. -------- --- old-versions/11.4/all/bundle-lang-common/bundle-lang-common.changes 2011-02-19 19:39:19.000000000 +0100 +++ /mounts/work_src_done/11.4/bundle-lang-common/bundle-lang-common.changes 2011-02-27 17:24:10.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Feb 27 16:20:42 UTC 2011 - coolo(a)novell.com + +- gstreamer plugins-good is common now + +------------------------------------------------------------------- bundle-lang-gnome-extras.changes: same change bundle-lang-gnome.changes: same change bundle-lang-kde.changes: same change calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bundle-lang-common.spec ++++++ --- /var/tmp/diff_new_pack.gz5kUa/_old 2011-02-28 16:39:00.000000000 +0100 +++ /var/tmp/diff_new_pack.gz5kUa/_new 2011-02-28 16:39:00.000000000 +0100 @@ -20,13 +20,13 @@ #!BuildIgnore: gimp-unstable Name: bundle-lang-common -BuildRequires: NetworkManager-lang PackageKit-lang avahi-lang bash-lang coreutils-lang cpio-lang gconf2-lang gdk-pixbuf-lang gimp-lang glib-networking-lang glib2-lang gnome-keyring-lang gnome-vfs2-lang gpg2-lang gstreamer-0_10-lang gstreamer-0_10-plugins-base-lang gtk2-lang libgphoto2-lang libwnck-lang login-lang mc-lang notification-daemon-lang pulseaudio-lang tar-lang upower-lang util-linux-lang wdiff-lang +BuildRequires: NetworkManager-lang PackageKit-lang avahi-lang bash-lang coreutils-lang cpio-lang gconf2-lang gdk-pixbuf-lang gimp-lang glib-networking-lang glib2-lang gnome-keyring-lang gnome-vfs2-lang gpg2-lang gstreamer-0_10-lang gstreamer-0_10-plugins-base-lang gstreamer-0_10-plugins-good-lang gtk2-lang libgnome-keyring-lang libgphoto2-lang login-lang mc-lang pulseaudio-lang tar-lang upower-lang util-linux-lang wdiff-lang BuildRequires: fdupes #!BuildIgnore: xorg-x11-driver-input License: MIT License (or similar) Group: System/Localization Version: 11.4 -Release: 12.<RELEASE2> +Release: 12.<RELEASE3> Summary: Translations for a Group of Programs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -79,18 +79,18 @@ Provides: locale(gstreamer-0_10:en) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:en) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:en) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:en) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:en) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:en) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:en) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:en) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:en) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:en) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:en) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -143,18 +143,18 @@ Provides: locale(gstreamer-0_10:de) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:de) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:de) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:de) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:de) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:de) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:de) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:de) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:de) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:de) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:de) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -207,18 +207,18 @@ Provides: locale(gstreamer-0_10:es) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:es) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:es) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:es) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:es) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:es) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:es) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:es) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:es) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:es) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:es) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -271,18 +271,18 @@ Provides: locale(gstreamer-0_10:it) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:it) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:it) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:it) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:it) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:it) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:it) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:it) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:it) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:it) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:it) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -335,18 +335,18 @@ Provides: locale(gstreamer-0_10:fr) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:fr) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:fr) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:fr) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:fr) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:fr) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:fr) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:fr) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:fr) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:fr) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:fr) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -399,18 +399,18 @@ Provides: locale(gstreamer-0_10:ja) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:ja) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:ja) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:ja) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:ja) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:ja) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:ja) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:ja) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:ja) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:ja) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:ja) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -463,18 +463,18 @@ Provides: locale(gstreamer-0_10:zh) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:zh) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:zh) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:zh) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:zh) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:zh) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:zh) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:zh) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:zh) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:zh) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:zh) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -527,18 +527,18 @@ Provides: locale(gstreamer-0_10:nl) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:nl) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:nl) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:nl) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:nl) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:nl) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:nl) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:nl) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:nl) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:nl) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:nl) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -591,18 +591,18 @@ Provides: locale(gstreamer-0_10:cs) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:cs) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:cs) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:cs) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:cs) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:cs) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:cs) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:cs) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:cs) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:cs) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:cs) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -671,24 +671,24 @@ Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:pt) Provides: locale(gstreamer-0_10-plugins-base:pt_BR) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:pt) +Provides: locale(gstreamer-0_10-plugins-good:pt_BR) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:pt) Provides: locale(gtk2:pt_BR) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:pt) +Provides: locale(libgnome-keyring:pt_BR) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:pt) Provides: locale(libgphoto2:pt_BR) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:pt) -Provides: locale(libwnck:pt_BR) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:pt) Provides: locale(login:pt_BR) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:pt) Provides: locale(mc:pt_BR) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:pt) -Provides: locale(notification-daemon:pt_BR) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:pt) Provides: locale(pulseaudio:pt_BR) @@ -746,18 +746,18 @@ Provides: locale(gstreamer-0_10:pl) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:pl) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:pl) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:pl) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:pl) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:pl) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:pl) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:pl) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:pl) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:pl) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:pl) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -810,18 +810,18 @@ Provides: locale(gstreamer-0_10:ca) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:ca) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:ca) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:ca) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:ca) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:ca) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:ca) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:ca) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:ca) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:ca) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:ca) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -874,18 +874,18 @@ Provides: locale(gstreamer-0_10:ar) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:ar) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:ar) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:ar) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:ar) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:ar) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:ar) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:ar) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:ar) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:ar) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:ar) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -938,18 +938,18 @@ Provides: locale(gstreamer-0_10:hu) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:hu) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:hu) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:hu) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:hu) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:hu) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:hu) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:hu) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:hu) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:hu) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:hu) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -1002,18 +1002,18 @@ Provides: locale(gstreamer-0_10:ko) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:ko) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:ko) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:ko) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:ko) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:ko) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:ko) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:ko) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:ko) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:ko) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:ko) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -1066,18 +1066,18 @@ Provides: locale(gstreamer-0_10:da) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:da) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:da) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:da) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:da) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:da) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:da) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:da) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:da) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:da) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:da) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -1130,18 +1130,18 @@ Provides: locale(gstreamer-0_10:sv) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:sv) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:sv) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:sv) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:sv) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:sv) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:sv) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:sv) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:sv) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:sv) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:sv) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -1194,18 +1194,18 @@ Provides: locale(gstreamer-0_10:ru) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:ru) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:ru) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:ru) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:ru) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:ru) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:ru) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:ru) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:ru) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:ru) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:ru) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -1258,18 +1258,18 @@ Provides: locale(gstreamer-0_10:fi) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:fi) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:fi) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:fi) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:fi) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:fi) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:fi) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:fi) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:fi) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:fi) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:fi) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -1322,18 +1322,18 @@ Provides: locale(gstreamer-0_10:nb) Provides: gstreamer-0_10-plugins-base-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-base-lang) Provides: locale(gstreamer-0_10-plugins-base:nb) +Provides: gstreamer-0_10-plugins-good-lang = %(rpm -q --queryformat '%{VERSION}' gstreamer-0_10-plugins-good-lang) +Provides: locale(gstreamer-0_10-plugins-good:nb) Provides: gtk2-lang = %(rpm -q --queryformat '%{VERSION}' gtk2-lang) Provides: locale(gtk2:nb) +Provides: libgnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' libgnome-keyring-lang) +Provides: locale(libgnome-keyring:nb) Provides: libgphoto2-lang = %(rpm -q --queryformat '%{VERSION}' libgphoto2-lang) Provides: locale(libgphoto2:nb) -Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) -Provides: locale(libwnck:nb) Provides: login-lang = %(rpm -q --queryformat '%{VERSION}' login-lang) Provides: locale(login:nb) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:nb) -Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) -Provides: locale(notification-daemon:nb) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) Provides: locale(pulseaudio:nb) Provides: tar-lang = %(rpm -q --queryformat '%{VERSION}' tar-lang) @@ -1357,7 +1357,7 @@ %install mkdir -p $RPM_BUILD_ROOT cp %SOURCE1 . -bash %SOURCE0 NetworkManager-lang PackageKit-lang avahi-lang bash-lang coreutils-lang cpio-lang gconf2-lang gdk-pixbuf-lang gimp-lang glib-networking-lang glib2-lang gnome-keyring-lang gnome-vfs2-lang gpg2-lang gstreamer-0_10-lang gstreamer-0_10-plugins-base-lang gtk2-lang libgphoto2-lang libwnck-lang login-lang mc-lang notification-daemon-lang pulseaudio-lang tar-lang upower-lang util-linux-lang wdiff-lang +bash %SOURCE0 NetworkManager-lang PackageKit-lang avahi-lang bash-lang coreutils-lang cpio-lang gconf2-lang gdk-pixbuf-lang gimp-lang glib-networking-lang glib2-lang gnome-keyring-lang gnome-vfs2-lang gpg2-lang gstreamer-0_10-lang gstreamer-0_10-plugins-base-lang gstreamer-0_10-plugins-good-lang gtk2-lang libgnome-keyring-lang libgphoto2-lang login-lang mc-lang pulseaudio-lang tar-lang upower-lang util-linux-lang wdiff-lang if test common = kde; then # pretty evil hack to keep the symlinks working ++++++ bundle-lang-gnome.spec ++++++ ++++ 744 lines (skipped) ++++ between old-versions/11.4/all/bundle-lang-common/bundle-lang-gnome.spec ++++ and /mounts/work_src_done/11.4/bundle-lang-common/bundle-lang-gnome.spec ++++++ bundle-lang-kde.spec ++++++ --- /var/tmp/diff_new_pack.gz5kUa/_old 2011-02-28 16:39:00.000000000 +0100 +++ /var/tmp/diff_new_pack.gz5kUa/_new 2011-02-28 16:39:00.000000000 +0100 @@ -20,7 +20,7 @@ #!BuildIgnore: gimp-unstable Name: bundle-lang-kde -BuildRequires: NetworkManager-kde4-libs-lang amarok-lang ggz-client-libs-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang kpackagekit-lang ktorrent-lang kwebkitpart-lang libgpod-lang +BuildRequires: NetworkManager-kde4-libs-lang amarok-lang bluedevil-lang ggz-client-libs-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang konversation-lang kpackagekit-lang ktorrent-lang kwebkitpart-lang libgpod-lang BuildRequires: fdupes #!BuildIgnore: xorg-x11-driver-input License: MIT License (or similar) @@ -63,6 +63,8 @@ Provides: locale(NetworkManager-kde4-libs:en) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:en) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:en) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:en) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -71,6 +73,8 @@ Provides: locale(kdebase4-openSUSE:en) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:en) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:en) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:en) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -105,6 +109,8 @@ Provides: locale(NetworkManager-kde4-libs:de) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:de) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:de) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:de) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -113,6 +119,8 @@ Provides: locale(kdebase4-openSUSE:de) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:de) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:de) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:de) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -147,6 +155,8 @@ Provides: locale(NetworkManager-kde4-libs:es) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:es) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:es) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:es) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -155,6 +165,8 @@ Provides: locale(kdebase4-openSUSE:es) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:es) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:es) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:es) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -189,6 +201,8 @@ Provides: locale(NetworkManager-kde4-libs:it) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:it) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:it) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:it) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -197,6 +211,8 @@ Provides: locale(kdebase4-openSUSE:it) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:it) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:it) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:it) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -231,6 +247,8 @@ Provides: locale(NetworkManager-kde4-libs:fr) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:fr) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:fr) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:fr) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -239,6 +257,8 @@ Provides: locale(kdebase4-openSUSE:fr) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:fr) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:fr) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:fr) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -273,6 +293,8 @@ Provides: locale(NetworkManager-kde4-libs:ja) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:ja) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:ja) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:ja) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -281,6 +303,8 @@ Provides: locale(kdebase4-openSUSE:ja) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:ja) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:ja) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:ja) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -315,6 +339,8 @@ Provides: locale(NetworkManager-kde4-libs:zh) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:zh) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:zh) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:zh) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -323,6 +349,8 @@ Provides: locale(kdebase4-openSUSE:zh) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:zh) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:zh) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:zh) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -357,6 +385,8 @@ Provides: locale(NetworkManager-kde4-libs:nl) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:nl) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:nl) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:nl) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -365,6 +395,8 @@ Provides: locale(kdebase4-openSUSE:nl) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:nl) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:nl) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:nl) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -399,6 +431,8 @@ Provides: locale(NetworkManager-kde4-libs:cs) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:cs) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:cs) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:cs) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -407,6 +441,8 @@ Provides: locale(kdebase4-openSUSE:cs) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:cs) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:cs) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:cs) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -443,6 +479,9 @@ Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:pt) Provides: locale(amarok:pt_BR) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:pt) +Provides: locale(bluedevil:pt_BR) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:pt) Provides: locale(ggz-client-libs:pt_BR) @@ -455,6 +494,9 @@ Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:pt) Provides: locale(kipi-plugins:pt_BR) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:pt) +Provides: locale(konversation:pt_BR) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:pt) Provides: locale(kpackagekit:pt_BR) @@ -493,6 +535,8 @@ Provides: locale(NetworkManager-kde4-libs:pl) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:pl) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:pl) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:pl) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -501,6 +545,8 @@ Provides: locale(kdebase4-openSUSE:pl) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:pl) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:pl) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:pl) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -535,6 +581,8 @@ Provides: locale(NetworkManager-kde4-libs:ca) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:ca) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:ca) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:ca) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -543,6 +591,8 @@ Provides: locale(kdebase4-openSUSE:ca) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:ca) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:ca) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:ca) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -577,6 +627,8 @@ Provides: locale(NetworkManager-kde4-libs:ar) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:ar) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:ar) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:ar) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -585,6 +637,8 @@ Provides: locale(kdebase4-openSUSE:ar) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:ar) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:ar) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:ar) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -619,6 +673,8 @@ Provides: locale(NetworkManager-kde4-libs:hu) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:hu) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:hu) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:hu) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -627,6 +683,8 @@ Provides: locale(kdebase4-openSUSE:hu) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:hu) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:hu) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:hu) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -661,6 +719,8 @@ Provides: locale(NetworkManager-kde4-libs:ko) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:ko) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:ko) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:ko) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -669,6 +729,8 @@ Provides: locale(kdebase4-openSUSE:ko) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:ko) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:ko) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:ko) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -703,6 +765,8 @@ Provides: locale(NetworkManager-kde4-libs:da) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:da) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:da) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:da) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -711,6 +775,8 @@ Provides: locale(kdebase4-openSUSE:da) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:da) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:da) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:da) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -745,6 +811,8 @@ Provides: locale(NetworkManager-kde4-libs:sv) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:sv) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:sv) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:sv) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -753,6 +821,8 @@ Provides: locale(kdebase4-openSUSE:sv) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:sv) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:sv) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:sv) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -787,6 +857,8 @@ Provides: locale(NetworkManager-kde4-libs:ru) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:ru) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:ru) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:ru) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -795,6 +867,8 @@ Provides: locale(kdebase4-openSUSE:ru) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:ru) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:ru) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:ru) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -829,6 +903,8 @@ Provides: locale(NetworkManager-kde4-libs:fi) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:fi) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:fi) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:fi) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -837,6 +913,8 @@ Provides: locale(kdebase4-openSUSE:fi) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:fi) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:fi) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:fi) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -871,6 +949,8 @@ Provides: locale(NetworkManager-kde4-libs:nb) Provides: amarok-lang = %(rpm -q --queryformat '%{VERSION}' amarok-lang) Provides: locale(amarok:nb) +Provides: bluedevil-lang = %(rpm -q --queryformat '%{VERSION}' bluedevil-lang) +Provides: locale(bluedevil:nb) Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) Provides: locale(ggz-client-libs:nb) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) @@ -879,6 +959,8 @@ Provides: locale(kdebase4-openSUSE:nb) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:nb) +Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) +Provides: locale(konversation:nb) Provides: kpackagekit-lang = %(rpm -q --queryformat '%{VERSION}' kpackagekit-lang) Provides: locale(kpackagekit:nb) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) @@ -912,7 +994,7 @@ %install mkdir -p $RPM_BUILD_ROOT cp %SOURCE1 . -bash %SOURCE0 NetworkManager-kde4-libs-lang amarok-lang ggz-client-libs-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang kpackagekit-lang ktorrent-lang kwebkitpart-lang libgpod-lang +bash %SOURCE0 NetworkManager-kde4-libs-lang amarok-lang bluedevil-lang ggz-client-libs-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang konversation-lang kpackagekit-lang ktorrent-lang kwebkitpart-lang libgpod-lang if test kde = kde; then # pretty evil hack to keep the symlinks working ++++++ packages.txt ++++++ --- /var/tmp/diff_new_pack.gz5kUa/_old 2011-02-28 16:39:00.000000000 +0100 +++ /var/tmp/diff_new_pack.gz5kUa/_new 2011-02-28 16:39:00.000000000 +0100 @@ -20,6 +20,7 @@ balsa-lang gnome-extras banshee-1-lang gnome bash-lang common +bluedevil-lang kde blueproximity-lang gnome-extras brasero-lang gnome bug-buddy-lang gnome @@ -156,7 +157,7 @@ gstreamer-0_10-lang common gstreamer-0_10-plugins-bad-lang gnome gstreamer-0_10-plugins-base-lang common -gstreamer-0_10-plugins-good-lang gnome +gstreamer-0_10-plugins-good-lang common gstreamer-0_10-plugins-ugly-lang gnome-extras gsynaptics-lang gnome-extras gtali-lang gnome-extras @@ -186,6 +187,7 @@ k3b-lang kde kdebase4-openSUSE-lang kde kipi-plugins-lang kde +konversation-lang kde kpackagekit-lang kde krb5-auth-dialog-lang gnome-extras ktorrent-lang kde @@ -199,7 +201,7 @@ libgda3-lang gnome-extras libgdata-lang gnome libgdu-lang gnome -libgnome-keyring-lang gnome +libgnome-keyring-lang common libgnome-lang gnome libgnomecanvas-lang gnome libgnomecups-lang gnome @@ -218,7 +220,7 @@ libpurple-lang gnome libslab-lang gnome libwebkitgtk2-lang gnome -libwnck-lang common +libwnck-lang gnome liferea-lang gnome lightsoff-lang gnome login-lang common @@ -237,7 +239,7 @@ nautilus-share-lang gnome-extras nemiver-lang gnome-extras net6-lang gnome-extras -notification-daemon-lang common +notification-daemon-lang gnome ntfs-config-lang gnome-extras obby-lang gnome-extras orca-lang gnome ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit logwatch for openSUSE:11.4
by root＠hilbert.suse.de 28 Feb '11

28 Feb '11

Hello community, here is the log from the commit of package logwatch for openSUSE:11.4 checked in at Mon Feb 28 16:17:49 CET 2011. -------- --- old-versions/11.4/all/logwatch/logwatch.changes 2011-02-25 12:51:22.000000000 +0100 +++ /mounts/work_src_done/11.4/logwatch/logwatch.changes 2011-02-27 22:40:36.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Feb 27 22:39:50 CET 2011 - jslaby(a)suse.de + +- Fix CVE-2011-1018 patch (missing parenthesis) + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ logwatch.spec ++++++ --- /var/tmp/diff_new_pack.tamIex/_old 2011-02-28 16:17:43.000000000 +0100 +++ /var/tmp/diff_new_pack.tamIex/_new 2011-02-28 16:17:43.000000000 +0100 @@ -27,7 +27,7 @@ Name: logwatch Summary: Analyzes and Reports on system logs Version: 7.3.6 -Release: 78.<RELEASE2> +Release: 78.<RELEASE3> License: MIT License (or similar) Group: System/Monitoring Url: http://www.logwatch.org ++++++ logwatch-CVE-2011-1018.patch ++++++ --- /var/tmp/diff_new_pack.tamIex/_old 2011-02-28 16:17:44.000000000 +0100 +++ /var/tmp/diff_new_pack.tamIex/_new 2011-02-28 16:17:44.000000000 +0100 @@ -31,7 +31,7 @@ or die "system $Config{'pathtobzcat'} failed: $?" - } elsif (-f "$Archive") { - my $arguments = "$Archive >> $DestFile"; -+ } elsif (-f "$Archive") && (-s "$Archive")) { ++ } elsif ((-f "$Archive") && (-s "$Archive")) { + my $arguments = "'${Archive}' >> $DestFile"; system("$Config{'pathtocat'} $arguments") == 0 or die "system $Config{'pathtocat'} failed: $?" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vboxgtk for openSUSE:11.4
by root＠hilbert.suse.de 28 Feb '11

28 Feb '11

Hello community, here is the log from the commit of package vboxgtk for openSUSE:11.4 checked in at Mon Feb 28 16:17:17 CET 2011. -------- --- old-versions/11.4/all/vboxgtk/vboxgtk.changes 2011-02-12 20:27:37.000000000 +0100 +++ /mounts/work_src_done/11.4/vboxgtk/vboxgtk.changes 2011-02-28 15:12:08.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Feb 28 11:10:18 UTC 2011 - mseben(a)gmail.com + +- Updated to svn sources (as of 28 february 2011): fix crash caused + by new virtualbox 4 api changes. +- Change python-virtualbox-ose Requires to python-virtualbox. +- Add virtualbox-gui Provides. + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- vboxgtk-0.5.2.tar.bz2 New: ---- vboxgtk-0.5.2.svn_28022011.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vboxgtk.spec ++++++ --- /var/tmp/diff_new_pack.fLfdFA/_old 2011-02-28 16:17:07.000000000 +0100 +++ /var/tmp/diff_new_pack.fLfdFA/_new 2011-02-28 16:17:07.000000000 +0100 @@ -18,8 +18,8 @@ Name: vboxgtk -Version: 0.5.2 -Release: 2 +Version: 0.5.2.svn_28022011 +Release: 1.<RELEASE2> License: GPLv3+ Summary: Simple GTK+ frontend for VirtualBox Url: http://vboxgtk.sourceforge.net/ @@ -29,7 +29,8 @@ BuildRequires: python-devel BuildRequires: update-desktop-files Requires: python-gtk -Requires: python-virtualbox-ose +Requires: python-virtualbox +Provides: virtualbox-gui Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -47,7 +48,7 @@ %build %{__python} setup.py build test ! -f data/vboxgtk.desktop -cp data/vboxgtk.desktop.in data/vboxgtk.desktop +%__cp data/vboxgtk.desktop.in data/vboxgtk.desktop %install %{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} @@ -76,7 +77,7 @@ %{_datadir}/applications/vboxgtk.desktop %{_datadir}/icons/hicolor/*/apps/vboxgtk.* %{_datadir}/vboxgtk/ -%{python_sitelib}/vboxgtk-%{version}-*.egg-info +%{python_sitelib}/vboxgtk-*.egg-info %{python_sitelib}/vboxgtk/ %files lang -f %{name}.lang ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit build-compare for openSUSE:11.4
by root＠hilbert.suse.de 28 Feb '11

28 Feb '11

Hello community, here is the log from the commit of package build-compare for openSUSE:11.4 checked in at Mon Feb 28 16:16:42 CET 2011. -------- --- old-versions/11.4/all/build-compare/build-compare.changes 2010-10-28 11:49:54.000000000 +0200 +++ /mounts/work_src_done/11.4/build-compare/build-compare.changes 2011-02-28 15:00:49.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Feb 28 14:00:35 UTC 2011 - aj(a)suse.de + +- Increase version. + +------------------------------------------------------------------- +Mon Feb 28 13:51:29 UTC 2011 - mls(a)suse.de + +- Check also the first part of the release to e.g. handle rebuild of complete + distribution (bnc#674991). + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build-compare.spec ++++++ --- /var/tmp/diff_new_pack.ceExIl/_old 2011-02-28 16:16:25.000000000 +0100 +++ /var/tmp/diff_new_pack.ceExIl/_new 2011-02-28 16:16:25.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package build-compare (Version 2009.10.14) +# spec file for package build-compare # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,8 +23,8 @@ Group: Development/Tools/Building AutoReqProv: on Summary: Build Result Compare Script -Version: 2009.10.14 -Release: 26 +Version: 2011.02.28 +Release: 1.<RELEASE2> Source1: COPYING Source2: same-build-result.sh Source3: rpm-check.sh ++++++ functions.sh ++++++ --- /var/tmp/diff_new_pack.ceExIl/_old 2011-02-28 16:16:25.000000000 +0100 +++ /var/tmp/diff_new_pack.ceExIl/_new 2011-02-28 16:16:25.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/bash # -# Copyright (c) 2009, 2010 SUSE Linux Product GmbH, Germany. +# Copyright (c) 2009, 2010, 2011 SUSE Linux Product GmbH, Germany. # Licensed under GPL v2, see COPYING file for details. # # Written by Michael Matz and Stephan Coolo @@ -89,6 +89,11 @@ release1=`$RPM --qf "%{RELEASE}" "$oldrpm"` release2=`$RPM --qf "%{RELEASE}" "$newrpm"` + # This might happen with a forced rebuild of factory + if [ "${release1%.*}" != "${release2%.*}" ] ; then + echo "release prefix mismatch" + return 1 + fi check_provides $oldrpm $release1 > $file1 check_provides $newrpm $release2 > $file2 ++++++ srpm-check.sh ++++++ --- /var/tmp/diff_new_pack.ceExIl/_old 2011-02-28 16:16:25.000000000 +0100 +++ /var/tmp/diff_new_pack.ceExIl/_new 2011-02-28 16:16:25.000000000 +0100 @@ -39,6 +39,7 @@ exit 0 ;; 1) + echo "RPM meta information is different" exit 1 ;; 2) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit release-notes-openSUSE for openSUSE:11.4
by root＠hilbert.suse.de 28 Feb '11

28 Feb '11

Hello community, here is the log from the commit of package release-notes-openSUSE for openSUSE:11.4 checked in at Mon Feb 28 16:15:58 CET 2011. -------- --- old-versions/11.4/all/release-notes-openSUSE/release-notes-openSUSE.changes 2011-02-24 15:31:05.000000000 +0100 +++ /mounts/work_src_done/11.4/release-notes-openSUSE/release-notes-openSUSE.changes 2011-02-28 13:34:10.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Feb 28 13:32:53 CET 2011 - ke(a)suse.de + +- 11.4.3: +* New entries: Graphics with KMS (using intellegacy) (bnc#673964); + Update Applets with Changed Behavior (bnc#673367). +* Improved entries: openSUSE Documentation (bnc#672889). +* Update translations > 50% (fi fr hu it ja km ko lt nb nl pl pt_BR + ru). + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- release-notes-opensuse-11.4.2.tar.bz2 New: ---- release-notes-opensuse-11.4.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ release-notes-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.vK8CYs/_old 2011-02-28 16:15:51.000000000 +0100 +++ /var/tmp/diff_new_pack.vK8CYs/_new 2011-02-28 16:15:51.000000000 +0100 @@ -25,7 +25,7 @@ Summary: Most Important Changes for This openSUSE Release BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 11.4.2 +Version: 11.4.3 Release: 1.<RELEASE2> Provides: release-notes = %{version} Source0: release-notes-opensuse-%{version}.tar.bz2 ++++++ release-notes-opensuse-11.4.2.tar.bz2 -> release-notes-opensuse-11.4.3.tar.bz2 ++++++ ++++ 6064 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit build for openSUSE:11.4
by root＠hilbert.suse.de 28 Feb '11

28 Feb '11

Hello community, here is the log from the commit of package build for openSUSE:11.4 checked in at Mon Feb 28 15:55:10 CET 2011. -------- --- old-versions/11.4/all/build/build.changes 2010-12-09 15:52:49.000000000 +0100 +++ /mounts/work_src_done/11.4/build/build.changes 2011-02-28 10:04:38.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Feb 28 09:02:32 UTC 2011 - adrian(a)suse.de + +- do not use current git branch for stable build package in distributions +- require bsdtar for vm builds to ensure a safe build + +------------------------------------------------------------------- +Wed Dec 15 14:05:09 CET 2010 - mls(a)suse.de + +- also use -o when using bsdtar --chroot + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- _service:recompress:tar_scm:build-2010.12.09.tar.gz _service:set_version:build.dsc _service:set_version:build.spec debian.tar.gz New: ---- build-2011.01.20.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.VPCHGz/_old 2011-02-28 15:54:39.000000000 +0100 +++ /var/tmp/diff_new_pack.VPCHGz/_new 2011-02-28 15:54:39.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package build (Version 2010.12.09) +# spec file for package build # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,8 +23,8 @@ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2010.12.09 -Release: 1 +Version: 2011.01.20 +Release: 1.<RELEASE2> #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ _service ++++++ --- /var/tmp/diff_new_pack.VPCHGz/_old 2011-02-28 15:54:39.000000000 +0100 +++ /var/tmp/diff_new_pack.VPCHGz/_new 2011-02-28 15:54:39.000000000 +0100 @@ -1,5 +1,12 @@ <services> - <service name="tar_scm"><param name="version">2010.12.09</param><param name="url">git://gitorious.org/opensuse/build.git</param><param name="scm">git</param></service> -<service name="recompress"><param name="compression">gz</param><param name="file">*.tar</param></service> -<service name="set_version"/> + <service name="tar_scm" mode="disabled"> + <param name="version">2011.01.20</param> + <param name="url">git://gitorious.org/opensuse/build.git</param> + <param name="scm">git</param> + </service> + <service name="recompress" mode="disabled"> + <param name="compression">gz</param> + <param name="file">*.tar</param> + </service> + <service name="set_version" mode="disabled"/> </services> ++++++ _service:recompress:tar_scm:build-2010.12.09.tar.gz -> build-2011.01.20.tar.gz ++++++ Files old/build-2010.12.09/.git/index and new/build-2011.01.20/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/.git/logs/HEAD new/build-2011.01.20/.git/logs/HEAD --- old/build-2010.12.09/.git/logs/HEAD 2010-12-09 15:53:03.000000000 +0100 +++ new/build-2011.01.20/.git/logs/HEAD 2011-02-28 10:02:24.000000000 +0100 @@ -1 +1 @@ -0000000000000000000000000000000000000000 1fee29b563a4c8039a0aa6aa98fb597643c33325 nobody <nobody(a)obs.service.13412> 1291906383 +0100 clone: from git://gitorious.org/opensuse/build.git +0000000000000000000000000000000000000000 677e5324797c0f1729ec6bb2f6106fc8854f1d9f Adrian Schröter <adrian(a)suse.de> 1298883744 +0100 clone: from git://gitorious.org/opensuse/build.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/.git/logs/refs/heads/master new/build-2011.01.20/.git/logs/refs/heads/master --- old/build-2010.12.09/.git/logs/refs/heads/master 2010-12-09 15:53:03.000000000 +0100 +++ new/build-2011.01.20/.git/logs/refs/heads/master 2011-02-28 10:02:24.000000000 +0100 @@ -1 +1 @@ -0000000000000000000000000000000000000000 1fee29b563a4c8039a0aa6aa98fb597643c33325 nobody <nobody(a)obs.service.13412> 1291906383 +0100 clone: from git://gitorious.org/opensuse/build.git +0000000000000000000000000000000000000000 677e5324797c0f1729ec6bb2f6106fc8854f1d9f Adrian Schröter <adrian(a)suse.de> 1298883744 +0100 clone: from git://gitorious.org/opensuse/build.git Files old/build-2010.12.09/.git/objects/pack/pack-8e930a325f3c5d978c8b560853ad2adc1671fd92.idx and new/build-2011.01.20/.git/objects/pack/pack-8e930a325f3c5d978c8b560853ad2adc1671fd92.idx differ Files old/build-2010.12.09/.git/objects/pack/pack-8e930a325f3c5d978c8b560853ad2adc1671fd92.pack and new/build-2011.01.20/.git/objects/pack/pack-8e930a325f3c5d978c8b560853ad2adc1671fd92.pack differ Files old/build-2010.12.09/.git/objects/pack/pack-db6ae10fad5e7bddbce4ddf6c5b9df8e002d7c39.idx and new/build-2011.01.20/.git/objects/pack/pack-db6ae10fad5e7bddbce4ddf6c5b9df8e002d7c39.idx differ Files old/build-2010.12.09/.git/objects/pack/pack-db6ae10fad5e7bddbce4ddf6c5b9df8e002d7c39.pack and new/build-2011.01.20/.git/objects/pack/pack-db6ae10fad5e7bddbce4ddf6c5b9df8e002d7c39.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/.git/packed-refs new/build-2011.01.20/.git/packed-refs --- old/build-2010.12.09/.git/packed-refs 2010-12-09 15:53:03.000000000 +0100 +++ new/build-2011.01.20/.git/packed-refs 2011-02-28 10:02:24.000000000 +0100 @@ -1,4 +1,4 @@ # pack-refs with: peeled 4e616df18f2805b6cdb4d674cf6e0cb27798a73a refs/tags/obs_2.0 4acd145bf4dbff921f1d16977d5a707e3234cead refs/remotes/origin/obs_2.0 -1fee29b563a4c8039a0aa6aa98fb597643c33325 refs/remotes/origin/master +677e5324797c0f1729ec6bb2f6106fc8854f1d9f refs/remotes/origin/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/.git/refs/heads/master new/build-2011.01.20/.git/refs/heads/master --- old/build-2010.12.09/.git/refs/heads/master 2010-12-09 15:53:03.000000000 +0100 +++ new/build-2011.01.20/.git/refs/heads/master 2011-02-28 10:02:24.000000000 +0100 @@ -1 +1 @@ -1fee29b563a4c8039a0aa6aa98fb597643c33325 +677e5324797c0f1729ec6bb2f6106fc8854f1d9f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/.git/shallow new/build-2011.01.20/.git/shallow --- old/build-2010.12.09/.git/shallow 1970-01-01 01:00:00.000000000 +0100 +++ new/build-2011.01.20/.git/shallow 2011-02-28 10:02:24.000000000 +0100 @@ -0,0 +1,3 @@ +23bfa1b1ab1db2f2b4f999a04ff2cdc7e9f29005 +59d713d8bd77fa846a540bdcc8b67a89b0de3263 +b8b49def2820e46a5f6c2724a1dbce1a83f0dcb5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/Build/Rpm.pm new/build-2011.01.20/Build/Rpm.pm --- old/build-2010.12.09/Build/Rpm.pm 2010-12-09 15:53:03.000000000 +0100 +++ new/build-2011.01.20/Build/Rpm.pm 2011-02-28 10:02:24.000000000 +0100 @@ -112,6 +112,15 @@ } } +# xspec may be passed as array ref to return the parsed spec files +# an entry in the returned array can be +# - a string: verbatim line from the original file +# - a two element array ref: +# - [0] original line +# - [1] undef: line unused due to %if +# - [1] scalar: line after macro expansion. Only set if it's a build deps +# line and build deps got modified or 'save_expanded' is set in +# config sub parse { my ($config, $specfile, $xspec) = @_; @@ -351,6 +360,10 @@ my $what = $1; my $deps = $2; $ifdeps = 1 if $hasif; + # XXX: weird syntax addition. can append arch or project to dependency + # BuildRequire: foo > 17 [i586,x86_64] + # BuildRequire: foo [home:bar] + # BuildRequire: foo [!home:bar] my @deps = $deps =~ /([^\s\[,]+)(\s+[<=>]+\s+[^\s\[,]+)?(\s+\[[^\]]+\])?[\s,]*/g; my $replace = 0; my @ndeps = (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/Build.pm new/build-2011.01.20/Build.pm --- old/build-2010.12.09/Build.pm 2010-12-09 15:53:03.000000000 +0100 +++ new/build-2011.01.20/Build.pm 2011-02-28 10:02:24.000000000 +0100 @@ -29,8 +29,8 @@ my $std_macros = q{ %define nil %define ix86 i386 i486 i586 i686 athlon -%define arm armv4l armv4b armv5l armv5b armv5el armv5eb armv5tel armv5teb armv6el armv6eb armv7el armv7eb -%define arml armv4l armv5l armv5tel armv5el armv6el armv7el +%define arm armv4l armv4b armv5l armv5b armv5el armv5eb armv5tel armv5teb armv6el armv6eb armv7el armv7eb armv7hl armv7nhl armv8el +%define arml armv4l armv5l armv5tel armv5el armv6el armv7el armv7hl armv7nhl armv8el %define armb armv4b armv5b armv5teb armv5eb armv6eb armv7eb %define sparc sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/Makefile new/build-2011.01.20/Makefile --- old/build-2010.12.09/Makefile 2010-12-09 15:53:03.000000000 +0100 +++ new/build-2011.01.20/Makefile 2011-02-28 10:02:24.000000000 +0100 @@ -36,7 +36,6 @@ extractbuild \ getbinaryid \ killchroot \ - xen.conf \ getmacros \ getoptflags \ getchangetarget \ @@ -45,6 +44,8 @@ initscript_qemu_vm \ substitutedeps \ debtransform \ + debtransformbz2 \ + debtransformzip \ mkbaselibs \ mkdrpms \ createrepomddeps \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/build new/build-2011.01.20/build --- old/build-2010.12.09/build 2010-12-09 15:53:03.000000000 +0100 +++ new/build-2011.01.20/build 2011-02-28 10:02:24.000000000 +0100 @@ -22,15 +22,15 @@ # defaults for vm_img_mkfs vm_img_mkfs_ext4='mkfs.ext4 -m 0 -q -F' -vm_img_tunefs_ext4='tune2fs -c 0 -o journal_data_writeback' +vm_img_tunefs_ext4='tune2fs -c 0 -O ^has_journal' vm_img_mkfs_ext3='mkfs.ext3 -m 0 -q -F' vm_img_tunefs_ext3='tune2fs -c 0 -o journal_data_writeback' vm_img_mkfs_ext2='mkfs.ext2 -m 0 -q -F' vm_img_tunefs_ext2='tune2fs -c 0' vm_img_mkfs_reiserfs='mkreiserfs -q -f' -qemu_kernel=/boot/vmlinuz -qemu_initrd=/boot/initrd +vm_kernel=/boot/vmlinuz +vm_initrd=/boot/initrd qemu_bin=/usr/bin/qemu uml_kernel=/boot/vmlinux-um uml_initrd=/boot/initrd-um @@ -85,15 +85,13 @@ SIGNDUMMY= # list of archs which need emulator initialization -: ${EMULATOR_ARCHS:="armv4l armv5el armv6el armv7el armv8el mips mipsel mips64 mips64el ppc ppc64 sh4"} +: ${EMULATOR_ARCHS:="armv4l armv5el armv6el armv7el armv7hl armv8el mips mipsel mips64 mips64el ppc ppc64 sh4"} export EMULATOR_ARCHS # list of devices registered by binfmt handlers in /proc/sys/fs/binfmt_misc : ${EMULATOR_DEVS:="arm mips mipsel mips64 mips64el ppc sh4 sparc"} export EMULATOR_DEVS -: ${CACHE_DIR:=/var/cache/build} - # This is for insserv export YAST_IS_RUNNING=instsys @@ -267,6 +265,7 @@ cleanup_and_exit () { trap EXIT test -z "$1" && set 0 + rm -f $BUILD_ROOT/exit if test -n "$RUNNING_IN_VM" ; then chown $browner $BUILD_ROOT cd / @@ -334,7 +333,7 @@ { if [ "$ccache" = 1 ]; then if mkdir -p $BUILD_ROOT/var/lib/build/ccache/bin; then - for i in gcc g++ cc c++; do + for i in $(ls $BUILD_ROOT/usr/bin | grep -E '^(cc|gcc|[cg][+][+])([-]?[234][.]?[0-9])*$'); do # ln -sf /usr/bin/ccache $BUILD_ROOT/var/lib/build/ccache/bin/$i rm -f $BUILD_ROOT/var/lib/build/ccache/bin/$i test -e $BUILD_ROOT/usr/bin/$i || continue @@ -500,6 +499,7 @@ local i=0 local d local dest + [ -z "$RUNNING_IN_VM" ] || return 0 if [ -z "$old_packages" ]; then rm -rf "$BUILD_ROOT"/.build.oldpackages* return 0 @@ -1002,6 +1002,7 @@ XENID="${VM_IMAGE%/root}" XENID="${XENID%/tmpfs}" XENID="${XENID##*/}" + XENID="${XENID#root_}" if xm list "build:$XENID" >/dev/null 2>&1 ; then if ! xm destroy "build:$XENID" ; then echo "could not kill xen build $XENID" @@ -1020,14 +1021,29 @@ cleanup_and_exit 0 fi +if [ "$VM_TYPE" = 'xen' -a -z "$RUNNING_IN_VM" ]; then + # XXX: merge with kvm path? + if [ -n "$VM_KERNEL" ]; then + vm_kernel="$VM_KERNEL" + elif [ -e "/boot/vmlinuz-xen" ]; then + vm_kernel="/boot/vmlinuz-xen" + fi + if [ -n "$VM_INITRD" ]; then + vm_initrd="$VM_INITRD" + elif [ -e "/boot/initrd-xen" ]; then + vm_initrd="/boot/initrd-xen" + fi +fi + if [ "$VM_TYPE" = 'kvm' -a -z "$RUNNING_IN_VM" ]; then if [ ! -r /dev/kvm -o ! -x "$qemu_bin"-kvm ]; then echo "host doesn't support kvm" + echo "either the kvm kernel-module is not loaded or kvm is not installed or hardware virtualization is deactivated in the BIOS." cleanup_and_exit 3 fi qemu_bin="$kvm_bin" if [ -n "$VM_KERNEL" ]; then - qemu_kernel="$VM_KERNEL" + vm_kernel="$VM_KERNEL" fi # check if a SUSE system with virtio initrd is running @@ -1043,37 +1059,37 @@ fi if [ -n "$VM_INITRD" ]; then - qemu_initrd="$VM_INITRD" + vm_initrd="$VM_INITRD" kvm_virtio=1 - elif [ -e "${qemu_initrd}-build" ]; then - qemu_initrd="${qemu_initrd}-build" + elif [ -e "${vm_initrd}-build" ]; then + vm_initrd="${vm_initrd}-build" kvm_virtio=1 else - if [ -L "$qemu_initrd" ]; then - qemu_initrd=`readlink -f "$qemu_initrd"` || cleanup_and_exit 3 + if [ -L "$vm_initrd" ]; then + vm_initrd=`readlink -f "$vm_initrd"` || cleanup_and_exit 3 fi - qemu_initrd_virtio="${qemu_initrd}-virtio" + vm_initrd_virtio="${vm_initrd}-virtio" - if [ ! -e ${qemu_initrd_virtio} -o $qemu_kernel -nt ${qemu_initrd_virtio} ]; then + if [ ! -e ${vm_initrd_virtio} -o $vm_kernel -nt ${vm_initrd_virtio} ]; then mkinitrd_virtio_cmd=(env rootfstype="$VMDISK_FILESYSTEM" \ mkinitrd -d /dev/null \ -m "binfmt_misc virtio_pci virtio_blk" \ - -k $qemu_kernel \ - -i ${qemu_initrd_virtio}) + -k $vm_kernel \ + -i ${vm_initrd_virtio}) if [ ! -w /root -o -n "$RPMLIST" ]; then echo "No initrd that provides virtio support found. virtio accelleration disabled." echo "Run the following command as root to enable virtio:" shellquote "${mkinitrd_virtio_cmd[@]}" echo elif /sbin/modinfo virtio_pci >/dev/null 2>&1; then - echo "creating $qemu_initrd_virtio" + echo "creating $vm_initrd_virtio" "${mkinitrd_virtio_cmd[@]}" || cleanup_and_exit 1 kvm_virtio=1 - qemu_initrd="${qemu_initrd_virtio}" + vm_initrd="${vm_initrd_virtio}" fi else kvm_virtio=1 - qemu_initrd="${qemu_initrd_virtio}" + vm_initrd="${vm_initrd_virtio}" fi fi @@ -1142,21 +1158,22 @@ XENID="${VM_IMAGE%/root}" XENID="${XENID%/tmpfs}" XENID="${XENID##*/}" + XENID="${XENID#root_}" xm destroy "build:$XENID" >/dev/null 2>&1 fi if test ! -e "$VM_IMAGE"; then echo "Creating $VM_IMAGE (${VMDISK_ROOTSIZE}M)" mkdir -p "${VM_IMAGE%/*}" - dd if=/dev/zero of="$VM_IMAGE" bs=1 count=1 seek=$(( ${VMDISK_ROOTSIZE} * 1024 * 1024 - 1 )) || cleanup_and_exit 3 + dd if=/dev/zero of="$VM_IMAGE" bs=1M count=0 seek="$VMDISK_ROOTSIZE" || cleanup_and_exit 3 if test -z "$CLEAN_BUILD" ; then vm_img_mkfs "$VMDISK_FILESYSTEM" "$VM_IMAGE" || cleanup_and_exit 3 fi fi - if test ! -e "$VM_SWAP"; then + if test -n "$VM_SWAP" -a ! -e "$VM_SWAP"; then # setup VM_SWAP echo "Creating $VM_SWAP (${VMDISK_SWAPSIZE}M)" mkdir -p "${VM_SWAP%/*}" - dd if=/dev/zero of="$VM_SWAP" bs=1 count=1 seek=$(( ${VMDISK_SWAPSIZE} * 1024 * 1024 - 1 )) || cleanup_and_exit 3 + dd if=/dev/zero of="$VM_SWAP" bs=1M count=0 seek="$VMDISK_SWAPSIZE" || cleanup_and_exit 3 fi if test ! -e "$VM_IMAGE" ; then echo "you need to create $VM_IMAGE first" @@ -1424,6 +1441,7 @@ XENID="${VM_IMAGE%/root}" XENID="${XENID%/tmpfs}" XENID="${XENID##*/}" + XENID="${XENID#root_}" echo "booting XEN kernel ..." if xm list "build:$XENID" >/dev/null 2>&1 ; then @@ -1431,11 +1449,22 @@ echo "Please report to your server admin, there might be multiple services running for same domain" cleanup_and_exit 3 fi - set -- xm create -c $BUILD_DIR/xen.conf name="build:$XENID" ${MEMSIZE:+memory=$MEMSIZE} $XMROOT $XMSWAP extra="quiet init="$vm_init_script" elevator=noop panic=1 console=ttyS0" + XEN_CONF_FILE=`mktemp build.xen.conf` || cleanup_and_exit 3 + echo "kernel = \"$vm_kernel\"" > $XEN_CONF_FILE + echo "ramdisk = \"$vm_initrd\"" >> $XEN_CONF_FILE + echo "memory = ${MEMSIZE:-64}" >> $XEN_CONF_FILE + echo "vcpus = $BUILD_JOBS" >> $XEN_CONF_FILE + echo "root = \"/dev/hda1 ro\"" >> $XEN_CONF_FILE + echo "extra = \"init=/bin/bash console=ttyS0 panic=1 udev_timeout=360\"" >> $XEN_CONF_FILE + echo "on_poweroff = 'destroy'" >> $XEN_CONF_FILE + echo "on_reboot = 'destroy'" >> $XEN_CONF_FILE + echo "on_crash = 'destroy'" >> $XEN_CONF_FILE + set -- xm create -c $XEN_CONF_FILE name="build:$XENID" $XMROOT $XMSWAP extra="quiet init="$vm_init_script" elevator=noop panic=1 console=ttyS0" if test "$PERSONALITY" != 0 ; then # have to switch back to PER_LINUX to make xm work set -- linux64 "$@" fi + rm "$XEN_CONF_FILE" echo "$@" "$@" || cleanup_and_exit 3 elif [ "$VM_TYPE" = 'uml' ]; then @@ -1463,8 +1492,8 @@ fi set -- $qemu_bin -no-reboot -nographic -net none \ - -kernel $qemu_kernel \ - -initrd $qemu_initrd \ + -kernel $vm_kernel \ + -initrd $vm_initrd \ -append "root=$qemu_rootdev panic=1 quiet no-kvmclock rw elevator=noop console=ttyS0 init=$vm_init_script" \ ${MEMSIZE:+-m $MEMSIZE} \ "${qemu_args[@]}" @@ -1898,7 +1927,10 @@ # Checks to see if a build script should be used # this allows the build environment to be manipulated # and alternate build commands can be used - DSC_BUILD_CMD="dpkg-buildpackage -us -uc -rfakeroot-tcp" + if [ -n "$BUILD_JOBS" ]; then + DSC_BUILD_JOBS="-j$BUILD_JOBS" + fi + DSC_BUILD_CMD="dpkg-buildpackage -us -uc -rfakeroot-tcp $DSC_BUILD_JOBS" if test -e $BUILD_ROOT/$TOPDIR/SOURCES/build.script ; then echo "Sourcing build.script to build - it should normally run 'dpkg-buildpackage -us -uc -rfakeroot-tcp'" DSC_BUILD_CMD="source $TOPDIR/SOURCES/build.script" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/build_kiwi.sh new/build-2011.01.20/build_kiwi.sh --- old/build-2010.12.09/build_kiwi.sh 2010-12-09 15:53:03.000000000 +0100 +++ new/build-2011.01.20/build_kiwi.sh 2011-02-28 10:02:24.000000000 +0100 @@ -21,8 +21,12 @@ repo="$TOPDIR/SOURCES/repos/${rc%/*}/${rc##*/}/" fi if test "$imagetype" != product ; then - echo "creating repodata for $repo" - chroot $BUILD_ROOT createrepo "$repo" + echo "creating repodata for $repo" + if chroot $BUILD_ROOT createrepo --simple-md-filenames --help >/dev/null 2>&1 ; then + chroot $BUILD_ROOT createrepo --simple-md-filenames "$repo" + else + chroot $BUILD_ROOT createrepo "$repo" + fi fi done # unpack root tar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/common_functions new/build-2011.01.20/common_functions --- old/build-2010.12.09/common_functions 2010-12-09 15:53:03.000000000 +0100 +++ new/build-2011.01.20/common_functions 2011-02-28 10:02:24.000000000 +0100 @@ -1,5 +1,7 @@ #!/bin/bash +: ${CACHE_DIR:=/var/cache/build} + set_build_arch() { : ${BUILD_HOST_ARCH:=`uname -m`} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/debtransform new/build-2011.01.20/debtransform --- old/build-2010.12.09/debtransform 2010-12-09 15:53:03.000000000 +0100 +++ new/build-2011.01.20/debtransform 2011-02-28 10:02:24.000000000 +0100 @@ -214,6 +214,23 @@ die("dsc file contains no version\n") unless defined($version); $version =~ s/^\d+://; # no epoch in version, please +# transform +my $tmptar; +if ($tarfile =~ /\.tar\.bz2/) { + my $old = $tarfile; + $tarfile =~ s/\.tar\.bz2/\.tar\.gz/; + $tmptar = "$out/$tarfile"; + print "converting $old to $tarfile\n"; + system( ( "debtransformbz2", "$old", "$tmptar" )) == 0 || die("cannot transform .tar.bz2 to .tar.gz"); +} +if ($tarfile =~ /\.zip/) { + my $old = $tarfile; + $tarfile =~ s/\.zip/\.tar\.gz/; + $tmptar = "$out/$tarfile"; + print "converting $old to $tarfile\n"; + system( ( "debtransformzip", "$old", "$tmptar" )) == 0 || die("cannot transform .zip to .tar.gz"); +} + my $tardir = $tarfile; $tardir =~ s/\.orig\.tar/\.tar/; $tardir =~ s/\.tar.*?$//; @@ -223,7 +240,12 @@ $v =~ s/-[^-]*$//; $tarfile =~ /.*(\.tar.*?)$/; my $ntarfile = "${name}_$v.orig$1"; -link("$dir/$tarfile", "$out/$ntarfile") || die("link $dir/$tarfile $out/$ntarfile: $!\n"); +if( $tmptar ) { + link("$tmptar", "$out/$ntarfile") || die("link $dir/$tarfile $out/$ntarfile: $!\n"); + unlink("$tmptar"); +} else { + link("$dir/$tarfile", "$out/$ntarfile") || die("link $dir/$tarfile $out/$ntarfile: $!\n"); +} push @files, addfile("$out/$ntarfile"); open(DIFF, '>', "$out/${name}_$version.diff") || die("$out/${name}_$version.diff: $!\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/debtransformbz2 new/build-2011.01.20/debtransformbz2 --- old/build-2010.12.09/debtransformbz2 1970-01-01 01:00:00.000000000 +0100 +++ new/build-2011.01.20/debtransformbz2 2011-02-28 10:02:24.000000000 +0100 @@ -0,0 +1,11 @@ +#! /bin/bash + +if test $# -ne 2; then + exit 1 +fi + +bz="$1" +tar="$2" + +bzcat "$bz" | gzip -f - >"$tar" || exit 1 +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/debtransformzip new/build-2011.01.20/debtransformzip --- old/build-2010.12.09/debtransformzip 1970-01-01 01:00:00.000000000 +0100 +++ new/build-2011.01.20/debtransformzip 2011-02-28 10:02:24.000000000 +0100 @@ -0,0 +1,14 @@ +#! /bin/bash + +if test $# -ne 2; then + exit 1 +fi + +zip="$1" +tar="$2" + +tmp=$(mktemp -d) +unzip -q -d "$tmp" -- "$zip" || exit 1 +( cd "$tmp" && tar czO * ) >"$tar" || exit 1 +rm -r "$tmp" +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/init_buildsystem new/build-2011.01.20/init_buildsystem --- old/build-2010.12.09/init_buildsystem 2010-12-09 15:53:03.000000000 +0100 +++ new/build-2011.01.20/init_buildsystem 2011-02-28 10:02:24.000000000 +0100 @@ -130,9 +130,16 @@ echo "preinstalling $1..." cd $BUILD_ROOT || cleanup_and_exit 1 if test -x /usr/bin/bsdtar ; then - CPIO="/usr/bin/bsdtar --chroot -x -f-" - TAR="/usr/bin/bsdtar --chroot -x" + CPIO="/usr/bin/bsdtar --chroot -o --numeric-owner -x -f-" + TAR="/usr/bin/bsdtar --chroot -o --numeric-owner -x" else + # cpio isn't safe so we require bsdtar for VMs. chroot is + # unsafe anyways so it's ok for that. + if [ -n "$PREPARE_VM" ]; then + echo "Error: setting up a VM requires bsdtar for security reasons." + echo "Please install bsdtar" + cleanup_and_exit 1 + fi CPIO="cpio --extract --unconditional --preserve-modification-time --make-directories --no-absolute-filenames --quiet" TAR="tar -x" fi @@ -363,7 +370,7 @@ check_binfmt_registered() { local arch - for arch in arm $EMULATOR_ARCHS; do + for arch in $EMULATOR_DEVS; do if test -e /proc/sys/fs/binfmt_misc/$arch; then return 0 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/spec_add_patch new/build-2011.01.20/spec_add_patch --- old/build-2010.12.09/spec_add_patch 2010-12-09 15:53:03.000000000 +0100 +++ new/build-2011.01.20/spec_add_patch 2011-02-28 10:02:24.000000000 +0100 @@ -4,13 +4,21 @@ use strict; -my $diffname = $ARGV[0]; -my $specname = $ARGV[1]; +sub helpexit { + print "$0: <patches...> [file.spec]\n"; + exit 1; +} -if (!defined($diffname) || ! -f $diffname) { +my $specname; +my %diffs; - print "$0: <diffname>\n"; - exit 1; +for my $arg (@ARGV) { + if ($arg =~ /\.spec$/) { + helpexit() if $specname; + $specname = $arg; + next; + } + $diffs{$arg} = 1; } sub find_specfile() @@ -36,7 +44,6 @@ my $in_global = 1; my $last_patch_in_prep_index = 0; my $last_patch_in_global_index = 0; -my $already_found_patch = 0; my @c = (); my $index = 0; @@ -73,18 +80,18 @@ die if (($in_prep + $in_global) > 1); - if ($in_global && /^Patch(?:\d+)?:/) { + if ($in_global && /^Patch(?:\d+)?:\s+(.+)/) { $last_patch_in_global_index = $index; + if ($diffs{$1}) { + print "$1 already in, skipped."; + delete $diffs{$1}; + } } if ($in_global && $ifdef_level == 0 && /^Source(?:\d+)?:/) { $last_patch_in_global_index = $index; } - if ($in_global && /^Patch.*?:\s+$diffname/) { - $already_found_patch = 1; - } - if ($in_prep && $ifdef_level == 0 && /^\%patch/) { $last_patch_in_prep_index = $index; } @@ -93,10 +100,6 @@ } close(S); -exit 0 if ($already_found_patch); - -print "Adding patch $diffname to $specname\n"; - die if ($ifdef_level > 0); die if ($in_global || $in_prep); die if ($last_patch_in_prep_index == 0); @@ -110,20 +113,27 @@ $patchnum = $1+1 if ($c[$last_patch_in_global_index] =~ /Patch(\d+):/); $patchnum = 1 if ($c[$last_patch_in_global_index] =~ /Patch:/); -# determine strip level -my $striplevel = ""; -open(P, '<', $diffname) or die; -while(<P>) { - $striplevel = " -p1" if (m/^--- a/ or m/^--- [^\/]+-\d+\./); - last if (/^--- /); +for my $diffname (keys %diffs) { + # determine strip level + my $striplevel = ""; + open(P, '<', $diffname) or die "$diffname: $!\n"; + while(<P>) { + $striplevel = " -p1" if (m/^--- a/ or m/^--- [^\/]+-\d+\./); + last if (/^--- /); -} -close(P); + } + close(P); + print "Adding patch$striplevel $diffname to $specname\n"; -splice @c, $last_patch_in_prep_index+1, 0, ("\%patch$patchnum$striplevel\n"); -splice @c, $last_patch_in_global_index+1, 0, + + splice @c, $last_patch_in_prep_index+1, 0, ("\%patch$patchnum$striplevel\n"); + splice @c, $last_patch_in_global_index+1, 0, (sprintf "Patch%s:%s%s\n", $patchnum, ' ' x (10-length($patchnum)), $diffname); + ++$last_patch_in_global_index; + $last_patch_in_prep_index+=2; # actually line number + ++$patchnum; +} open(O, '>', "$specname.new") or die; print O @c; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/spectool new/build-2011.01.20/spectool --- old/build-2010.12.09/spectool 2010-12-09 15:53:03.000000000 +0100 +++ new/build-2011.01.20/spectool 2011-02-28 10:02:24.000000000 +0100 @@ -171,8 +171,9 @@ push @archs, 'noarch' unless grep {$_ eq 'noarch'} @archs; unless ($dist) { - $dist = `rpm -q --qf '%{DISTRIBUTION}' rpm 2>/dev/null`; - $dist = Build::dist_canon($dist||'', $archs[0]); + $dist = 'spectool'; +# $dist = `rpm -q --qf '%{DISTRIBUTION}' rpm 2>/dev/null`; +# $dist = Build::dist_canon($dist||'', $archs[0]); } if($dist !~ /\// && !defined $configdir) { @@ -242,6 +243,7 @@ ####################################################################### +my $ret = 0; for my $spec (@specs) { my $cf = Build::read_config_dist($dist, $archs[0], $configdir); my $parsed = Build::parse($cf, $spec); @@ -340,6 +342,7 @@ my $sum = check_sum($file, $files->{$file}); if($sum) { print '! '; + $ret = 1; } else { print '. '; } @@ -353,3 +356,5 @@ } } } + +exit $ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/substitutedeps new/build-2011.01.20/substitutedeps --- old/build-2010.12.09/substitutedeps 2010-12-09 15:53:03.000000000 +0100 +++ new/build-2011.01.20/substitutedeps 2011-02-28 10:02:24.000000000 +0100 @@ -82,30 +82,30 @@ my $mainpkg = ''; my $pkg; -for my $l (@$xspec) { +for my $line (@$xspec) { $used = 1; - if (ref($l)) { - if (!defined($l->[1])) { + if (ref($line)) { + if (!defined($line->[1])) { $used = 0; - $l = $l->[0]; + $line = $line->[0]; } else { - $l = $l->[1]; + $line = $line->[1]; } } if ($inchangelog) { - $inchangelog = 0 if $l =~ /^\s*%[^%]/; + $inchangelog = 0 if $line =~ /^\s*%[^%]/; next if $inchangelog; } - if ($changelog && ($l =~ /\s*\%changelog\b/)) { + if ($changelog && ($line =~ /\s*\%changelog\b/)) { $inchangelog = 1; next; } - if ($l =~ /^Name\s*:\s*(\S+)/i) { + if ($line =~ /^Name\s*:\s*(\S+)/i) { $pkg = $mainpkg = $1 unless $mainpkg; } - if ($l =~ /^\s*%package\s+(-n\s+)?(\S+)/) { + if ($line =~ /^\s*%package\s+(-n\s+)?(\S+)/) { if ($1) { $pkg = $2; } else { @@ -113,30 +113,33 @@ } } - if ($l =~ /^Release:/i) { - my $oldl = $l; + if ($line =~ /^Release:(.*)\s*$/i) { + my $spec_rel = $1; # User-provided value + my $oldl = $line; if (defined $release) { - if (!($l =~ s/<RELEASE\d*>/$release/g)) { - if ($l =~ /<(?:CI_CNT|B_CNT)>/) { + if (!($line =~ s/<RELEASE\d*>/$release/g)) { + if ($line =~ /<(?:CI_CNT|B_CNT)>/) { # XXX: should pass ci_cnt/b_cnt instead if ($release =~ /(\d+)\.(\d+)$/) { my ($ci, $b) = ($1, $2); - $l =~ s/<CI_CNT>/$ci/; - $l =~ s/<B_CNT>/$b/; + $line =~ s/<CI_CNT>/$ci/; + $line =~ s/<B_CNT>/$b/; } elsif ($release =~ /(\d+)$/) { my $b = $1; - $b = '0' if $l =~ s/<CI_CNT>/$b/; - $l =~ s/<B_CNT>/$b/; + $b = '0' if $line =~ s/<CI_CNT>/$b/; + $line =~ s/<B_CNT>/$b/; } } else { - $l =~ s/^(Release:\s*).*/$1$release/i; + $line =~ s/^(Release:\s*).*/$1$release/i; } } + $line =~ s/<SPEC_REL>/$spec_rel/; } else { # remove macros, as rpm doesn't like them - $l =~ s/<RELEASE\d*>/0/; - $l =~ s/<CI_CNT>/0/; - $l =~ s/<B_CNT>/0/; + $line =~ s/<RELEASE\d*>/0/; + $line =~ s/<CI_CNT>/0/; + $line =~ s/<B_CNT>/0/; + $line =~ s/<SPEC_REL>/0/; } # this is to be compatible to legacy autobuild. # you can specify a releaseprg in the project configuration, @@ -144,7 +147,7 @@ # output is used as a release. # use only if you really must. if ($cf->{'releaseprg'} && -f "$specdir$cf->{'releaseprg'}") { - my $newl = $l; + my $newl = $line; $newl =~ s/^Release:\s*//; $oldl =~ s/^Release:\s*//; my $project = expand($cf, "%?_project") || 'BUILD_BASENAME'; @@ -187,18 +190,18 @@ } if ($nl[0]) { chomp $nl[0]; - $l =~ s/^(Release:\s*).*/$1$nl[0]/i; + $line =~ s/^(Release:\s*).*/$1$nl[0]/i; if (defined $release) { - if (!($l =~ s/<RELEASE\d*>/$release/g)) { - if ($l =~ /<(?:CI_CNT|B_CNT)>/) { + if (!($line =~ s/<RELEASE\d*>/$release/g)) { + if ($line =~ /<(?:CI_CNT|B_CNT)>/) { # XXX: should pass ci_cnt/b_cnt instead if ($release =~ /(\d+)\.(\d+)$/) { my ($ci, $b) = ($1, $2); - $l =~ s/<CI_CNT>/$ci/; - $l =~ s/<B_CNT>/$b/; + $line =~ s/<CI_CNT>/$ci/; + $line =~ s/<B_CNT>/$b/; } elsif ($release =~ /(\d+)$/) { my $b = $1; - $l =~ s/<B_CNT>/$b/ unless $l =~ s/<CI_CNT>/$b/; + $line =~ s/<B_CNT>/$b/ unless $line =~ s/<CI_CNT>/$b/; } } } @@ -208,19 +211,19 @@ # all compat stuff done. we return to your scheduled program } - if (!$used || ($l !~ /^(?:Build)?Requires:/i)) { - print F "$l\n"; + if (!$used || ($line !~ /^(?:Build)?Requires:/i)) { + print F "$line\n"; next; } - if ($l =~ /%\(/) { + if ($line =~ /%\(/) { # too hard for us - print F "$l\n"; + print F "$line\n"; next; } my $isbuildrequires = 0; - $isbuildrequires = 1 if $l =~ /^BuildRequires:/i; - my $r = $l; + $isbuildrequires = 1 if $line =~ /^BuildRequires:/i; + my $r = $line; $r =~ s/^[^:]*:\s*//; my @deps = $r =~ /([^\s\[,]+)(\s+[<=>]+\s+[^\s\[,]+)?[\s,]*/g; my @ndeps = (); @@ -251,10 +254,10 @@ $replace = 1 } if ($replace) { - $l =~ /^(.*?:\s*)/; + $line =~ /^(.*?:\s*)/; print F $1.join(' ', @ndeps)."\n" if @ndeps; } else { - print F "$l\n"; + print F "$line\n"; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.12.09/xen.conf new/build-2011.01.20/xen.conf --- old/build-2010.12.09/xen.conf 2010-12-09 15:53:03.000000000 +0100 +++ new/build-2011.01.20/xen.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -# -*- mode: python; -*- -#============================================================================ -# Python configuration setup for 'xm create'. -# This script sets the parameters used when a domain is created using 'xm create'. -# You use a separate script for each domain you want to create, or -# you can set the parameters for the domain on the xm command line. -#============================================================================ - -kernel = "/boot/vmlinuz-xen" -ramdisk = "/boot/initrd-xen" -memory = 64 -# name = "bsbuild01" -# List of which CPUS this domain is allowed to use, default Xen picks -#cpus = "" # leave to Xen to pick -#cpus = "0" # all vcpus run on CPU0 -#cpus = "0-3,5,^1" # run on cpus 0,2,3,5 -#---------------------------------------------------------------------------- -# Define the disk devices you want the domain to have access to, and -# what you want them accessible as. -# Each disk entry is of the form phy:UNAME,DEV,MODE -# where UNAME is the device, DEV is the device name the domain will see, -# and MODE is r for read-only, w for read-write. - -# disk = [ 'file:/tmp/xentest.img,hda1,w' ] - -# Set root device. -root = "/dev/hda1 ro" - -# Sets init=build, reboot on panic -extra = "init=/bin/bash console=ttyS0 panic=1 udev_timeout=360" - -on_poweroff = 'destroy' -on_reboot = 'destroy' -on_crash = 'destroy' ++++++ build.dsc ++++++ --- /var/tmp/diff_new_pack.VPCHGz/_old 2011-02-28 15:54:39.000000000 +0100 +++ /var/tmp/diff_new_pack.VPCHGz/_new 2011-02-28 15:54:39.000000000 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.10.12 +Version: 2011.01.20 Binary: build Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: all ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.VPCHGz/_old 2011-02-28 15:54:39.000000000 +0100 +++ /var/tmp/diff_new_pack.VPCHGz/_new 2011-02-28 15:54:39.000000000 +0100 @@ -1,3 +1,12 @@ +build (2010.12.15-1) unstable; urgency=low + + * Update to current git trunk + - support bsdtar for setting up build enviroment + - make expanddeps use the highest version of a package if multiple + versions aver available in a repository [bnc#656599] + + -- Michael Schroeder <mls(a)suse.de> Wed, 15 Dec 2010 14:08:29 +0200 + build (2010.07.28-1) unstable; urgency=low * Update to current git trunk ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation for openSUSE:Factory
by root＠hilbert.suse.de 28 Feb '11

28 Feb '11

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at Mon Feb 28 15:50:58 CET 2011. -------- --- yast2-installation/yast2-installation.changes 2011-02-17 13:55:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2011-02-28 15:10:14.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 28 14:52:26 CET 2011 - locilka(a)suse.cz + +- Handling disabled installation steps also in Live Installation + mode (BNC #675516) +- 2.20.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-installation-2.20.5.tar.bz2 New: ---- yast2-installation-2.20.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.UyGeQv/_old 2011-02-28 15:49:40.000000000 +0100 +++ /var/tmp/diff_new_pack.UyGeQv/_new 2011-02-28 15:49:40.000000000 +0100 @@ -19,11 +19,11 @@ Name: yast2-installation -Version: 2.20.5 +Version: 2.20.6 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.20.5.tar.bz2 +Source0: yast2-installation-2.20.6.tar.bz2 Prefix: /usr @@ -136,7 +136,7 @@ System installation code as present on installation media. %prep -%setup -n yast2-installation-2.20.5 +%setup -n yast2-installation-2.20.6 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-installation-2.20.5.tar.bz2 -> yast2-installation-2.20.6.tar.bz2 ++++++ ++++ 3726 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.20.5/VERSION new/yast2-installation-2.20.6/VERSION --- old/yast2-installation-2.20.5/VERSION 2011-02-17 13:49:09.000000000 +0100 +++ new/yast2-installation-2.20.6/VERSION 2011-02-28 14:56:56.000000000 +0100 @@ -1 +1 @@ -2.20.5 +2.20.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.20.5/configure.in new/yast2-installation-2.20.6/configure.in --- old/yast2-installation-2.20.5/configure.in 2011-02-17 13:53:48.000000000 +0100 +++ new/yast2-installation-2.20.6/configure.in 2011-02-28 15:02:09.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.20.5, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.20.6, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.20.5" +VERSION="2.20.6" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.20.5/src/inst_finish/installation_settings_finish.ycp new/yast2-installation-2.20.6/src/inst_finish/installation_settings_finish.ycp --- old/yast2-installation-2.20.5/src/inst_finish/installation_settings_finish.ycp 2009-09-16 11:48:25.000000000 +0200 +++ new/yast2-installation-2.20.6/src/inst_finish/installation_settings_finish.ycp 2011-02-28 14:57:07.000000000 +0100 @@ -5,7 +5,7 @@ * See bnc #364066, #390930. * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: installation_settings_finish.ycp 58537 2009-09-04 16:28:41Z kmachalkova $ + * $Id: installation_settings_finish.ycp 63492 2011-02-28 13:57:05Z locilka $ * */ @@ -100,7 +100,8 @@ "steps" : 1, // progress step title "title" : _("Writing automatic configuration..."), - "when" : [ `installation, `update, `autoinst ], + // Live Installation has a second stage workflow now (BNC #675516) + "when" : [ `installation, `live_installation, `update, `autoinst ], ]; } else if (func == "Write") { Write(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0