X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgnome-terminal.git;a=blobdiff_plain;f=gnome-terminal.spec;h=7e0f3ea2db8d5796cf56a6da66ea42aaa5c9735e;hp=d917d6e4a86c7d6d7c826d4db12a8535346acdfc;hb=7898ce083d208340beafd57d22515d446fba6e61;hpb=cb60bc000649fc2a117c9a9390957b14e0e72c0f

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index d917d6e..7e0f3ea 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -1,56 +1,36 @@
-#
-# 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
-Version:	2.24.0
+Version:	2.26.0
 Release:	1
 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
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/2.26/%{name}-%{version}.tar.bz2
+# Source0-md5:	013e51a2c4dd7dde5db49587952065ae
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.22.0
+BuildRequires:	GConf2-devel >= 2.24.0
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake >= 1:1.9
+BuildRequires:	dbus-glib-devel >= 0.74
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= 1:2.16.0
-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:	libglade2-devel >= 1:2.6.2
-BuildRequires:	libgnomeui-devel >= 2.22.0
+BuildRequires:	gnome-common >= 2.24.0
+BuildRequires:	gnome-doc-utils >= 0.14.0
+BuildRequires:	gtk+2-devel >= 2:2.14.0
+BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig >= 1:0.12.0
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 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.20.0
+BuildRequires:	xorg-lib-libSM-devel
 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.20.0
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -63,19 +43,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}
@@ -119,8 +86,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/gnome-terminal
-%{_libdir}/bonobo/servers/gnome-terminal.server
 %{_datadir}/%{name}
 %{_desktopdir}/gnome-terminal.desktop
-%{_pixmapsdir}/gnome-terminal.png
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas