commit webkitgtk for openSUSE:Factory

29 Aug 2017

Hello community,

here is the log from the commit of package webkitgtk for openSUSE:Factory checked in at 2017-08-29 11:39:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/webkitgtk (Old)
 and      /work/SRC/openSUSE:Factory/.webkitgtk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "webkitgtk"

Tue Aug 29 11:39:42 2017 rev:46 rq:518578 version:2.4.11

Changes:
--------

--- /work/SRC/openSUSE:Factory/webkitgtk/webkitgtk.changes	2017-08-18 14:57:38.139324298 +0200
+++ /work/SRC/openSUSE:Factory/.webkitgtk.new/webkitgtk.changes	2017-08-29 11:39:43.465160833 +0200
@@ -1,0 +2,5 @@
+Wed Aug 23 11:19:59 UTC 2017 - dimstar@opensuse.org
+
+- Fix a patch tag (FIx vs FIX).
+
+-------------------------------------------------------------------
webkitgtk3.changes: same change

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ webkitgtk.spec ++++++
--- /var/tmp/diff_new_pack.JckNyD/_old	2017-08-29 11:39:46.636715236 +0200
+++ /var/tmp/diff_new_pack.JckNyD/_new	2017-08-29 11:39:46.644714112 +0200
@@ -17,7 +17,6 @@
 
 
 %define build_for_gtk3 0
-
 %if %{build_for_gtk3}
 # provide empty _find_debuginfo_dwz_opts for one or the other
 # the .dwz files contain identical contents, which leads to identical
@@ -45,14 +44,13 @@
 %define _jscver 1
 %define _pkgconfig_suffix -1.0
 %endif
-
-Name:           webkitgtk
 %define _name webkitgtk
-Summary:        Library for rendering web content, GTK+ Port
-License:        LGPL-2.0+ and BSD-3-Clause
-Group:          Development/Libraries/C and C++
+Name:           webkitgtk
 Version:        2.4.11
 Release:        0
+Summary:        Library for rendering web content, GTK+ Port
+License:        LGPL-2.0+ AND BSD-3-Clause
+Group:          Development/Libraries/C and C++
 # FIXME: at some point, figure out a way to remove the hack where we use -g0 to have successful builds
 # FIXME: get upstream to fix the conflict on gtk-doc docs between gtk2 and gtk3 versions
 # FIXME: after 1.7.90, remove workaround in %%setup that is needed to fix the build
@@ -73,7 +71,7 @@
 Patch10:        webkitgtk-ppc32.patch
 # PATCH-FIX-UPSTREAM webkitgtk-abs_to_fabs.patch dimstar@opensuse.org -- Use fabs() instead of abs() on floating point values
 Patch11:        webkitgtk-abs_to_fabs.patch
-# PATCH-FIx-UPSTREAM webkitgtk-icu59.patch dimstar@opensuse.org -- Fix build against icu 5.9
+# PATCH-FIX-UPSTREAM webkitgtk-icu59.patch dimstar@opensuse.org -- Fix build against icu 5.9
 Patch12:        webkitgtk-icu59.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  bison
@@ -88,6 +86,7 @@
 # Needed for patch2
 BuildRequires:  libtool
 BuildRequires:  perl
+BuildRequires:  pkgconfig
 BuildRequires:  python
 BuildRequires:  ruby
 # Needed by make-hash-tools.pl, after move to perl 5.14
@@ -98,17 +97,6 @@
 BuildRequires:  pkgconfig(enchant) >= 0.22
 BuildRequires:  pkgconfig(fontconfig) >= 2.5
 BuildRequires:  pkgconfig(freetype2) >= 9.0
-%if %{build_for_gtk3}
-# yes, needed for the plugin process even though we're targetting gtk3
-BuildRequires:  pkgconfig(gail) >= 1.8
-BuildRequires:  pkgconfig(gail-3.0) >= 3.0
-BuildRequires:  pkgconfig(gtk+-2.0) >= 2.24.10
-BuildRequires:  pkgconfig(gtk+-3.0) >= 3.6.0
-BuildRequires:  pkgconfig(gtk+-unix-print-3.0)
-%else
-BuildRequires:  pkgconfig(gail) >= 1.8
-BuildRequires:  pkgconfig(gtk+-2.0) >= 2.24.10
-%endif
 BuildRequires:  pkgconfig(geoclue-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.36.0
 BuildRequires:  pkgconfig(gstreamer-1.0) >= 1.0.3
@@ -129,7 +117,17 @@
 BuildRequires:  pkgconfig(xrender)
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(zlib)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if %{build_for_gtk3}
+# yes, needed for the plugin process even though we're targetting gtk3
+BuildRequires:  pkgconfig(gail) >= 1.8
+BuildRequires:  pkgconfig(gail-3.0) >= 3.0
+BuildRequires:  pkgconfig(gtk+-2.0) >= 2.24.10
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.6.0
+BuildRequires:  pkgconfig(gtk+-unix-print-3.0)
+%else
+BuildRequires:  pkgconfig(gail) >= 1.8
+BuildRequires:  pkgconfig(gtk+-2.0) >= 2.24.10
+%endif
 
 %description
 WebKit is a web content engine, derived from KHTML and KJS from KDE,
@@ -141,16 +139,15 @@
 more.
 
 %package -n libwebkitgtk%{_sover}
-
 Summary:        Library for rendering web content, GTK+ Port
 Group:          System/Libraries
+Recommends:     %{_pkgname_no_slpp}-lang = %{version}
+# We provide %{_pkgname_no_slpp}: that's the GTK+ version being used.
+Provides:       %{_pkgname_no_slpp} = %{version}
 %if ! %{build_for_gtk3}
 Provides:       libWebKitGtk0 = %{version}
 Obsoletes:      libWebKitGtk0 < %{version}
 %endif
-# We provide %{_pkgname_no_slpp}: that's the GTK+ version being used.
-Provides:       %{_pkgname_no_slpp} = %{version}
-Recommends:     %{_pkgname_no_slpp}-lang = %{version}
 
 %description -n libwebkitgtk%{_sover}
 WebKit is a web content engine, derived from KHTML and KJS from KDE,
@@ -195,7 +192,6 @@
 %endif
 
 %package -n libjavascriptcoregtk%{_sover}
-
 Summary:        JavaScript Core Engine, GTK+ Port
 Group:          System/Libraries
 
@@ -257,7 +253,6 @@
 This package provides the GObject Introspection bindings for the GTK+
 port of WebKit2.
 
-
 %endif
 
 %package -n typelib-1_0-JavaScriptCore-%{_sonameverpkg}
@@ -280,12 +275,12 @@
 Summary:        Library for rendering web content, GTK+ Port
 Group:          Development/Libraries/C and C++
 Requires:       libjavascriptcoregtk%{_sover} = %{version}
-%if %{_withwk2}
-Requires:       libwebkit2gtk%{_wk2sover} = %{version}
-%endif
 Requires:       libwebkitgtk%{_sover} = %{version}
 Requires:       typelib-1_0-JavaScriptCore-%{_sonameverpkg}
 Requires:       typelib-1_0-WebKit-%{_sonameverpkg}
+%if %{_withwk2}
+Requires:       libwebkit2gtk%{_wk2sover} = %{version}
+%endif
 %if ! %{build_for_gtk3}
 Provides:       WebKitGtk-devel = %{version}
 Obsoletes:      WebKitGtk-devel < %{version}
@@ -321,6 +316,7 @@
 more.
 
 %lang_package -n %{_pkgname_no_slpp}
+
 %prep
 %setup -q -n webkitgtk-%{version}
 %patch0 -p1
@@ -356,7 +352,7 @@
 %endif
 %ifarch %arm
 # we'll always want to remove the debug from the build on arm
-RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-g / }"
+RPM_OPT_FLAGS="%{optflags}/-g / }"
 %endif
 %ifarch %arm ppc ppc64 ppc64le s390 s390x
 RPM_OPT_FLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads "
@@ -369,8 +365,8 @@
 autoreconf --verbose --install
 
 # No debug builds.... We run out of about everything with -O2 -g (the .ar becomes > 4.3GB)
-export CFLAGS=" $RPM_OPT_FLAGS -g0"
-export CXXFLAGS=" $RPM_OPT_FLAGS -g0"
+export CFLAGS=" %{optflags} -g0"
+export CXXFLAGS=" %{optflags} -g0"
 
 # Use CPPFLAGS to disable jit, webkit#113638
 %ifarch %arm ppc ppc64 ppc64le s390 s390x
@@ -421,9 +417,6 @@
 
 %postun -n libjavascriptcoregtk%{_sover} -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -n libwebkitgtk%{_sover}
 %defattr(-,root,root)
 %doc Source/WebCore/LICENSE-APPLE Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 Source/WebKit/LICENSE Source/WebKit/gtk/NEWS

++++++ webkitgtk3.spec ++++++
--- /var/tmp/diff_new_pack.JckNyD/_old	2017-08-29 11:39:46.732701750 +0200
+++ /var/tmp/diff_new_pack.JckNyD/_new	2017-08-29 11:39:46.744700064 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package webkitgtk
+# spec file for package webkitgtk3
 #
 # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
@@ -17,7 +17,6 @@
 
 
 %define build_for_gtk3 1
-
 %if %{build_for_gtk3}
 # provide empty _find_debuginfo_dwz_opts for one or the other
 # the .dwz files contain identical contents, which leads to identical
@@ -45,14 +44,13 @@
 %define _jscver 1
 %define _pkgconfig_suffix -1.0
 %endif
-
-Name:           webkitgtk3
 %define _name webkitgtk
-Summary:        Library for rendering web content, GTK+ Port
-License:        LGPL-2.0+ and BSD-3-Clause
-Group:          Development/Libraries/C and C++
+Name:           webkitgtk3
 Version:        2.4.11
 Release:        0
+Summary:        Library for rendering web content, GTK+ Port
+License:        LGPL-2.0+ AND BSD-3-Clause
+Group:          Development/Libraries/C and C++
 # FIXME: at some point, figure out a way to remove the hack where we use -g0 to have successful builds
 # FIXME: get upstream to fix the conflict on gtk-doc docs between gtk2 and gtk3 versions
 # FIXME: after 1.7.90, remove workaround in %%setup that is needed to fix the build
@@ -73,7 +71,7 @@
 Patch10:        webkitgtk-ppc32.patch
 # PATCH-FIX-UPSTREAM webkitgtk-abs_to_fabs.patch dimstar@opensuse.org -- Use fabs() instead of abs() on floating point values
 Patch11:        webkitgtk-abs_to_fabs.patch
-# PATCH-FIx-UPSTREAM webkitgtk-icu59.patch dimstar@opensuse.org -- Fix build against icu 5.9
+# PATCH-FIX-UPSTREAM webkitgtk-icu59.patch dimstar@opensuse.org -- Fix build against icu 5.9
 Patch12:        webkitgtk-icu59.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  bison
@@ -88,6 +86,7 @@
 # Needed for patch2
 BuildRequires:  libtool
 BuildRequires:  perl
+BuildRequires:  pkgconfig
 BuildRequires:  python
 BuildRequires:  ruby
 # Needed by make-hash-tools.pl, after move to perl 5.14
@@ -98,17 +97,6 @@
 BuildRequires:  pkgconfig(enchant) >= 0.22
 BuildRequires:  pkgconfig(fontconfig) >= 2.5
 BuildRequires:  pkgconfig(freetype2) >= 9.0
-%if %{build_for_gtk3}
-# yes, needed for the plugin process even though we're targetting gtk3
-BuildRequires:  pkgconfig(gail) >= 1.8
-BuildRequires:  pkgconfig(gail-3.0) >= 3.0
-BuildRequires:  pkgconfig(gtk+-2.0) >= 2.24.10
-BuildRequires:  pkgconfig(gtk+-3.0) >= 3.6.0
-BuildRequires:  pkgconfig(gtk+-unix-print-3.0)
-%else
-BuildRequires:  pkgconfig(gail) >= 1.8
-BuildRequires:  pkgconfig(gtk+-2.0) >= 2.24.10
-%endif
 BuildRequires:  pkgconfig(geoclue-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.36.0
 BuildRequires:  pkgconfig(gstreamer-1.0) >= 1.0.3
@@ -129,7 +117,17 @@
 BuildRequires:  pkgconfig(xrender)
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(zlib)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if %{build_for_gtk3}
+# yes, needed for the plugin process even though we're targetting gtk3
+BuildRequires:  pkgconfig(gail) >= 1.8
+BuildRequires:  pkgconfig(gail-3.0) >= 3.0
+BuildRequires:  pkgconfig(gtk+-2.0) >= 2.24.10
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.6.0
+BuildRequires:  pkgconfig(gtk+-unix-print-3.0)
+%else
+BuildRequires:  pkgconfig(gail) >= 1.8
+BuildRequires:  pkgconfig(gtk+-2.0) >= 2.24.10
+%endif
 
 %description
 WebKit is a web content engine, derived from KHTML and KJS from KDE,
@@ -141,16 +139,15 @@
 more.
 
 %package -n libwebkitgtk%{_sover}
-
 Summary:        Library for rendering web content, GTK+ Port
 Group:          System/Libraries
+Recommends:     %{_pkgname_no_slpp}-lang = %{version}
+# We provide %{_pkgname_no_slpp}: that's the GTK+ version being used.
+Provides:       %{_pkgname_no_slpp} = %{version}
 %if ! %{build_for_gtk3}
 Provides:       libWebKitGtk0 = %{version}
 Obsoletes:      libWebKitGtk0 < %{version}
 %endif
-# We provide %{_pkgname_no_slpp}: that's the GTK+ version being used.
-Provides:       %{_pkgname_no_slpp} = %{version}
-Recommends:     %{_pkgname_no_slpp}-lang = %{version}
 
 %description -n libwebkitgtk%{_sover}
 WebKit is a web content engine, derived from KHTML and KJS from KDE,
@@ -195,7 +192,6 @@
 %endif
 
 %package -n libjavascriptcoregtk%{_sover}
-
 Summary:        JavaScript Core Engine, GTK+ Port
 Group:          System/Libraries
 
@@ -257,7 +253,6 @@
 This package provides the GObject Introspection bindings for the GTK+
 port of WebKit2.
 
-
 %endif
 
 %package -n typelib-1_0-JavaScriptCore-%{_sonameverpkg}
@@ -280,12 +275,12 @@
 Summary:        Library for rendering web content, GTK+ Port
 Group:          Development/Libraries/C and C++
 Requires:       libjavascriptcoregtk%{_sover} = %{version}
-%if %{_withwk2}
-Requires:       libwebkit2gtk%{_wk2sover} = %{version}
-%endif
 Requires:       libwebkitgtk%{_sover} = %{version}
 Requires:       typelib-1_0-JavaScriptCore-%{_sonameverpkg}
 Requires:       typelib-1_0-WebKit-%{_sonameverpkg}
+%if %{_withwk2}
+Requires:       libwebkit2gtk%{_wk2sover} = %{version}
+%endif
 %if ! %{build_for_gtk3}
 Provides:       WebKitGtk-devel = %{version}
 Obsoletes:      WebKitGtk-devel < %{version}
@@ -321,6 +316,7 @@
 more.
 
 %lang_package -n %{_pkgname_no_slpp}
+
 %prep
 %setup -q -n webkitgtk-%{version}
 %patch0 -p1
@@ -356,7 +352,7 @@
 %endif
 %ifarch %arm
 # we'll always want to remove the debug from the build on arm
-RPM_OPT_FLAGS="${RPM_OPT_FLAGS/-g / }"
+RPM_OPT_FLAGS="%{optflags}/-g / }"
 %endif
 %ifarch %arm ppc ppc64 ppc64le s390 s390x
 RPM_OPT_FLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads "
@@ -369,8 +365,8 @@
 autoreconf --verbose --install
 
 # No debug builds.... We run out of about everything with -O2 -g (the .ar becomes > 4.3GB)
-export CFLAGS=" $RPM_OPT_FLAGS -g0"
-export CXXFLAGS=" $RPM_OPT_FLAGS -g0"
+export CFLAGS=" %{optflags} -g0"
+export CXXFLAGS=" %{optflags} -g0"
 
 # Use CPPFLAGS to disable jit, webkit#113638
 %ifarch %arm ppc ppc64 ppc64le s390 s390x
@@ -421,9 +417,6 @@
 
 %postun -n libjavascriptcoregtk%{_sover} -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -n libwebkitgtk%{_sover}
 %defattr(-,root,root)
 %doc Source/WebCore/LICENSE-APPLE Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 Source/WebKit/LICENSE Source/WebKit/gtk/NEWS

    

root＠hilbert.suse.de

tags

participants (1)