X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-terminal.spec;h=41d72abc0af9304476025085db390da590a0626d;hb=6543d3f58a7867edfab626d09dd9e6f976ca431e;hp=6e3cb23b6edd4b051cb09c28bce8a57eb46aa072;hpb=25b1d2db7f37e44608be4ee0cc8191e6aabd8ee7;p=packages%2Fgnome-terminal.git

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 6e3cb23..41d72ab 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -1,28 +1,43 @@
-# Conditional build:
-# --with zvt   -- build with ZVT instead of VTE
+#
+# 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.2.1
-Release:	1
+Version:	2.7.3
+Release:	2
 License:	GPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.2/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.7/%{name}-%{version}.tar.bz2
+# Source0-md5:	2f99552c0b9f21ebe2e226b919b1d92d
 Patch0:		%{name}-TERM.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 >= 1.2.1-10
-BuildRequires:	Xft-devel >= 2.1-2
-BuildRequires:	gtk+2-devel >= 2.2.0
-BuildRequires:	libglade2-devel >= 2.0.0
-BuildRequires:	libgnomeui-devel >= 2.1.90
+BuildRequires:	GConf2-devel >= 2.8.0.1
+Buildrequires:	autoconf >= 2.53
+BuildRequires:	automake
+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.4
-%{?_with_zvt:BuildRequires:	libzvt-devel}
-%{!?_with_zvt:BuildRequires:	vte-devel >= 0.10.12}
-Requires:	libgnomeui >= 2.1.90
-Requires(post,postun):	scrollkeeper
+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.8.0
+Requires:	terminfo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -32,34 +47,43 @@ This is a terminal thing that isn't finished at all.
 To jest terminal, na razie ca³kowicie nie dokoñczony.
 
 %prep
-%setup -q 
+%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
-%configure \
-	--with-widget=%{?_with_zvt:zvt}%{!?_with_zvt:vte}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+%configure
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	omf_dest_dir=%{_omf_dest_dir}/%{name} \
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
+	localedir=%{_localedir}
 
 %find_lang %{name} --with-gnome --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post 
-scrollkeeper-update
+%post
+/usr/bin/scrollkeeper-update
 %gconf_schema_install
 
-%postun
-scrollkeeper-update
+%postun	-p /usr/bin/scrollkeeper-update
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -68,6 +92,7 @@ scrollkeeper-update
 %attr(755,root,root) %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/%{name}
-%{_datadir}/applications/*
 %{_libdir}/bonobo/servers/*
-%{_datadir}/pixmaps/*
+%{_desktopdir}/*
+%{_pixmapsdir}/*
+%{_datadir}/application-registry/*