From 2a1ea7e572c958ece8de4e78f392ee5d2e1d1f6150889201849201b6ed28f84b Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 15 Oct 2010 15:03:24 +0000
Subject: [PATCH] Accepting request 50714 from GNOME:Factory

checked in (request 50714)

OBS-URL: https://build.opensuse.org/request/show/50714
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-terminal?expand=0&rev=62
---
 gnome-terminal-2.31.91.tar.bz2 |  3 +++
 gnome-terminal-2.32.0.tar.bz2  |  3 ---
 gnome-terminal-desktop.patch   | 13 +++++++++++++
 gnome-terminal.changes         | 12 ------------
 gnome-terminal.spec            | 19 +++++++++++++------
 5 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 gnome-terminal-2.31.91.tar.bz2
 delete mode 100644 gnome-terminal-2.32.0.tar.bz2
 create mode 100644 gnome-terminal-desktop.patch

diff --git a/gnome-terminal-2.31.91.tar.bz2 b/gnome-terminal-2.31.91.tar.bz2
new file mode 100644
index 0000000..1a64a84
--- /dev/null
+++ b/gnome-terminal-2.31.91.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5781fc76920aa0a1062c1447123f2c4108886d762dabd5441f27856fec64899c
+size 2303291
diff --git a/gnome-terminal-2.32.0.tar.bz2 b/gnome-terminal-2.32.0.tar.bz2
deleted file mode 100644
index 0840d5f..0000000
--- a/gnome-terminal-2.32.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e9f922bea4af7f016b66f3204266c8993582c51a12f6cfdce47607202400725
-size 2322564
diff --git a/gnome-terminal-desktop.patch b/gnome-terminal-desktop.patch
new file mode 100644
index 0000000..601188f
--- /dev/null
+++ b/gnome-terminal-desktop.patch
@@ -0,0 +1,13 @@
+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
diff --git a/gnome-terminal.changes b/gnome-terminal.changes
index d37dc0f..d423281 100644
--- a/gnome-terminal.changes
+++ b/gnome-terminal.changes
@@ -1,15 +1,3 @@
--------------------------------------------------------------------
-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
 
diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 12b19c1..31d88e0 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gnome-terminal (Version 2.32.0)
+# spec file for package gnome-terminal (Version 2.31.91)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -32,25 +32,31 @@ BuildRequires:  vte-devel
 License:        GPLv3+ ; LGPLv2.1+
 Group:          System/X11/Terminals
 Obsoletes:      gnome-core
-Version:        2.32.0
+Version:        2.31.91
 Release:        1
-Summary:        GNOME Terminal
+Summary:        The GNOME 2.x Desktop 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 provides the GNOME terminal emulator application.
+This package contains the GNOME 2.x Desktop Terminal program. It is
+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
@@ -65,9 +71,10 @@ 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 -N "GNOME Terminal" -G "Terminal" %name TerminalEmulator
+%suse_update_desktop_file -G "Command Line Terminal" %name TerminalEmulator
 %find_lang %{name}
 %find_gconf_schemas
+cat %{name}.schemas_list >%{name}.lst
 %fdupes $RPM_BUILD_ROOT
 
 %clean
@@ -79,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %preun -f %{name}.schemas_preun
 
-%files -f %{name}.schemas_list
+%files -f %{name}.lst
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/gnome-terminal