- merged from DEVEL

Changed files:
    gnome-terminal.spec -> 1.102

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index fa17d8643ba8e2962f61f607c5741c6dba570341..7580bfb5d3b62794a8eeb03c35f46c3569935617 100644 (file)
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -1,16 +1,3 @@
-#
-# 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
@@ -20,10 +7,6 @@ License:      GPL v2+
 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
@@ -34,7 +17,7 @@ BuildRequires:        gnome-common >= 2.20.0
 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
@@ -44,13 +27,13 @@ BuildRequires:      rpmbuild(macros) >= 1.197
 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@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -63,19 +46,6 @@ To jest terminal, na razie całkowicie nie dokończony.
 
 %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@Latn#sr@latin#' po/LINGUAS
-#mv po/sr@{Latn,latin}.po
 
 %build
 %{__intltoolize}
@@ -122,5 +92,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/bonobo/servers/gnome-terminal.server
 %{_datadir}/%{name}
 %{_desktopdir}/gnome-terminal.desktop
-## %{_pixmapsdir}/gnome-terminal.png
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas