Accepting request 50714 from GNOME:Factory

Copy from GNOME:Factory/gnome-terminal based on submit request 50714 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/50714
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-terminal?expand=0&rev=50

gnome-terminal-2.31.91.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5781fc76920aa0a1062c1447123f2c4108886d762dabd5441f27856fec64899c
-size 2303291

gnome-terminal-2.32.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e9f922bea4af7f016b66f3204266c8993582c51a12f6cfdce47607202400725
+size 2322564

gnome-terminal-desktop.patch

@@ -1,13 +0,0 @@
-Index: gnome-terminal-2.24.0/gnome-terminal.desktop.in.in
-===================================================================
---- gnome-terminal-2.24.0.orig/gnome-terminal.desktop.in.in
-+++ gnome-terminal-2.24.0/gnome-terminal.desktop.in.in
-@@ -1,6 +1,6 @@
- [Desktop Entry]
--_Name=Terminal
--_Comment=Use the command line
-+_Name=GNOME Terminal
-+_GenericName=Use the command line
- TryExec=gnome-terminal
- Exec=gnome-terminal
- Icon=utilities-terminal

gnome-terminal.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Sep 27 07:54:46 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 2.32.0:
+  + bgo#630163: Set _NET_WM_DESKTOP on the new X window when
+    handling composited-changed
+  + Fix compiler warnings.
+  + Updated translations.
+- Drop gnome-terminal-desktop.patch and instead use
+  %suse_update_desktop_file to change the Name and GenericName.
+- Update summary and description.
+
 -------------------------------------------------------------------
 Sun Aug 29 17:01:14 CEST 2010 - dimstar@opensuse.org
 

gnome-terminal.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package gnome-terminal (Version 2.31.91)
+# spec file for package gnome-terminal (Version 2.32.0)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -32,31 +32,25 @@ BuildRequires:  vte-devel
 License:        GPLv3+ ; LGPLv2.1+
 Group:          System/X11/Terminals
 Obsoletes:      gnome-core
-Version:        2.31.91
+Version:        2.32.0
 Release:        1
-Summary:        The GNOME 2.x Desktop Terminal
+Summary:        GNOME Terminal
 Source:         %{name}-%{version}.tar.bz2
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         filesystem gconf2
-Patch0:         gnome-terminal-desktop.patch
 Requires:       %{name}-lang = %{version}
 %gconf_schemas_prereq
 
 %description
-This package contains the GNOME 2.x Desktop Terminal program. It is
+This package provides the GNOME terminal emulator application.
-handy for quick tasks on the command line.
-
-
 
 %lang_package
 %prep
 %setup -q
 translation-update-upstream
-%patch0 -p1
 
 %build
-# autoreconf -f -i
 %configure \
     --disable-schemas-install \
     --disable-scrollkeeper
@@ -71,10 +65,9 @@ translation-update-upstream
 # do this. When this won't be needed anymore, we'll be able to remove
 # scrollkeeper from BuildRequires.
 rm -r $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
-%suse_update_desktop_file -G "Command Line Terminal" %name TerminalEmulator
+%suse_update_desktop_file -N "GNOME Terminal" -G "Terminal" %name TerminalEmulator
 %find_lang %{name}
 %find_gconf_schemas
-cat %{name}.schemas_list >%{name}.lst
 %fdupes $RPM_BUILD_ROOT
 
 %clean
@@ -86,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %preun -f %{name}.schemas_preun
 
-%files -f %{name}.lst
+%files -f %{name}.schemas_list
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/gnome-terminal