Hello community,

here is the log from the commit of package 
kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:Factory checked in at 
2012-03-11 20:04:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1 (Old)
 and      /work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new 
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kiwi-instsource-plugins-openSUSE-12-1", Maintainer is ""

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/kiwi-instsource-plugins-openSUSE-12-1/kiwi-instsource-plugins-openSUSE-12-1.changes
      2011-10-28 19:55:29.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.kiwi-instsource-plugins-openSUSE-12-1.new/kiwi-instsource-plugins-openSUSE-12-1.changes
 2012-03-11 20:04:33.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Mar 11 18:07:30 UTC 2012 - co...@suse.com
+
+- require and call extract-appdata-icons (only useful in 12.2)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kiwi-instsource-plugins-openSUSE-12-1.spec ++++++
--- /var/tmp/diff_new_pack.ecxeue/_old  2012-03-11 20:04:34.000000000 +0100
+++ /var/tmp/diff_new_pack.ecxeue/_new  2012-03-11 20:04:34.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package kiwi-instsource-plugins-openSUSE-12-1
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,15 +20,18 @@
 
 Name:           kiwi-instsource-plugins-openSUSE-12-1
 Summary:        OpenSuSE - KIWI Image System
-Version:        0.9
-Release:        3
-Group:          System/Management
 License:        GPL-2.0
+Group:          System/Management
+Version:        0.9
+Release:        0
 Source:         %{name}.tar.bz2
 Patch0:         kiwi-instsource-plugins-openSUSE-12-1.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Requires:       extract-appdata-icons
 Requires:       inst-source-utils >= 2011.5.5
-Requires:       kiwi-instsource package-translations openSUSE-EULAs
+Requires:       kiwi-instsource
+Requires:       openSUSE-EULAs
+Requires:       package-translations
 Supplements:    kiwi-instsource
 BuildArch:      noarch
 
@@ -51,9 +54,6 @@
 make buildroot=$RPM_BUILD_ROOT \
   version="12.1" install
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-, root, root)
 %dir %{_datadir}/kiwi

++++++ kiwi-instsource-plugins-openSUSE-12-1.diff ++++++
--- /var/tmp/diff_new_pack.ecxeue/_old  2012-03-11 20:04:34.000000000 +0100
+++ /var/tmp/diff_new_pack.ecxeue/_new  2012-03-11 20:04:34.000000000 +0100
@@ -1,7 +1,7 @@
 Index: KIWILiveTreePlugin.pm
 ===================================================================
---- KIWILiveTreePlugin.pm.orig 2011-05-23 15:59:57.000000000 +0200
-+++ KIWILiveTreePlugin.pm      2011-10-28 10:57:04.815647298 +0200
+--- KIWILiveTreePlugin.pm.orig 2012-03-05 13:56:09.045673886 +0100
++++ KIWILiveTreePlugin.pm      2012-03-05 13:56:10.640598808 +0100
 @@ -109,16 +109,6 @@ sub new
  }
  # /constructor
@@ -59,9 +59,9 @@
  }
 Index: KIWIDescrPlugin.pm
 ===================================================================
---- KIWIDescrPlugin.pm.orig    2011-05-23 15:59:57.000000000 +0200
-+++ KIWIDescrPlugin.pm 2011-10-28 10:58:49.035658734 +0200
-@@ -230,6 +230,13 @@ sub executeDir
+--- KIWIDescrPlugin.pm.orig    2012-03-05 13:56:09.045673886 +0100
++++ KIWIDescrPlugin.pm 2012-03-10 15:14:03.808988785 +0100
+@@ -230,6 +230,25 @@ sub executeDir
         return 1;
       }
    }
@@ -72,6 +72,18 @@
 +     $this->logMsg("E", "Calling <translate_packages.pl en > 
failed:\n$data\n");
 +     return 1;
 +  }
++
++  if (-x "/usr/bin/extract-appdata-icons" && -s "$targetdir/appdata.xml") {
++     my $cmd = "/usr/bin/extract-appdata-icons $targetdir/appdata.xml 
$targetdir";
++     my $data = qx( $cmd );
++     if($? >> 8) {
++       $this->logMsg("E", "Calling <extract-appdata-icons 
$targetdir/appdata.xml $targetdir> failed:\n$data\n");
++       return 1;
++     }
++     if($this->{m_compress} =~ m{yes}i) {
++         system("gzip", "--rsyncable", "$targetdir/appdata.xml");
++     }
++  }
  
    if($this->{m_compress} =~ m{yes}i) {
        foreach my $pfile(glob("$targetdir/packages*")) {

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to