Accepting request 160157 from home:dimstar:branches:GNOME:Factory

Update to 3.7.14 - includes sbrabec's fix

OBS-URL: https://build.opensuse.org/request/show/160157
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=108
This commit is contained in:
Dominique Leuenberger 2013-03-20 18:00:47 +00:00 committed by Git OBS Bridge
parent 21e13d2ae5
commit cd393f7fd7
4 changed files with 28 additions and 12 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2a8461cbc4d7018a4fe1b671e81fe285a04b1248b9d9f6cdf83da22807a9cbd3
size 13656660

3
gtk+-3.7.14.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:43f5ce8c8b7807494e2723a452eaff1388d8b03de75a3648aa9cbd36bc844cc0
size 13679928

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Tue Mar 19 23:29:20 UTC 2013 - sbrabec@suse.cz
- Add support for translation-update-upstream.
-------------------------------------------------------------------
Tue Mar 19 23:14:20 UTC 2013 - dimstar@opensuse.org
- Update to version 3.7.14:
+ A lot of filechooser button fixes.
+ Bugs fixed: bgo#586367, bgo#671939, bgo#674759, bgo#691040,
bgo#694339, bgo#695200, bgo#695278, bgo#695304, bgo#695312,
bgo#695375, bgo#695391, bgo#695473, bgo#695482, bgo#695682,
bgo#695714, bgo#695715, bgo#695772, bgo#695783, bgo#695874,
bgo#695948.
+ Updated translations.
- Remove enable_avahi_browsing: upstream removed the avahi browsing
capability again:
+ No longer pass --enable-avahi-browsing to configure.
+ Drop cups-devel >= 1.6 BuildRequires.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 6 09:52:29 UTC 2013 - dimstar@opensuse.org Wed Mar 6 09:52:29 UTC 2013 - dimstar@opensuse.org

View File

@ -18,15 +18,13 @@
%define build_broadway_backend 1 %define build_broadway_backend 1
# We can't enable avahi browsing until cups 1.6 is in Factory
%define enable_avahi_browsing 0
# When updating the binary version, do not forget to also update baselibs.conf # When updating the binary version, do not forget to also update baselibs.conf
%define gtk_binary_version 3.0.0 %define gtk_binary_version 3.0.0
Name: gtk3 Name: gtk3
%define _name gtk+ %define _name gtk+
Version: 3.7.12 Version: 3.7.14
Release: 0 Release: 0
Summary: The GTK+ toolkit library (version 3) Summary: The GTK+ toolkit library (version 3)
License: LGPL-2.1+ License: LGPL-2.1+
@ -44,13 +42,11 @@ Patch1: gtk3-path-local.patch
# PATCH-FIX-UPSTREAM gtk3-bnc130159-bgo319483-async-font-selection.patch bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages # PATCH-FIX-UPSTREAM gtk3-bnc130159-bgo319483-async-font-selection.patch bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages
Patch3: gtk3-bnc130159-bgo319483-async-font-selection.patch Patch3: gtk3-bnc130159-bgo319483-async-font-selection.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
%if %{enable_avahi_browsing}
BuildRequires: cups-devel >= 1.6
%endif
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes BuildRequires: fdupes
# Needed for patch1 # Needed for patch1
BuildRequires: gnome-common BuildRequires: gnome-common
BuildRequires: translation-update-upstream
BuildRequires: xsltproc BuildRequires: xsltproc
BuildRequires: pkgconfig(atk) >= 2.7.5 BuildRequires: pkgconfig(atk) >= 2.7.5
BuildRequires: pkgconfig(atk-bridge-2.0) BuildRequires: pkgconfig(atk-bridge-2.0)
@ -291,6 +287,8 @@ This package contains the development files for GTK+ 3.x.
%lang_package %lang_package
%prep %prep
%setup -q -n %{_name}-%{version} %setup -q -n %{_name}-%{version}
translation-update-upstream
translation-update-upstream po-properties gtk30-properties
%if "%_lib" == "lib64" %if "%_lib" == "lib64"
cp -a %{S:1} . cp -a %{S:1} .
%patch0 -p1 %patch0 -p1
@ -309,9 +307,6 @@ NOCONFIGURE=1 ./autogen.sh
--enable-broadway-backend \ --enable-broadway-backend \
%endif %endif
--enable-introspection \ --enable-introspection \
%if %{enable_avahi_browsing}
--enable-avahi-browsing \
%endif
--enable-colord --enable-colord
%{__make} V=1 %{?_smp_mflags} %{__make} V=1 %{?_smp_mflags}