SPECS: gnome-terminal.spec - merged from DEVEL

[megabajt]

Author: megabajt                     Date: Sat Oct  4 20:09:40 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   gnome-terminal.spec (1.101 -> 1.102) 

---- Diffs:

================================================================
Index: SPECS/gnome-terminal.spec
diff -u SPECS/gnome-terminal.spec:1.101 SPECS/gnome-terminal.spec:1.102
--- SPECS/gnome-terminal.spec:1.101	Thu Oct  2 23:46:20 2008
+++ SPECS/gnome-terminal.spec	Sat Oct  4 22:09:35 2008
@@ -1,17 +1,4 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-# This causes <prev-tab> key do nothing on the first tab (instead of
-# passing the keypress to the application running in the terminal). Ditto
-# for the last tab. This is kinda annoying.
-%bcond_with	disable_prev_next_tab_sensitivity_changes
-# This is specific to PLD and causes an "unknown term type" on most other
-# hosts I have to work on (the rest of the world uses xterm for g-t)
-%bcond_with	term_voodoo
-# This allows to mark on-terminal urls containing square brackets (eg. to
-# copy them or to open in external browser).
-%bcond_with	classify_square_brackets_into_url_paths
-#
 Summary:	GNOME Terminal
 Summary(pl.UTF-8):	Terminal dla GNOME
 Name:		gnome-terminal
@@ -21,10 +8,6 @@
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/2.24/%{name}-%{version}.tar.bz2
 # Source0-md5:	963d48ea909f513e05d611b8c80b8730
-Patch0:		%{name}-TERM.patch
-Patch1:		%{name}-disable-prev_next-tab-sensitivity-changes.patch
-Patch2:		%{name}-desktop.patch
-Patch4:		%{name}-url-regex.patch
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.22.0
 BuildRequires:	autoconf >= 2.53
@@ -35,7 +18,7 @@
 BuildRequires:	gnome-doc-utils >= 0.12.0
 BuildRequires:	gnome-vfs2-devel >= 2.22.0
 BuildRequires:	gtk+2-devel >= 2:2.12.0
-BuildRequires:	intltool >= 0.36.2
+BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libglade2-devel >= 1:2.6.2
 BuildRequires:	libgnomeui-devel >= 2.22.0
 BuildRequires:	libtool
@@ -45,13 +28,13 @@
 BuildRequires:	scrollkeeper
 BuildRequires:	sed >= 4.0
 BuildRequires:	startup-notification-devel >= 0.8
-BuildRequires:	vte-devel >= 0.16.13
+BuildRequires:	vte-devel >= 0.17.1
 Requires(post,postun):	scrollkeeper
 Requires(post,preun):	GConf2
 Requires:	libgnomeui >= 2.20.0
 Requires:	startup-notification >= 0.8
 Requires:	terminfo
-Requires:	vte >= 0.16.13
+Requires:	vte >= 0.17.1
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,19 +47,6 @@
 
 %prep
 %setup -q
-%if %{with term_voodoo}
-%patch0 -p1
-%endif
-%if %{with disable_prev_next_tab_sensitivity_changes}
-%patch1 -p1
-%endif
-%patch2 -p1
-%if %{with classify_square_brackets_into_url_paths}
-%patch4 -p1
-%endif
-
-#sed -i -e 's#sr at Latn#sr at latin#' po/LINGUAS
-#mv po/sr@{Latn,latin}.po
 
 %build
 %{__intltoolize}
@@ -123,7 +93,6 @@
 %{_libdir}/bonobo/servers/gnome-terminal.server
 %{_datadir}/%{name}
 %{_desktopdir}/gnome-terminal.desktop
-## %{_pixmapsdir}/gnome-terminal.png
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -132,17 +101,51 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.102  2008/10/04 20:09:35  megabajt
+- merged from DEVEL
+
 Revision 1.101  2008/10/02 21:46:20  cieciwa
 - removed picture ?
 
 Revision 1.100  2008/10/02 20:41:24  cieciwa
 - updated to version 2.24.
 
+Revision 1.96.2.8  2008/09/27 21:43:15  qwiat
+- up to 2.24
+
+Revision 1.96.2.7  2008/09/13 13:34:07  patrys
+- drop all patches
+- desktop patch did nothing (strict ordering is not required)
+- term_voodoo breaks on every remote host not running PLD
+- URL matching patch changes upstream behavior and breaks consistency
+- terminal can't eat key presses if there is just one tab
+
+Revision 1.96.2.6  2008/08/31 13:49:42  patrys
+- 2.23.91
+
+Revision 1.96.2.5  2008/08/05 20:16:39  patrys
+- 2.23.6
+
 Revision 1.99  2008/06/30 12:56:37  megabajt
 - updated to 2.22.3
 
+Revision 1.96.2.4  2008/06/17 21:48:09  patrys
+- 2.23.4.2
+
+Revision 1.96.2.3  2008/06/17 10:31:41  megabajt
+- updated to 2.23.4.1
+
 Revision 1.98  2008/06/05 08:15:54  patrys
 - commited to wrong branch
+
+Revision 1.97  2008/06/05 08:13:07  patrys
+- BR: intltool 0.40.0
+
+Revision 1.96.2.2  2008/06/04 22:18:23  patrys
+- 2.23.3.1
+
+Revision 1.96.2.1  2008-06-03 20:22:50  patrys
+- 2.23.3
 
 Revision 1.96  2008-05-31 21:35:22  adamg
 - updated to 2.22.2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-terminal.spec?r1=1.101&r2=1.102&f=u