From c201898916a0c180dfa55cc2b0aa110e10a973b45e398241f660c24265f6b84e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 25 Jan 2016 14:20:48 +0000 Subject: [PATCH 1/4] Minor tweak OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=113 --- libproxy-plugins.spec | 2 +- libproxy.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index 249db6a..3e786b6 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -57,7 +57,7 @@ BuildRequires: dbus-1-devel BuildRequires: gconf2-devel # For directory ownership, but also because we want to rebuild the modules if # the library changed -BuildRequires: libproxy1 +BuildRequires: libproxy1 = %{version} %if 0%{?favor_gtk2} BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gobject-2.0) diff --git a/libproxy.spec b/libproxy.spec index b273d9b..b6a899d 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -57,7 +57,7 @@ BuildRequires: dbus-1-devel BuildRequires: gconf2-devel # For directory ownership, but also because we want to rebuild the modules if # the library changed -BuildRequires: libproxy1 +BuildRequires: libproxy1 = %{version} %if 0%{?favor_gtk2} BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gobject-2.0) From be9af00f3bd5b8f200ab7971840f1a02eab4d35f9d9ce7a0a57b2982f96afc7e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 19 Feb 2016 14:33:11 +0000 Subject: [PATCH 2/4] Accepting request 360316 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/360316 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=114 --- libproxy-plugins.changes | 5 +++++ libproxy-plugins.spec | 8 ++++++-- libproxy.changes | 5 +++++ libproxy.spec | 8 ++++++-- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index f46decd..a849e45 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 14 11:56:33 UTC 2016 - fcrozat@suse.com + +- Disable building libproxy-config-kde on SLE. + ------------------------------------------------------------------- Tue Jan 12 16:46:37 UTC 2016 - dimstar@opensuse.org diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index 3e786b6..14c63b4 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -68,7 +68,9 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(webkitgtk-3.0) %endif BuildRequires: NetworkManager-devel +%if 0%{?is_opensuse} BuildRequires: libKF5ConfigCore5 +%endif %if %{build_mozjs} BuildRequires: pkgconfig(mozjs185) %endif @@ -181,6 +183,7 @@ Obsoletes: libproxy-gnome < %{version} A module to extend libproxy with capabilities to query GNOME about proxy settings. +%if 0%{?is_opensuse} %package -n libproxy1-config-kde Summary: Libproxy module for KDE configuration Group: System/Libraries @@ -201,7 +204,7 @@ Obsoletes: libproxy1-config-kde4 < 0.4.12 %description -n libproxy1-config-kde A module to extend libproxy with capabilities to query KDE4 about proxy settings. - +%endif %if %{build_mozjs} %package -n libproxy1-pacrunner-mozjs @@ -434,10 +437,11 @@ rm -f %{buildroot}%{_datadir}/vala/vapi/libproxy-1.0.vapi %else %if ! 0%{?windows} - +%if 0%{?is_opensuse} %files -n libproxy1-config-kde %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_kde.so +%endif %if 0%{?favor_gtk2} diff --git a/libproxy.changes b/libproxy.changes index f46decd..a849e45 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 14 11:56:33 UTC 2016 - fcrozat@suse.com + +- Disable building libproxy-config-kde on SLE. + ------------------------------------------------------------------- Tue Jan 12 16:46:37 UTC 2016 - dimstar@opensuse.org diff --git a/libproxy.spec b/libproxy.spec index b6a899d..5948129 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -68,7 +68,9 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(webkitgtk-3.0) %endif BuildRequires: NetworkManager-devel +%if 0%{?is_opensuse} BuildRequires: libKF5ConfigCore5 +%endif %if %{build_mozjs} BuildRequires: pkgconfig(mozjs185) %endif @@ -181,6 +183,7 @@ Obsoletes: libproxy-gnome < %{version} A module to extend libproxy with capabilities to query GNOME about proxy settings. +%if 0%{?is_opensuse} %package -n libproxy1-config-kde Summary: Libproxy module for KDE configuration Group: System/Libraries @@ -201,7 +204,7 @@ Obsoletes: libproxy1-config-kde4 < 0.4.12 %description -n libproxy1-config-kde A module to extend libproxy with capabilities to query KDE4 about proxy settings. - +%endif %if %{build_mozjs} %package -n libproxy1-pacrunner-mozjs @@ -434,10 +437,11 @@ rm -f %{buildroot}%{_datadir}/vala/vapi/libproxy-1.0.vapi %else %if ! 0%{?windows} - +%if 0%{?is_opensuse} %files -n libproxy1-config-kde %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_kde.so +%endif %if 0%{?favor_gtk2} From 22b5a11db05e56323ec7e8dcdea583b2a92447884e7a6847a0945809c78178d3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 17 Mar 2016 09:45:26 +0000 Subject: [PATCH 3/4] Fixup source_validator OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=115 --- libproxy-plugins.spec | 2 -- libproxy.spec | 2 -- 2 files changed, 4 deletions(-) diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index 14c63b4..078836d 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -183,7 +183,6 @@ Obsoletes: libproxy-gnome < %{version} A module to extend libproxy with capabilities to query GNOME about proxy settings. -%if 0%{?is_opensuse} %package -n libproxy1-config-kde Summary: Libproxy module for KDE configuration Group: System/Libraries @@ -204,7 +203,6 @@ Obsoletes: libproxy1-config-kde4 < 0.4.12 %description -n libproxy1-config-kde A module to extend libproxy with capabilities to query KDE4 about proxy settings. -%endif %if %{build_mozjs} %package -n libproxy1-pacrunner-mozjs diff --git a/libproxy.spec b/libproxy.spec index 5948129..1d958f3 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -183,7 +183,6 @@ Obsoletes: libproxy-gnome < %{version} A module to extend libproxy with capabilities to query GNOME about proxy settings. -%if 0%{?is_opensuse} %package -n libproxy1-config-kde Summary: Libproxy module for KDE configuration Group: System/Libraries @@ -204,7 +203,6 @@ Obsoletes: libproxy1-config-kde4 < 0.4.12 %description -n libproxy1-config-kde A module to extend libproxy with capabilities to query KDE4 about proxy settings. -%endif %if %{build_mozjs} %package -n libproxy1-pacrunner-mozjs From 69460ddbe5ba9aafbb36d5ec4ca75a9a7bbb3fa39f980f503a7fa5d4d46b6cc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 29 Apr 2016 12:25:50 +0000 Subject: [PATCH 4/4] Accepting request 392053 from GNOME:Next Update to 0.4.13 OBS-URL: https://build.opensuse.org/request/show/392053 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=116 --- 0.4.12.tar.gz | 3 --- 0.4.13.tar.gz | 3 +++ libproxy-plugins.changes | 18 ++++++++++++++++++ libproxy-plugins.spec | 5 +++-- libproxy.changes | 18 ++++++++++++++++++ libproxy.spec | 5 +++-- 6 files changed, 45 insertions(+), 7 deletions(-) delete mode 100644 0.4.12.tar.gz create mode 100644 0.4.13.tar.gz diff --git a/0.4.12.tar.gz b/0.4.12.tar.gz deleted file mode 100644 index 4e3ff5f..0000000 --- a/0.4.12.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:add9c5e30767c17b00f842f6280d818ece1eb23ab92e1fc68661204c95d7e22b -size 87765 diff --git a/0.4.13.tar.gz b/0.4.13.tar.gz new file mode 100644 index 0000000..c0ea750 --- /dev/null +++ b/0.4.13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d610bc0ef81a18ba418d759c5f4f87bf7102229a9153fb397d7d490987330ffd +size 89296 diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index a849e45..d2c337d 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Apr 28 16:54:40 UTC 2016 - dimstar@opensuse.org + +- Update to version 0.4.13: + + Allow linking webkit pacrunner against javascriptcore-4.0 + (webkit2). + + Allow to disable building of the KDE module + (-DWITH_KDE=ON/OFF). + + Fix compilation errors with CLang on MacOSX. + + bindings: perl: Add an option to explicitly link against + libperl.so. Some distributions want to do it, other prefer not + to, the library is anyway in context of perl. + + config_kde: Add a basic cache and invalidation: performance + improvement for the KDE module. +- Pass -DWITH_KDE=OFF to cmake when building core. +- Replace pkgconfig(webkitgtk-3.0) BuildRequires with + pkgconfig(javascriptcoregtk-4.0): make use of the WebKit2 port. + ------------------------------------------------------------------- Thu Jan 14 11:56:33 UTC 2016 - fcrozat@suse.com diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index 078836d..861862f 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -31,7 +31,7 @@ Name: libproxy-plugins Summary: Libproxy provides consistent proxy configuration to applications License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries -Version: 0.4.12 +Version: 0.4.13 Release: 0 # FIXME: verify if test suite works - 0.4.10 has weird behavior in some cases, where the internal server times out. %if 0%{?build_snapshot} @@ -65,7 +65,7 @@ BuildRequires: pkgconfig(webkit-1.0) %else BuildRequires: pkgconfig(gio-2.0) >= 2.26 BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(webkitgtk-3.0) +BuildRequires: pkgconfig(javascriptcoregtk-4.0) %endif BuildRequires: NetworkManager-devel %if 0%{?is_opensuse} @@ -350,6 +350,7 @@ cmake \ -DWITH_DOTNET=OFF \ -DWITH_PERL=OFF \ -DWITH_PYTHON=OFF \ + -DWITH_KDE=OFF \ %endif %if 0%{?suse_version} && 0%{?suse_version} < 1120 -DCMAKE_BUILD_TYPE=DebugFull \ diff --git a/libproxy.changes b/libproxy.changes index a849e45..d2c337d 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Apr 28 16:54:40 UTC 2016 - dimstar@opensuse.org + +- Update to version 0.4.13: + + Allow linking webkit pacrunner against javascriptcore-4.0 + (webkit2). + + Allow to disable building of the KDE module + (-DWITH_KDE=ON/OFF). + + Fix compilation errors with CLang on MacOSX. + + bindings: perl: Add an option to explicitly link against + libperl.so. Some distributions want to do it, other prefer not + to, the library is anyway in context of perl. + + config_kde: Add a basic cache and invalidation: performance + improvement for the KDE module. +- Pass -DWITH_KDE=OFF to cmake when building core. +- Replace pkgconfig(webkitgtk-3.0) BuildRequires with + pkgconfig(javascriptcoregtk-4.0): make use of the WebKit2 port. + ------------------------------------------------------------------- Thu Jan 14 11:56:33 UTC 2016 - fcrozat@suse.com diff --git a/libproxy.spec b/libproxy.spec index 1d958f3..c21ecb4 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -31,7 +31,7 @@ Name: libproxy Summary: Libproxy provides consistent proxy configuration to applications License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries -Version: 0.4.12 +Version: 0.4.13 Release: 0 # FIXME: verify if test suite works - 0.4.10 has weird behavior in some cases, where the internal server times out. %if 0%{?build_snapshot} @@ -65,7 +65,7 @@ BuildRequires: pkgconfig(webkit-1.0) %else BuildRequires: pkgconfig(gio-2.0) >= 2.26 BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(webkitgtk-3.0) +BuildRequires: pkgconfig(javascriptcoregtk-4.0) %endif BuildRequires: NetworkManager-devel %if 0%{?is_opensuse} @@ -350,6 +350,7 @@ cmake \ -DWITH_DOTNET=OFF \ -DWITH_PERL=OFF \ -DWITH_PYTHON=OFF \ + -DWITH_KDE=OFF \ %endif %if 0%{?suse_version} && 0%{?suse_version} < 1120 -DCMAKE_BUILD_TYPE=DebugFull \