Hello community, here is the log from the commit of package libproxy for openSUSE:Factory checked in at 2018-07-12 09:15:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libproxy (Old) and /work/SRC/openSUSE:Factory/.libproxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libproxy" Thu Jul 12 09:15:21 2018 rev:72 rq:621484 version:0.4.15 Changes: -------- --- /work/SRC/openSUSE:Factory/libproxy/libproxy-plugins.changes 2018-02-28 20:01:37.302373912 +0100 +++ /work/SRC/openSUSE:Factory/.libproxy.new/libproxy-plugins.changes 2018-07-12 09:15:26.774106197 +0200 @@ -2 +2,6 @@ -Fri Feb 23 08:37:43 UTC 2018 - [email protected] +Sat Jul 7 19:01:07 UTC 2018 - [email protected] + +- Drop favor_gtk2 conditional. + +------------------------------------------------------------------- +Thu Feb 22 15:13:54 UTC 2018 - [email protected] --- /work/SRC/openSUSE:Factory/libproxy/libproxy.changes 2018-02-28 20:01:37.374371307 +0100 +++ /work/SRC/openSUSE:Factory/.libproxy.new/libproxy.changes 2018-07-12 09:15:27.142106712 +0200 @@ -1,0 +2,5 @@ +Sat Jul 7 19:01:07 UTC 2018 - [email protected] + +- Drop favor_gtk2 conditional. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libproxy-plugins.spec ++++++ --- /var/tmp/diff_new_pack.emG7xV/_old 2018-07-12 09:15:27.798107630 +0200 +++ /var/tmp/diff_new_pack.emG7xV/_new 2018-07-12 09:15:27.798107630 +0200 @@ -36,7 +36,7 @@ Version: 0.4.15 Release: 0 Summary: Automatic proxy configuration management for applications -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Development/Libraries/C and C++ Url: http://code.google.com/p/libproxy/ Source: https://github.com/libproxy/%{_name}/archive/%{version}.tar.gz @@ -59,15 +59,9 @@ BuildRequires: perl BuildRequires: python-devel BuildRequires: python3-devel -%if 0%{?favor_gtk2} -BuildRequires: pkgconfig(gconf-2.0) -BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(webkit-1.0) -%else BuildRequires: pkgconfig(gio-2.0) >= 2.26 BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(javascriptcoregtk-4.0) -%endif %if 0%{?is_opensuse} BuildRequires: libKF5ConfigCore5 %endif @@ -125,37 +119,22 @@ an answer how to reach a certain network resource. %else -%if 0%{?favor_gtk2} -%package -n libproxy1-config-gnome -Summary: Libproxy module for GNOME configuration -Group: System/Libraries -%else %package -n libproxy1-config-gnome3 Summary: Libproxy module for GNOME3 configuration Group: System/Libraries -%endif Requires: libproxy1 = %{version} %if 0%{?suse_version} Recommends: libproxy1-pacrunner = %{version} -%if 0%{?favor_gtk2} -Supplements: packageand(libproxy1:gconf2) -%else Supplements: packageand(libproxy1:gnome-session-core) -%endif %else Requires: libproxy1-pacrunner = %{version} %endif Provides: libproxy-gnome = %{version} Obsoletes: libproxy-gnome < %{version} -%if 0%{?favor_gtk2} -%description -n libproxy1-config-gnome - -%else %description -n libproxy1-config-gnome3 -%endif A module to extend libproxy with capabilities to query GNOME about proxy settings. @@ -208,12 +187,8 @@ # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} %if 0%{?suse_version} -%if 0%{?favor_gtk2} -Supplements: packageand(libproxy1:libjavascriptcoregtk-1_0-0) -%else Supplements: packageand(libproxy1:libjavascriptcoregtk-3_0-0) %endif -%endif %description -n libproxy1-pacrunner-webkit A module to extend libproxy with capabilities to pass addresses to a @@ -342,13 +317,8 @@ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_CONFIG_NAME=RelWithDebInfo \ %endif -%if 0%{?favor_gtk2} - -DWITH_WEBKIT3=OFF \ - -DWITH_GNOME3=OFF \ -%else -DWITH_WEBKIT3=ON \ -DWITH_GNOME3=ON \ -%endif .. make VERBOSE=1 @@ -424,17 +394,10 @@ %{_libdir}/libproxy-%{version}/modules/config_kde.so %endif -%if 0%{?favor_gtk2} -%files -n libproxy1-config-gnome -%defattr(-, root, root) -%{_libdir}/libproxy-%{version}/modules/config_gnome.so -%{_libexecdir}/libproxy-%{version}/pxgconf -%else %files -n libproxy1-config-gnome3 %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_gnome3.so %{_libexecdir}/libproxy-%{version}/pxgsettings -%endif %files -n libproxy1-networkmanager %defattr(-, root, root) ++++++ libproxy.spec ++++++ --- /var/tmp/diff_new_pack.emG7xV/_old 2018-07-12 09:15:27.818107658 +0200 +++ /var/tmp/diff_new_pack.emG7xV/_new 2018-07-12 09:15:27.822107664 +0200 @@ -36,7 +36,7 @@ Version: 0.4.15 Release: 0 Summary: Automatic proxy configuration management for applications -License: GPL-2.0+ AND LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Development/Libraries/C and C++ Url: http://code.google.com/p/libproxy/ Source: https://github.com/libproxy/%{_name}/archive/%{version}.tar.gz @@ -59,15 +59,9 @@ BuildRequires: perl BuildRequires: python-devel BuildRequires: python3-devel -%if 0%{?favor_gtk2} -BuildRequires: pkgconfig(gconf-2.0) -BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(webkit-1.0) -%else BuildRequires: pkgconfig(gio-2.0) >= 2.26 BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(javascriptcoregtk-4.0) -%endif %if 0%{?is_opensuse} BuildRequires: libKF5ConfigCore5 %endif @@ -125,37 +119,22 @@ an answer how to reach a certain network resource. %else -%if 0%{?favor_gtk2} -%package -n libproxy1-config-gnome -Summary: Libproxy module for GNOME configuration -Group: System/Libraries -%else %package -n libproxy1-config-gnome3 Summary: Libproxy module for GNOME3 configuration Group: System/Libraries -%endif Requires: libproxy1 = %{version} %if 0%{?suse_version} Recommends: libproxy1-pacrunner = %{version} -%if 0%{?favor_gtk2} -Supplements: packageand(libproxy1:gconf2) -%else Supplements: packageand(libproxy1:gnome-session-core) -%endif %else Requires: libproxy1-pacrunner = %{version} %endif Provides: libproxy-gnome = %{version} Obsoletes: libproxy-gnome < %{version} -%if 0%{?favor_gtk2} -%description -n libproxy1-config-gnome - -%else %description -n libproxy1-config-gnome3 -%endif A module to extend libproxy with capabilities to query GNOME about proxy settings. @@ -208,12 +187,8 @@ # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} %if 0%{?suse_version} -%if 0%{?favor_gtk2} -Supplements: packageand(libproxy1:libjavascriptcoregtk-1_0-0) -%else Supplements: packageand(libproxy1:libjavascriptcoregtk-3_0-0) %endif -%endif %description -n libproxy1-pacrunner-webkit A module to extend libproxy with capabilities to pass addresses to a @@ -342,13 +317,8 @@ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_CONFIG_NAME=RelWithDebInfo \ %endif -%if 0%{?favor_gtk2} - -DWITH_WEBKIT3=OFF \ - -DWITH_GNOME3=OFF \ -%else -DWITH_WEBKIT3=ON \ -DWITH_GNOME3=ON \ -%endif .. make VERBOSE=1 @@ -424,17 +394,10 @@ %{_libdir}/libproxy-%{version}/modules/config_kde.so %endif -%if 0%{?favor_gtk2} -%files -n libproxy1-config-gnome -%defattr(-, root, root) -%{_libdir}/libproxy-%{version}/modules/config_gnome.so -%{_libexecdir}/libproxy-%{version}/pxgconf -%else %files -n libproxy1-config-gnome3 %defattr(-, root, root) %{_libdir}/libproxy-%{version}/modules/config_gnome3.so %{_libexecdir}/libproxy-%{version}/pxgsettings -%endif %files -n libproxy1-networkmanager %defattr(-, root, root)
