Accepting request 186885 from GNOME:Factory

push GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/186885
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-terminal?expand=0&rev=75

gnome-terminal-3.8.4.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c1a1db9b4c5eb5780137bed5ed6a05afd82053bd5b2ad41180d4617c56a3f22
-size 1625708

gnome-terminal-3.9.90.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:203cb8a7268e25a9e3f8f90f9d5f808fa5fba6fa38247a3e36d5c3fe8629f6b9
+size 1658884

gnome-terminal.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Mon Jul 29 07:21:12 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.9.90:
+  + Build fixes and cleanup.
+  + Portability fixes.
+  + Migration fixes.
+  + Enable menu access key by default again.
+  + Enable nautilus extension by default.
+  + Remove input method submenu from context menu.
+  + Add Quit and New Terminal items to app menu.
+  + Implement dark theme checkbox in preferences.
+  + Unify new tab and new window.
+  + Updated translations.
+- No longer delete various languages for openSUSE <= 11.2.
+- Pass --disable-static to configure: we only care for dynamic
+  stuff.
+- Create new subpackage nautilus-extension-terminal with the
+  extension for nautilus. Obsolete the former
+  nautilus-open-terminal from this new package (source was imported
+  into the main tree and renamed on the go).
+
 -------------------------------------------------------------------
 Mon Jul  8 19:21:20 UTC 2013 - dimstar@opensuse.org
 

gnome-terminal.spec

@@ -17,16 +17,14 @@
 
 
 Name:           gnome-terminal
-Version:        3.8.4
+Version:        3.9.90
 Release:        0
 Summary:        GNOME Terminal
 License:        GPL-3.0+ and LGPL-2.1+
 Group:          System/X11/Terminals
 Url:            http://www.gnome.org
-Source:         http://download.gnome.org/sources/gnome-terminal/3.8/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gnome-terminal/3.9/%{name}-%{version}.tar.xz
 BuildRequires:  fdupes
-# for gtk-builder-convert
-BuildRequires:  gtk2-devel
 BuildRequires:  intltool
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
@@ -36,39 +34,54 @@ BuildRequires:  pkgconfig(gconf-2.0) >= 2.31.3
 BuildRequires:  pkgconfig(gio-2.0) >= 2.33.2
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32.0
 BuildRequires:  pkgconfig(gsettings-desktop-schemas)
-BuildRequires:  pkgconfig(gtk+-3.0) >= 3.6.0
+# for gtk-builder-convert
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.9.9
 BuildRequires:  pkgconfig(libnautilus-extension) >= 3.0.0
 BuildRequires:  pkgconfig(uuid)
-BuildRequires:  pkgconfig(vte-2.90) >= 0.34.6
+BuildRequires:  pkgconfig(vte-2.90) >= 0.34.7
 BuildRequires:  pkgconfig(x11)
-PreReq:         filesystem gconf2
 Recommends:     %{name}-lang
 Obsoletes:      gnome-core
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Requires(pre):  filesystem
+Requires(pre):  gconf2
 
 %description
 This package provides the GNOME terminal emulator application.
 
+%package -n nautilus-extension-terminal
+Summary:        Nautilus Extension to Open Terminal in Folders
+Group:          System/GUI/GNOME
+Supplements:    packageand(nautilus:%{name})
+# nautilus-open-terminal was merged into gnome-terminal source during 3.9 development.
+Provides:       nautilus-open-terminal = %{version}
+Obsoletes:      nautilus-open-terminal <= %{version}
+
+%description -n nautilus-extension-terminal
+This is a nautilus extension that allows you to open a terminal in
+arbitrary folders.
+
 %lang_package
 %prep
 %setup -q
 translation-update-upstream
 
 %build
-%configure --with-gtk=3.0
+%configure \
-%__make %{?jobs:-j%jobs}
+    --disable-static \
+    --with-gtk=3.0
+make %{?_smp_mflags}
 
 %install
-%makeinstall
+%make_install
-%if 0%{?suse_version} <= 1120
+find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
-%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
+%suse_update_desktop_file -N "GNOME Terminal" -G "Terminal" %{name} TerminalEmulator
-%endif
-%suse_update_desktop_file -N "GNOME Terminal" -G "Terminal" %name TerminalEmulator
 %find_lang %{name} %{?no_lang_C}
-%fdupes $RPM_BUILD_ROOT
+%fdupes %{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 %glib2_gsettings_schema_post
@@ -89,6 +102,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.gnome.Terminal.service
 %{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.xml
 
+%files -n nautilus-extension-terminal
+%defattr(-,root,root)
+%{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so
+
 %files lang -f %{name}.lang
 
 %changelog