X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgnome-terminal.git;a=blobdiff_plain;f=gnome-terminal.spec;h=8fd7428839afca9a6bf0a6ce4088b5f8a2d55bee;hp=d917d6e4a86c7d6d7c826d4db12a8535346acdfc;hb=d7796de;hpb=cb60bc000649fc2a117c9a9390957b14e0e72c0f

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index d917d6e..8fd7428 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -1,56 +1,50 @@
 #
 # 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
-#
+%bcond_without	nautilus	# Nautilus extension
+
 Summary:	GNOME Terminal
 Summary(pl.UTF-8):	Terminal dla GNOME
 Name:		gnome-terminal
-Version:	2.24.0
-Release:	1
-License:	GPL v2+
+Version:	3.16.2
+Release:	2
+License:	GPL v3+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/2.24/%{name}-%{version}.tar.bz2
-# Source0-md5:	963d48ea909f513e05d611b8c80b8730
-Patch0:		%{name}-TERM.patch
-Patch1:		%{name}-disable-prev_next-tab-sensitivity-changes.patch
-Patch2:		%{name}-desktop.patch
-Patch4:		%{name}-url-regex.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/3.16/%{name}-%{version}.tar.xz
+# Source0-md5:	17d15e7d226826ca1853eee1c99645b0
+Patch0:		%{name}-desktop.patch
+Patch1:		bug-730632.patch
+Patch2:		wordseps.patch
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.22.0
+BuildRequires:	GConf2-devel >= 2.32.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.36.2
-BuildRequires:	libglade2-devel >= 1:2.6.2
-BuildRequires:	libgnomeui-devel >= 2.22.0
+BuildRequires:	dconf-devel >= 0.14
+BuildRequires:	docbook-dtd412-xml
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.40.0
+BuildRequires:	gnome-common
+BuildRequires:	gnome-shell-devel >= 3.12.0
+BuildRequires:	gsettings-desktop-schemas-devel >= 0.1.0
+BuildRequires:	gtk+3-devel >= 3.10.0
+BuildRequires:	intltool >= 0.50.0
 BuildRequires:	libtool
+BuildRequires:	libuuid-devel
+BuildRequires:	libxml2-progs
+%{?with_nautilus:BuildRequires:	nautilus-devel >= 3.0.0}
 BuildRequires:	pkgconfig >= 1:0.12.0
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.197
-BuildRequires:	scrollkeeper
-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
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	vte-devel >= 0.40.2
+BuildRequires:	xz
+BuildRequires:	yelp-tools
+Requires(post,postun):	glib2 >= 1:2.33.2
+Requires:	dconf >= 0.14
+Requires:	glib2 >= 1:2.40.0
+Requires:	gsettings-desktop-schemas >= 0.1.0
+Requires:	gtk+3 >= 3.10.0
 Requires:	terminfo
-Requires:	vte >= 0.16.13
+Requires:	vte >= 0.40.2
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -61,21 +55,28 @@ This is a terminal thing that isn't finished at all.
 %description -l pl.UTF-8
 To jest terminal, na razie całkowicie nie dokończony.
 
+%package -n nautilus-extension-terminal
+Summary:	GNOME Terminal extension for Nautilus
+Summary(pl.UTF-8):	Rozszerzenie GNOME Terminal dla Nautilusa
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+Requires:	nautilus >= 3.0.0
+Obsoletes:	nautilus-open-terminal < 0.20-2
+
+%description -n nautilus-extension-terminal
+This package provides a Nautilus extension that adds the 'Open in
+Terminal' option to the right-click context menu in Nautilus.
+
+%description -n nautilus-extension-terminal -l pl.UTF-8
+Ten pakiet dostarcza rozszerzenie Nautilusa dodające opcję "Otwórz w
+terminalu" do menu kontekstowego uaktywnianego prawym klawiszem myszy
+w Nautilusie.
+
 %prep
 %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}
@@ -86,8 +87,10 @@ To jest terminal, na razie całkowicie nie dokończony.
 %{__autoheader}
 %{__automake}
 %configure \
-	--disable-schemas-install \
-	--disable-scrollkeeper
+	--disable-silent-rules \
+	--disable-static \
+	%{?with_nautilus:--with-nautilus-extension}
+
 %{__make}
 
 %install
@@ -95,32 +98,39 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
 	localedir=%{_localedir}
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/application-registry
+%if %{with nautilus}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.la
+%endif
 
-%find_lang %{name} --with-gnome --with-omf --all-name
+%find_lang %{name} --with-gnome --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install gnome-terminal.schemas
-%scrollkeeper_update_post
-
-%preun
-%gconf_schema_uninstall gnome-terminal.schemas
+%glib_compile_schemas
 
 %postun
-%scrollkeeper_update_postun
+if [ "$1" = "0" ]; then
+    %glib_compile_schemas
+fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS ChangeLog NEWS
 %attr(755,root,root) %{_bindir}/gnome-terminal
-%{_libdir}/bonobo/servers/gnome-terminal.server
-%{_datadir}/%{name}
+%attr(755,root,root) %{_libdir}/gnome-terminal-migration
+%attr(755,root,root) %{_libdir}/gnome-terminal-server
+%{_datadir}/appdata/gnome-terminal.appdata.xml
+%{_datadir}/dbus-1/services/org.gnome.Terminal.service
+%{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.xml
+%{_datadir}/gnome-shell/search-providers/gnome-terminal-search-provider.ini
 %{_desktopdir}/gnome-terminal.desktop
-%{_pixmapsdir}/gnome-terminal.png
-%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
+
+%if %{with nautilus}
+%files -n nautilus-extension-terminal
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so
+%endif