- merged 2.7.3 from DEVEL

[packages/gnome-terminal.git] / gnome-terminal.spec

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 463d2ab5f3445ccaf2492f755e20f982de439757..41d72abc0af9304476025085db390da590a0626d 100644 (file)
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -1,29 +1,42 @@
+#
+# 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
+#
 Summary:       GNOME Terminal
 Summary(pl):   Terminal dla GNOME
 Name:          gnome-terminal
-Version:       2.4.2
-Release:       1
+Version:       2.7.3
+Release:       2
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
-# Source0-md5: ce7e5a207eb48c5ef23325c406536c33
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.7/%{name}-%{version}.tar.bz2
+# Source0-md5: 2f99552c0b9f21ebe2e226b919b1d92d
 Patch0:                %{name}-TERM.patch
-Patch1:                %{name}-geometry.patch
+Patch1:                %{name}-locale-names.patch
+Patch2:                %{name}-disable-prev_next-tab-sensitivity-changes.patch
+Patch3:                %{name}-desktop.patch
+Patch4:                %{name}-font_smoothing.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.4.0.1
+BuildRequires: GConf2-devel >= 2.8.0.1
+Buildrequires: autoconf >= 2.53
 BuildRequires: automake
-BuildRequires: gtk+2-devel >= 2.2.0
-BuildRequires: libglade2-devel >= 2.0.0
-BuildRequires: libgnomeui-devel >= 2.4.0
+BuildRequires: gtk+2-devel >= 2:2.4.0
+Buildrequires: gnome-vfs2-devel >= 2.8.0
+BuildRequires: intltool
+BuildRequires: libglade2-devel >= 1:2.4.0
+BuildRequires: libgnomeui-devel >= 2.8.0
+BuildRequires: libtool
 BuildRequires: pkgconfig >= 0.12.0
 BuildRequires: rpm-build >= 4.1-10
 BuildRequires: scrollkeeper
-BuildRequires: startup-notification-devel >= 0.5
-BuildRequires: vte-devel >= 0.11.7
+BuildRequires: startup-notification-devel >= 0.7
+BuildRequires: vte-devel >= 0.11.11
 BuildRequires: xft-devel >= 2.1-2
 Requires(post):        GConf2
 Requires(post):        scrollkeeper
-Requires:      libgnomeui >= 2.4.0
+Requires:      libgnomeui >= 2.8.0
 Requires:      terminfo
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -37,9 +50,19 @@ To jest terminal, na razie ca
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%if %{with disable_prev_next_tab_sensitivity_changes}
+%patch2 -p1
+%endif
+%patch3 -p1
+%patch4 -p0
+
+mv po/{no,nb}.po
 
 %build
-cp -f /usr/share/automake/config.sub .
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure
 %{__make}