diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index 51b1c41..fc87191 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,5 +1,10 @@ ------------------------------------------------------------------- -Fri Feb 23 08:37:43 UTC 2018 - fvogt@suse.com +Sat Jul 7 19:01:07 UTC 2018 - bjorn.lie@gmail.com + +- Drop favor_gtk2 conditional. + +------------------------------------------------------------------- +Thu Feb 22 15:13:54 UTC 2018 - fvogt@suse.com - Use %license (boo#1082318) diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index fd5ca5b..98bf88f 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -36,7 +36,7 @@ Name: libproxy-plugins 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: libproxy1 = %{version} 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 @@ -124,38 +118,23 @@ requires a WPAD protocol implementation, which complicate proxy support. libproxy exists to abstract this issue and provides 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 @@ Requires: libproxy1 = %{version} # 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 @@ cmake \ -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 @@ make test %{_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) diff --git a/libproxy.changes b/libproxy.changes index d59283c..fc87191 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jul 7 19:01:07 UTC 2018 - bjorn.lie@gmail.com + +- Drop favor_gtk2 conditional. + ------------------------------------------------------------------- Thu Feb 22 15:13:54 UTC 2018 - fvogt@suse.com diff --git a/libproxy.spec b/libproxy.spec index 2677816..c266f07 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -36,7 +36,7 @@ Name: libproxy 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: libproxy1 = %{version} 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 @@ -124,38 +118,23 @@ requires a WPAD protocol implementation, which complicate proxy support. libproxy exists to abstract this issue and provides 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 @@ Requires: libproxy1 = %{version} # 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 @@ cmake \ -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 @@ make test %{_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)