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

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 89255ad..ea10001 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -3,39 +3,44 @@
 # 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.8.0
+Version:	2.14.1
 Release:	2
 License:	GPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/2.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	93e59f24b35bd867653664565adb4672
+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
-Patch3:		%{name}-font_smoothing.patch
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.8.0.1
-Buildrequires:	autoconf >= 2.53
+BuildRequires:	GConf2-devel >= 2.14.0
+BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
-BuildRequires:	gtk+2-devel >= 2:2.4.0
-Buildrequires:	gnome-vfs2-devel >= 2.8.0
+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.4.0
-BuildRequires:	libgnomeui-devel >= 2.8.0
+BuildRequires:	libglade2-devel >= 1:2.5.1
+BuildRequires:	libgnomeui-devel >= 2.14.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig >= 1:0.12.0
-BuildRequires:	rpm-build >= 4.1-10
+BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper
-BuildRequires:	startup-notification-devel >= 0.7
-BuildRequires:	vte-devel >= 0.11.11
+BuildRequires:	startup-notification-devel >= 0.8
+BuildRequires:	vte-devel >= 0.12.1
 BuildRequires:	xft-devel >= 2.1-2
-Requires(post):	GConf2
-Requires(post):	scrollkeeper
-Requires:	libgnomeui >= 2.8.0
+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)
 
@@ -47,14 +52,17 @@ To jest terminal, na razie ca
 
 %prep
 %setup -q
+%if %{with term_voodoo}
 %patch0 -p1
+%endif
 %if %{with disable_prev_next_tab_sensitivity_changes}
 %patch1 -p1
 %endif
 %patch2 -p1
-%patch3 -p0
 
 %build
+%{__intltoolize}
+%{__gnome_doc_common}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -71,6 +79,7 @@ rm -rf $RPM_BUILD_ROOT
 	localedir=%{_localedir}
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+rm -rf $RPM_BUILD_ROOT%{_datadir}/application-registry
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -78,19 +87,22 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/bin/scrollkeeper-update
-%gconf_schema_install
+%gconf_schema_install gnome-terminal.schemas
+%scrollkeeper_update_post
+
+%preun
+%gconf_schema_uninstall gnome-terminal.schemas
 
-%postun	-p /usr/bin/scrollkeeper-update
+%postun
+%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}
 %{_libdir}/bonobo/servers/*
+%{_datadir}/%{name}
 %{_desktopdir}/*
 %{_pixmapsdir}/*
-%{_datadir}/application-registry/*
+%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas