Update to 3.12.0

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 80371c7dfdc1b36338437a02b49c3d851f8c66a6..711a2427567eee6322f6a81d634e60b37ab5b8e9 100644 (file)
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -5,12 +5,12 @@
 Summary:       GNOME Terminal
 Summary(pl.UTF-8):     Terminal dla GNOME
 Name:          gnome-terminal
-Version:       3.10.2
+Version:       3.12.0
 Release:       1
 License:       GPL v3+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/3.10/%{name}-%{version}.tar.xz
-# Source0-md5: 746417ef4b6252ed3deb8388d8a1a02a
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/3.12/%{name}-%{version}.tar.xz
+# Source0-md5: 0db5151745f681af5392f18e307a6dc3
 Patch0:                %{name}-desktop.patch
 Patch1:                wordseps.patch
 URL:           http://www.gnome.org/
@@ -20,11 +20,11 @@ BuildRequires:      automake >= 1:1.9
 BuildRequires: dconf-devel >= 0.14
 BuildRequires: docbook-dtd412-xml
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.33.2
+BuildRequires: glib2-devel >= 1:2.40.0
 BuildRequires: gnome-common
 BuildRequires: gsettings-desktop-schemas-devel >= 0.1.0
-BuildRequires: gtk+3-devel >= 3.6.0
-BuildRequires: intltool >= 0.40.0
+BuildRequires: gtk+3-devel >= 3.10.0
+BuildRequires: intltool >= 0.50.0
 BuildRequires: libtool
 BuildRequires: libuuid-devel
 BuildRequires: libxml2-progs
@@ -33,16 +33,16 @@ BuildRequires:      pkgconfig >= 1:0.12.0
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: tar >= 1:1.22
-BuildRequires: vte-devel >= 0.34.9
+BuildRequires: vte-devel >= 0.36.0
 BuildRequires: xz
 BuildRequires: yelp-tools
 Requires(post,postun): glib2 >= 1:2.33.2
 Requires:      dconf >= 0.14
-Requires:      glib2 >= 1:2.33.2
+Requires:      glib2 >= 1:2.40.0
 Requires:      gsettings-desktop-schemas >= 0.1.0
-Requires:      gtk+3 >= 3.6.0
+Requires:      gtk+3 >= 3.10.0
 Requires:      terminfo
-Requires:      vte >= 0.34.9
+Requires:      vte >= 0.36.0
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -120,8 +120,10 @@ 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/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
 
 %if %{with nautilus}

diff --git a/wordseps.patch b/wordseps.patch
index e1d6d29dd7221f99a0253cbb9efd5bf69c343927..d5bec58a39a3498e8f888d601cf422dc749fa5f5 100644 (file)
--- a/wordseps.patch
+++ b/wordseps.patch
@@ -4,14 +4,14 @@ similar patches:
 - lxterminal: http://git.pld-linux.org/?p=packages/lxterminal.git;a=blob;f=wordseps.patch
 - mate-terminal: http://git.pld-linux.org/?p=packages/mate-terminal.git;a=blob;f=wordseps.patch
 
---- gnome-terminal-3.8.0.old/src/org.gnome.Terminal.gschema.xml.in     2013-03-25 18:47:46.000000000 +0100
-+++ gnome-terminal-3.8.0/src/org.gnome.Terminal.gschema.xml.in 2013-03-27 21:56:08.515485756 +0100
-@@ -133,7 +133,7 @@
-       <_summary>Whether to ring the terminal bell</_summary>
+--- gnome-terminal-3.12.0/src/org.gnome.Terminal.gschema.xml.orig      2014-03-31 19:33:38.703984906 +0200
++++ gnome-terminal-3.12.0/src/org.gnome.Terminal.gschema.xml   2014-03-31 19:34:14.883788826 +0200
+@@ -126,7 +126,7 @@
+       <summary>Whether to ring the terminal bell</summary>
      </key>
      <key name="word-chars" type="s">
 -      <default>'-A-Za-z0-9,./?%&amp;#:_=+@~'</default>
 +      <default>'-A-Za-z0-9,./?%&amp;#:_=+@~;'</default>
-       <_summary>Characters that are considered "part of a word"</_summary>
-       <_description>When selecting text by word, sequences of these characters are considered single words. Ranges can be given as "A-Z". Literal hyphen (not expressing a range) should be the first character given.</_description>
+       <summary>Characters that are considered "part of a word"</summary>
+       <description>When selecting text by word, sequences of these characters are considered single words. Ranges can be given as "A-Z". Literal hyphen (not expressing a range) should be the first character given.</description>
      </key>