X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-terminal.spec;h=ea10001f60bd4598f67539b3ef59e71c14bf53dd;hb=577ca4f3dec521b357e7a94811eba9c6d1039248;hp=e46bac56c0c60622522621772552cf1fb6c0e573;hpb=5a403dc3380ae7cdc78437f2f93d2e01ca48c550;p=packages%2Fgnome-terminal.git

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index e46bac5..ea10001 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -1,23 +1,49 @@
+#
+# 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:	1.9.6
-Release:	0.1
+Version:	2.14.1
+Release:	2
 License:	GPL
 Group:		X11/Applications
-Source0:	ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	7abe60db5359c88392d2b4f0d5587ef5
+Patch0:		%{name}-TERM.patch
+Patch1:		%{name}-disable-prev_next-tab-sensitivity-changes.patch
+Patch2:		%{name}-desktop.patch
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 1.1.10
-BuildRequires:	gtk+2-devel >= 2.0.2
-BuildRequires:	libglade2-devel
-BuildRequires:	libgnomeui-devel
-BuildRequires:	libzvt-devel >= 1.115.2
-BuildRequires:	pkgconfig >= 0.12.0
+BuildRequires:	GConf2-devel >= 2.14.0
+BuildRequires:	autoconf >= 2.53
+BuildRequires:	automake
+BuildRequires:	gtk+2-devel >= 2:2.8.0
+BuildRequires:	gnome-common >= 2.12.0
+BuildRequires:	gnome-vfs2-devel >= 2.14.0
+BuildRequires:	intltool
+BuildRequires:	libglade2-devel >= 1:2.5.1
+BuildRequires:	libgnomeui-devel >= 2.14.0
+BuildRequires:	libtool
+BuildRequires:	pkgconfig >= 1:0.12.0
+BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	scrollkeeper
+BuildRequires:	startup-notification-devel >= 0.8
+BuildRequires:	vte-devel >= 0.12.1
+BuildRequires:	xft-devel >= 2.1-2
+Requires(post,preun):	GConf2
+Requires(post,postun):	scrollkeeper
+Requires:	libgnomeui >= 2.14.0
+Requires:	startup-notification >= 0.8
+Requires:	vte >= 0.12.1
+Requires:	terminfo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_prefix		/usr/X11R6
-%define		_sysconfdir	/etc/X11/GNOME2
-
 %description
 This is a terminal thing that isn't finished at all.
 
@@ -25,35 +51,58 @@ 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
 
 %build
+%{__intltoolize}
+%{__gnome_doc_common}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
+	localedir=%{_localedir}
 
-gzip -9nf README ChangeLog NEWS TODO AUTHORS
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+rm -rf $RPM_BUILD_ROOT%{_datadir}/application-registry
 
 %find_lang %{name} --with-gnome --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post 
-GCONF_CONFIG_SOURCE="" %{_bindir}/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas > /dev/null
+%post
+%gconf_schema_install gnome-terminal.schemas
+%scrollkeeper_update_post
+
+%preun
+%gconf_schema_uninstall gnome-terminal.schemas
+
+%postun
+%scrollkeeper_update_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc *.gz
+%doc AUTHORS ChangeLog NEWS README
+%doc %{_omf_dest_dir}/%{name}
 %attr(755,root,root) %{_bindir}/*
-%{_datadir}/%{name}
-%{_datadir}/applications/*
 %{_libdir}/bonobo/servers/*
-%{_datadir}/pixmaps/*
-#no doc
-#%{_datadir}/gnome/help/%{name}
+%{_datadir}/%{name}
+%{_desktopdir}/*
+%{_pixmapsdir}/*
+%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas