Mailinglist Archive: opensuse-commit (2125 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package desktop-data-openSUSE
checked in at Fri Apr 25 14:51:11 CEST 2008.


--------
--- desktop-data-openSUSE/desktop-data-openSUSE.changes 2008-04-17 
16:20:22.000000000 +0200
+++ 
/mounts/work_src_done/NOARCH/desktop-data-openSUSE/desktop-data-openSUSE.changes
    2008-04-21 19:38:40.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Apr 21 19:38:18 CEST 2008 - sbrabec@xxxxxxx
+
+- Added selected wallpapers from ximian-artwork (gnome-themes)
+  (bnc#380955).
+- Generate gnome-wp-list correctly:
+  * Request translation for NoDisplay items.
+  * Do not use default* symlinks, use proposed background instead.
+- Added more wallpapers (bnc#358461).
+- Obsolete gnome2-SuSE (bnc#380708).
+
+-------------------------------------------------------------------



New:
----
  update_rpm

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

Other differences:
------------------
++++++ desktop-data-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.m32199/_old  2008-04-25 14:50:41.000000000 +0200
+++ /var/tmp/diff_new_pack.m32199/_new  2008-04-25 14:50:41.000000000 +0200
@@ -14,7 +14,7 @@
 Name:           desktop-data-openSUSE
 BuildRequires:  hicolor-icon-theme perl-RPC-XML update-desktop-files xdg-menu 
xdg-utils
 Version:        11.0
-Release:        43
+Release:        45
 Summary:        SUSE Theme Files for KDE and GNOME
 License:        GPL v2 or later
 Group:          System/GUI/Other
@@ -30,11 +30,13 @@
 Requires:       hicolor-icon-theme xdg-utils
 Source:         desktop-data.tar.bz2
 Source1:        %name.fillup
+Source2:        update_rpm
 BuildArch:      noarch
 Provides:       desktop-data-SuSE = 11.0
 Obsoletes:      desktop-data-SuSE <= 11.0
 Obsoletes:      CheckHardware <= 0.1
 Provides:       CheckHardware = 0.1
+Obsoletes:      gnome2-SuSE <= 10.3
 # BRANDING STUFF
 Supplements:    branding-openSUSE
 Provides:       desktop-data-branding = %{version}
@@ -88,14 +90,14 @@
 EOF
 for i in $RPM_BUILD_ROOT/usr/share/desktop-directories/*.directory 
$RPM_BUILD_ROOT/usr/share/wallpapers/*.desktop
 do
- if ! grep -q ^NoDisplay=true "$i" && ! grep -qi ^Hidden=true "$i" ; then
     %suse_update_desktop_file "$i"
     # Convert KDE style wallpaper desktop files to gnome-wp-list
     case $i in
+       # default*.desktop are symlinks for KDE to a real wallpaper.
+       $RPM_BUILD_ROOT/usr/share/wallpapers/default*.desktop |\
        *.directory )
            GNOMEXML=
            ;;
-       $RPM_BUILD_ROOT/usr/share/wallpapers/default*.desktop |\
        $RPM_BUILD_ROOT/usr/share/wallpapers/suse*.desktop |\
        $RPM_BUILD_ROOT/usr/share/wallpapers/openSUSE*.desktop )
            
GNOMEXML=$RPM_BUILD_ROOT/usr/share/gnome-background-properties/desktop-data-openSUSE.xml
@@ -111,13 +113,17 @@
            1i \
        <wallpaper deleted="false">
            $a \
-               <filename>'"$IMG"'</filename>\
-               <options>stretched</options>\
        </wallpaper>
        s@^Name=\(.*\)@         <name>\1</name>@p
        s@^Name\[\([^]]*\)\]=\(.*\)@            <name xml:lang="\1">\2</name>@p
+       s@^File=\(.*\)@         <filename>/usr/share/wallpapers/\1</filename>\
+               <options>stretched</options>@p
+       s@^X-GNOME-WP-Shade-Type=\(.*\)@                
<shade_type>\1</shade_type>@p
+       s@^X-GNOME-WP-PColor=\(.*\)@            <pcolor>\1</pcolor>@p
+       s@^X-GNOME-WP-SColor=\(.*\)@            <scolor>\1</scolor>@p
        '
-    fi
+       # And finally delete X-GNOME-WP-* entries, not needed for KDE style 
desktop files.
+       sed -i '/^X-GNOME-WP-/d' $i
  fi
 done
 cat 
> > $RPM_BUILD_ROOT/usr/share/gnome-background-properties/desktop-data-openSUSE.xml
 <<EOF
@@ -195,6 +201,14 @@
 %dir /usr/share/gnome-background-properties
 
 %changelog
+* Mon Apr 21 2008 sbrabec@xxxxxxx
+- Added selected wallpapers from ximian-artwork (gnome-themes)
+  (bnc#380955).
+- Generate gnome-wp-list correctly:
+  * Request translation for NoDisplay items.
+  * Do not use default* symlinks, use proposed background instead.
+- Added more wallpapers (bnc#358461).
+- Obsolete gnome2-SuSE (bnc#380708).
 * Thu Apr 17 2008 sbrabec@xxxxxxx
 - Generate gnome-wp-list of background files to make wallpapers
   visible in GNOME.


++++++ desktop-data.tar.bz2 ++++++
desktop-data-openSUSE/desktop-data.tar.bz2 
/mounts/work_src_done/NOARCH/desktop-data-openSUSE/desktop-data.tar.bz2 differ: 
byte 11, line 1


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



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx