X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-terminal.spec;h=a5e527aefd1e9c3ff70c72ab089e08ede4670535;hb=4ac35edaf0ca70d47206b16c46b26036786649e8;hp=984b8ffa52d016b155c95efdce4298d9e568ab76;hpb=30bd554779e8e67e197b9e606348477ee7196a4b;p=packages%2Fgnome-terminal.git

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 984b8ff..a5e527a 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -1,74 +1,126 @@
-# --with zvt	build with ZVT not VTE terminal widget
+#
+# 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
+# This allows to mark on-terminal urls containing square brackets (eg. to
+# copy them or to open in external browser).
+%bcond_with	classify_square_brackets_into_url_paths
+#
 Summary:	GNOME Terminal
-Summary(pl):	Terminal dla GNOME
+Summary(pl.UTF-8):	Terminal dla GNOME
 Name:		gnome-terminal
-Version:	2.1.1
-Release:	1.1
-License:	GPL
+Version:	2.23.3
+Release:	1
+License:	GPL v2+
 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.23/%{name}-%{version}.tar.bz2
+# Source0-md5:	99be7ab5874a65209f05619286273d40
 Patch0:		%{name}-TERM.patch
-Patch1:		%{name}-pango-zvt.patch
+Patch1:		%{name}-disable-prev_next-tab-sensitivity-changes.patch
+Patch2:		%{name}-desktop.patch
+Patch4:		%{name}-url-regex.patch
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 1.2.1
-BuildRequires:	gtk+2-devel >= 2.0.3
-BuildRequires:	libglade2-devel >= 2.0.0
-BuildRequires:	libgnomeui-devel >= 2.1.2
-%{?_with_zvt:BuildRequires:	libzvt-devel >= 2.0.0}
-%{?!_with_zvt:BuildRequires:	vte-devel >= 0.10.4}
-BuildRequires:	pkgconfig >= 0.12.0
+BuildRequires:	GConf2-devel >= 2.22.0
+BuildRequires:	autoconf >= 2.53
+BuildRequires:	automake >= 1:1.9
+BuildRequires:	gettext-devel
+BuildRequires:	glib2-devel >= 1:2.16.0
+BuildRequires:	gnome-common >= 2.20.0
+BuildRequires:	gnome-doc-utils >= 0.12.0
+BuildRequires:	gnome-vfs2-devel >= 2.22.0
+BuildRequires:	gtk+2-devel >= 2:2.12.0
+BuildRequires:	intltool >= 0.40.0
+BuildRequires:	libglade2-devel >= 1:2.6.2
+BuildRequires:	libgnomeui-devel >= 2.22.0
+BuildRequires:	libtool
+BuildRequires:	pkgconfig >= 1:0.12.0
+BuildRequires:	rpmbuild(find_lang) >= 1.23
+BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper
-Requires:	libgnomeui >= 2.1.2
+BuildRequires:	sed >= 4.0
+BuildRequires:	startup-notification-devel >= 0.8
+BuildRequires:	vte-devel >= 0.16.13
 Requires(post,postun):	scrollkeeper
+Requires(post,preun):	GConf2
+Requires:	libgnomeui >= 2.20.0
+Requires:	startup-notification >= 0.8
+Requires:	terminfo
+Requires:	vte >= 0.16.13
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
 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.
 
-%description -l pl
-To jest terminal, na razie ca³kowicie nie dokoñczony.
+%description -l pl.UTF-8
+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
+%if %{with classify_square_brackets_into_url_paths}
+%patch4 -p1
+%endif
+
+sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po
 
 %build
+%{__intltoolize}
+%{__gnome_doc_common}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
-	--with-widget=%{?!_with_zvt:vte}%{?_with_zvt:zvt}
+	--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}
 
-%find_lang %{name} --with-gnome --all-name
+rm -rf $RPM_BUILD_ROOT%{_datadir}/application-registry
+
+%find_lang %{name} --with-gnome --with-omf --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post 
-scrollkeeper-update
-GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-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
-%attr(755,root,root) %{_bindir}/*
-%{_sysconfdir}/gconf/schemas/*
+%doc AUTHORS ChangeLog NEWS README
+%attr(755,root,root) %{_bindir}/gnome-terminal
+%{_libdir}/bonobo/servers/gnome-terminal.server
 %{_datadir}/%{name}
-%{_datadir}/applications/*
-%{_libdir}/bonobo/servers/*
-%{_datadir}/pixmaps/*
-%doc %{_omf_dest_dir}/%{name}
+%{_desktopdir}/gnome-terminal.desktop
+%{_pixmapsdir}/gnome-terminal.png
+%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas