X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgnome-terminal.git;a=blobdiff_plain;f=gnome-terminal.spec;h=e40ed986854996ec4054e576404627e961babe41;hp=b1703474ab6494ffc66c55da0d9b1e0ab4ac7eaf;hb=69a77a749ba29f5d9c199564f58d0155a8f4ab77;hpb=4597c9483aea458d0cd9d6a648b48ece1723725c

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index b170347..e40ed98 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -1,50 +1,51 @@
 #
 # Conditional build:
 %bcond_without	nautilus	# Nautilus extension
-#
+%bcond_without	transparency	# restore transparency feature
+%bcond_without	search_provider	# build GNOME Shell search provder
+
 Summary:	GNOME Terminal
 Summary(pl.UTF-8):	Terminal dla GNOME
 Name:		gnome-terminal
-Version:	3.14.2
+Version:	3.42.0
 Release:	1
 License:	GPL v3+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/3.14/%{name}-%{version}.tar.xz
-# Source0-md5:	8d1138bafa419882e37194a50869952f
-Patch0:		%{name}-desktop.patch
-URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.32.0
-BuildRequires:	autoconf >= 2.53
-BuildRequires:	automake >= 1:1.9
+Source0:	https://download.gnome.org/sources/gnome-terminal/3.42/%{name}-%{version}.tar.xz
+# Source0-md5:	401ef2b1b7af62448d11dae251c2a159
+Patch1:		%{name}-transparency.patch
+URL:		https://wiki.gnome.org/Apps/Terminal/
 BuildRequires:	dconf-devel >= 0.14
+BuildRequires:	desktop-file-utils
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.40.0
-BuildRequires:	gnome-common
-BuildRequires:	gnome-shell-devel >= 3.12.0
+BuildRequires:	gettext-tools >= 0.19.8
+BuildRequires:	glib2-devel >= 1:2.52.0
+%{?with_search_provider: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:	gtk+3-devel >= 3.22.27
+BuildRequires:	libstdc++-devel >= 6:4.8.1
 BuildRequires:	libuuid-devel
 BuildRequires:	libxml2-progs
-%{?with_nautilus:BuildRequires:	nautilus-devel >= 3.0.0}
+BuildRequires:	libxslt-progs
+BuildRequires:	meson >= 0.49.0
+%{?with_nautilus:BuildRequires:	nautilus-devel >= 3.28.0}
+BuildRequires:	ninja >= 1.5
+BuildRequires:	pcre2-8-devel >= 10.00
 BuildRequires:	pkgconfig >= 1:0.12.0
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	tar >= 1:1.22
-BuildRequires:	vte-devel >= 0.36.3
+BuildRequires:	vte-devel >= 0.63.0
+BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xz
 BuildRequires:	yelp-tools
-Requires(post,postun):	glib2 >= 1:2.33.2
+Requires(post,postun):	glib2 >= 1:2.52.0
 Requires:	dconf >= 0.14
-Requires:	glib2 >= 1:2.40.0
+Requires:	glib2 >= 1:2.52.0
 Requires:	gsettings-desktop-schemas >= 0.1.0
-Requires:	gtk+3 >= 3.10.0
+Requires:	gtk+3 >= 3.22.27
 Requires:	terminfo
-Requires:	vte >= 0.36.3
-# sr@Latn vs. sr@latin
-Conflicts:	glibc-misc < 6:2.7
+Requires:	vte >= 0.63.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -58,7 +59,7 @@ 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
+Requires:	nautilus >= 3.28.0
 Obsoletes:	nautilus-open-terminal < 0.20-2
 
 %description -n nautilus-extension-terminal
@@ -72,33 +73,19 @@ w Nautilusie.
 
 %prep
 %setup -q
-%patch0 -p1
+%{?with_transparency:%patch1 -p1}
 
 %build
-%{__intltoolize}
-%{__gnome_doc_common}
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--disable-silent-rules \
-	--disable-static \
-	%{?with_nautilus:--with-nautilus-extension}
-
-%{__make}
+%meson build \
+	%{!?with_nautilus:-Dnautilus_extension=false} \
+	%{!?with_search_provider:-Dsearch_provider=false}
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	localedir=%{_localedir}
-
-%if %{with nautilus}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.la
-%endif
+%ninja_install -C build
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -110,23 +97,29 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun
 if [ "$1" = "0" ]; then
-    %glib_compile_schemas
+	%glib_compile_schemas
 fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS
+%doc AUTHORS ChangeLog
 %attr(755,root,root) %{_bindir}/gnome-terminal
-%attr(755,root,root) %{_libdir}/gnome-terminal-migration
-%attr(755,root,root) %{_libdir}/gnome-terminal-server
-%{_datadir}/appdata/gnome-terminal.appdata.xml
+%attr(755,root,root) %{_libexecdir}/gnome-terminal-server
+%dir %{_libdir}/gnome-terminal
+%{_libdir}/gnome-terminal/gschemas.compiled
 %{_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
+%{?with_search_provider:%{_datadir}/gnome-shell/search-providers/gnome-terminal-search-provider.ini}
+%{_datadir}/metainfo/org.gnome.Terminal.metainfo.xml
+%{_desktopdir}/org.gnome.Terminal.desktop
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.Terminal.svg
+%{_iconsdir}/hicolor/symbolic/apps/org.gnome.Terminal-symbolic.svg
+%{systemduserunitdir}/gnome-terminal-server.service
+%{_mandir}/man1/gnome-terminal.1*
 
 %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
+%{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml
 %endif