X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgnome-terminal.git;a=blobdiff_plain;f=gnome-terminal.spec;h=51f9b6575d80c07184bc3b69a22cdc003cf72f69;hp=880ef35c26f44e52df91701162c764e98ddb3c06;hb=d4bc1a2d6fdc4027f8289d6836d7229eb8f4cf62;hpb=2b7dad925cff18f567a5fe3629e49a77d8be24be

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 880ef35..51f9b65 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -6,16 +6,13 @@
 Summary:	GNOME Terminal
 Summary(pl.UTF-8):	Terminal dla GNOME
 Name:		gnome-terminal
-Version:	3.20.2
+Version:	3.24.0
 Release:	1
 License:	GPL v3+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/3.20/%{name}-%{version}.tar.xz
-# Source0-md5:	8a450458cb833741cf52267d4a208f9a
-Patch0:		%{name}-desktop.patch
-Patch1:		bug-730632.patch
-Patch2:		wordseps.patch
-Patch3:		%{name}-transparency.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/3.24/%{name}-%{version}.tar.xz
+# Source0-md5:	f1b2a3e0d4e7eda8ad5ac6a08742e030
+Patch1:		%{name}-transparency.patch
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.32.0
 BuildRequires:	autoconf >= 2.53
@@ -23,7 +20,7 @@ BuildRequires:	automake >= 1:1.9
 BuildRequires:	dconf-devel >= 0.14
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-tools
-BuildRequires:	glib2-devel >= 1:2.40.0
+BuildRequires:	glib2-devel >= 1:2.42.0
 BuildRequires:	gnome-common
 BuildRequires:	gnome-shell-devel >= 3.12.0
 BuildRequires:	gsettings-desktop-schemas-devel >= 0.1.0
@@ -33,6 +30,7 @@ BuildRequires:	libtool
 BuildRequires:	libuuid-devel
 BuildRequires:	libxml2-progs
 %{?with_nautilus:BuildRequires:	nautilus-devel >= 3.0.0}
+BuildRequires:	pcre2-8-devel >= 10.00
 BuildRequires:	pkgconfig >= 1:0.12.0
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.197
@@ -40,9 +38,9 @@ BuildRequires:	tar >= 1:1.22
 BuildRequires:	vte-devel >= 0.42.1
 BuildRequires:	xz
 BuildRequires:	yelp-tools
-Requires(post,postun):	glib2 >= 1:2.40.0
+Requires(post,postun):	glib2 >= 1:2.42.0
 Requires:	dconf >= 0.14
-Requires:	glib2 >= 1:2.40.0
+Requires:	glib2 >= 1:2.42.0
 Requires:	gsettings-desktop-schemas >= 0.1.0
 Requires:	gtk+3 >= 3.10.0
 Requires:	terminfo
@@ -76,10 +74,7 @@ w Nautilusie.
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-%{?with_transparency:%patch3 -p1}
+%{?with_transparency:%patch1 -p1}
 
 %build
 %{__intltoolize}
@@ -125,8 +120,7 @@ fi
 %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/org.gnome.Terminal.Nautilus.appdata.xml
-%{_datadir}/appdata/org.gnome.Terminal.appdata.xml
+%{_datadir}/metainfo/org.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
@@ -137,4 +131,5 @@ fi
 %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