X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-terminal.spec;h=7cc19da11af61de288b22dedd7b86d4f720d9fbe;hb=dfe35624df6fe03e5acb531826c6a1dc027ad9a1;hp=f0f7eb5873983026fe11430c3876743baa34885c;hpb=834cc1a83c7dae67f4bbd3e6fd48e246630cfb12;p=packages%2Fgnome-terminal.git

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index f0f7eb5..7cc19da 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -1,74 +1,48 @@
-#
-# 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):	Terminal dla GNOME
+Summary(pl.UTF-8):	Terminal dla GNOME
 Name:		gnome-terminal
-Version:	2.16.1
-Release:	2
-License:	GPL
+Version:	2.26.3.1
+Release:	1
+License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.16/%{name}-%{version}.tar.bz2
-# Source0-md5:	861e1b780819214b4d5a398e7999c093
-Patch0:		%{name}-TERM.patch
-Patch1:		%{name}-disable-prev_next-tab-sensitivity-changes.patch
-Patch2:		%{name}-desktop.patch
-Patch3:		%{name}-save-session-crash.patch
-Patch4:		%{name}-url-regex.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/2.26/%{name}-%{version}.tar.bz2
+# Source0-md5:	b6c6c0f5f3e061da7e56f3a04385bb7b
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.14.0
+BuildRequires:	GConf2-devel >= 2.24.0
 BuildRequires:	autoconf >= 2.53
-BuildRequires:	automake
-BuildRequires:	gtk+2-devel >= 2:2.10.6
-BuildRequires:	gnome-common >= 2.12.0
-BuildRequires:	gnome-doc-utils >= 0.8.0
-BuildRequires:	gnome-vfs2-devel >= 2.16.1
-BuildRequires:	intltool >= 0.35
-BuildRequires:	libglade2-devel >= 1:2.6.0
-BuildRequires:	libgnomeui-devel >= 2.16.0
+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.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:	startup-notification-devel >= 0.8
-BuildRequires:	vte-devel >= 0.14.1
-Requires(post,preun):	GConf2 >= 2.14.0
+BuildRequires:	vte-devel >= 0.20.0
+BuildRequires:	xorg-lib-libSM-devel
 Requires(post,postun):	scrollkeeper
-Requires:	libgnomeui >= 2.16.0
+Requires(post,preun):	GConf2
 Requires:	startup-notification >= 0.8
-Requires:	vte >= 0.14.1
 Requires:	terminfo
+Requires:	vte >= 0.20.0
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 This is a terminal thing that isn't finished at all.
 
-%description -l pl
-To jest terminal, na razie ca³kowicie nie dokoñczony.
+%description -l pl.UTF-8
+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
-%patch3 -p1
-%if %{with classify_square_brackets_into_url_paths}
-%patch4 -p1
-%endif
 
 %build
 %{__intltoolize}
@@ -76,6 +50,7 @@ To jest terminal, na razie ca
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 	--disable-schemas-install \
@@ -92,7 +67,7 @@ rm -rf $RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/application-registry
 
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name} --with-gnome --with-omf --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -110,10 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%doc %{_omf_dest_dir}/%{name}
-%attr(755,root,root) %{_bindir}/*
-%{_libdir}/bonobo/servers/*
+%attr(755,root,root) %{_bindir}/gnome-terminal
 %{_datadir}/%{name}
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
+%{_desktopdir}/gnome-terminal.desktop
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas