- merged from DEVEL and updated to 2.12.0

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

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index ae953bc121eec617cc85aa42586d2fa9cfa45f5a..0edb405b4f499255693cb2590e82eb51eee95ff1 100644 (file)
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -1,26 +1,45 @@
+#
+# 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.0.0
+Version:       2.12.0
 Release:       1
 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.12/%{name}-%{version}.tar.bz2
+# Source0-md5: 483c9397dd165845e2528a80e3df6dfc
 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.2.0
-BuildRequires: gtk+2-devel >= 2.0.3
-BuildRequires: libglade2-devel >= 2.0.0
-BuildRequires: libgnomeui-devel >= 2.0.1
-BuildRequires: libzvt-devel >= 1.99999.0
-BuildRequires: pkgconfig >= 0.12.0
+BuildRequires: GConf2-devel >= 2.10.0
+BuildRequires: autoconf >= 2.53
+BuildRequires: automake
+BuildRequires: gtk+2-devel >= 2:2.8.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: libtool
+BuildRequires: pkgconfig >= 1:0.12.0
+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,preun):  GConf2
 Requires(post,postun): scrollkeeper
+Requires:      libgnomeui >= 2.10.0
+Requires:      startup-notification >= 0.8
+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.
 
@@ -28,41 +47,55 @@ 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
+%if %{with disable_prev_next_tab_sensitivity_changes}
+%patch1 -p1
+%endif
+%patch2 -p1
 
 %build
+%{__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 \
-       omf_dest_dir=%{_omf_dest_dir}/%{name}
+       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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post 
-scrollkeeper-update
-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
+%scrollkeeper_update_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README ChangeLog NEWS TODO AUTHORS
+%doc %{_omf_dest_dir}/%{name}
 %attr(755,root,root) %{_bindir}/*
-%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 %{_datadir}/%{name}
-%{_datadir}/applications/*
 %{_libdir}/bonobo/servers/*
-%{_datadir}/pixmaps/*
-%doc %{_omf_dest_dir}/%{name}
+%{_desktopdir}/*
+%{_pixmapsdir}/*