- 2.15.4

[packages/gnome-terminal.git] / gnome-terminal.spec

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 90c28ed0bdd948bab72392df3c1957ef3d33ba8c..5af67d4bb1c20cb04f12dbe7348365b114aa43c4 100644 (file)
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -1,42 +1,47 @@
 #
+# 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.10.0
+Version:       2.15.4
 Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.10/%{name}-%{version}.tar.bz2
-# Source0-md5: 062744daca0c7f708b8c52f47b5db0d1
+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}-font_smoothing.patch
+Patch3:                %{name}-save-session-crash.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.10.0
+BuildRequires: GConf2-devel >= 2.14.0
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
-BuildRequires: gtk+2-devel >= 2:2.6.0
-BuildRequires: gnome-common >= 2.8.0-2
-BuildRequires: gnome-vfs2-devel >= 2.10.0-2
-BuildRequires: intltool
-BuildRequires: libglade2-devel >= 1:2.5.1
-BuildRequires: libgnomeui-devel >= 2.10.0
+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: rpm-build >= 4.1-10
+BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: scrollkeeper
 BuildRequires: startup-notification-devel >= 0.8
-BuildRequires: vte-devel >= 0.11.12
-BuildRequires: xft-devel >= 2.1-2
-Requires(post):        GConf2
-Requires(post):        scrollkeeper
-Requires:      libgnomeui >= 2.10.0
+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)
 
@@ -48,20 +53,25 @@ 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
+%patch3 -p1
 
 %build
-cp /usr/share/gnome-common/data/omf.make .
+%{__intltoolize}
+%{__gnome_doc_common}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+       --disable-schemas-install \
+       --disable-scrollkeeper
 %{__make}
 
 %install
@@ -72,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
        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
 
@@ -80,19 +90,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