X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-terminal.spec;h=5af67d4bb1c20cb04f12dbe7348365b114aa43c4;hb=db2d4265ef9e92321d4830bd79b2f57c6893298e;hp=543497d8bd2c4de5e9df6712a337f3d9bae82fef;hpb=993d2c4e5d84dc646cfd4fce7a65e9a1e9e7b5db;p=packages%2Fgnome-terminal.git

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 543497d..5af67d4 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -1,25 +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
+#
 Summary:	GNOME Terminal
 Summary(pl):	Terminal dla GNOME
 Name:		gnome-terminal
-Version:	2.1.3
+Version:	2.15.4
 Release:	1
 License:	GPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.15/%{name}-%{version}.tar.bz2
+# Source0-md5:	847ba835f312064c350435d99427ec17
 Patch0:		%{name}-TERM.patch
+Patch1:		%{name}-disable-prev_next-tab-sensitivity-changes.patch
+Patch2:		%{name}-desktop.patch
+Patch3:		%{name}-save-session-crash.patch
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 1.2.1-10
-BuildRequires:	gtk+2-devel >= 2.1.3-3
-BuildRequires:	libglade2-devel >= 2.0.0
-BuildRequires:	libgnomeui-devel >= 2.1.2
-BuildRequires:	vte-devel >= 0.10.5
-BuildRequires:	pkgconfig >= 0.12.0
+BuildRequires:	GConf2-devel >= 2.14.0
+BuildRequires:	autoconf >= 2.53
+BuildRequires:	automake
+BuildRequires:	gtk+2-devel >= 2:2.10.1
+BuildRequires:	gnome-common >= 2.12.0
+BuildRequires:	gnome-vfs2-devel >= 2.15.90
+BuildRequires:	intltool >= 0.35
+BuildRequires:	libglade2-devel >= 1:2.6.0
+BuildRequires:	libgnomeui-devel >= 2.15.90
+BuildRequires:	libtool
+BuildRequires:	pkgconfig >= 1:0.12.0
+BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper
-BuildRequires:	rpm-build >= 4.1-8.2
-BuildRequires:	Xft-devel >= 2.0-6
-BuildRequires:	startup-notification >= 0.4
-Requires:	libgnomeui >= 2.1.2
+BuildRequires:	startup-notification-devel >= 0.8
+BuildRequires:	vte-devel >= 0.13.5
+Requires(post,preun):	GConf2 >= 2.14.0
 Requires(post,postun):	scrollkeeper
+Requires:	libgnomeui >= 2.15.90
+Requires:	startup-notification >= 0.8
+Requires:	vte >= 0.13.5
+Requires:	terminfo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -29,42 +52,60 @@ 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
+%if %{with term_voodoo}
 %patch0 -p1
+%endif
+%if %{with disable_prev_next_tab_sensitivity_changes}
+%patch1 -p1
+%endif
+%patch2 -p1
+%patch3 -p1
 
 %build
+%{__intltoolize}
+%{__gnome_doc_common}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure \
-	--with-widget=vte
+	--disable-schemas-install \
+	--disable-scrollkeeper
 %{__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}
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/application-registry
 
 %find_lang %{name} --with-gnome --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post 
-scrollkeeper-update
-%gconf_schema_install
+%post
+%gconf_schema_install gnome-terminal.schemas
+%scrollkeeper_update_post
+
+%preun
+%gconf_schema_uninstall gnome-terminal.schemas
 
 %postun
-scrollkeeper-update
+%scrollkeeper_update_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README ChangeLog NEWS TODO AUTHORS
+%doc AUTHORS ChangeLog NEWS README
 %doc %{_omf_dest_dir}/%{name}
 %attr(755,root,root) %{_bindir}/*
-%{_sysconfdir}/gconf/schemas/*
-%{_datadir}/%{name}
-%{_datadir}/applications/*
 %{_libdir}/bonobo/servers/*
-%{_datadir}/pixmaps/*
+%{_datadir}/%{name}
+%{_desktopdir}/*
+%{_pixmapsdir}/*
+%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas