Accepting request 640108 from GNOME:Factory

- Update Url tag to point to http://libproxy.github.io/libproxy/
- Add libproxy-python3.7.patch: Support python 3.7 and 3.8.
- Drop py_requires: no longer needed.

- Update Url tag to point to http://libproxy.github.io/libproxy/
- Add libproxy-python3.7.patch: Support python 3.7 and 3.8.
- Drop py_requires: no longer needed. (forwarded request 640078 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/640108
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libproxy?expand=0&rev=73
This commit is contained in:
Dominique Leuenberger 2018-10-17 06:20:10 +00:00 committed by Git OBS Bridge
commit 99cd232d70
5 changed files with 49 additions and 12 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Oct 5 12:51:19 UTC 2018 - Dominique Leuenberger <dimstar@opensuse.org>
- Update Url tag to point to http://libproxy.github.io/libproxy/
- Add libproxy-python3.7.patch: Support python 3.7 and 3.8.
- Drop py_requires: no longer needed.
-------------------------------------------------------------------
Sat Jul 7 19:01:07 UTC 2018 - bjorn.lie@gmail.com

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -38,9 +38,11 @@ Release: 0
Summary: Automatic proxy configuration management for applications
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/
URL: http://libproxy.github.io/libproxy/
Source: https://github.com/libproxy/%{_name}/archive/%{version}.tar.gz
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM libproxy-python3.7.patch dimstar@opensuse.org -- Add support for python 3.7 and 3.8, taken from upstream
Patch0: libproxy-python3.7.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libmodman-devel
@ -123,15 +125,14 @@ an answer how to reach a certain network resource.
Summary: Libproxy module for GNOME3 configuration
Group: System/Libraries
Requires: libproxy1 = %{version}
Provides: libproxy-gnome = %{version}
Obsoletes: libproxy-gnome < %{version}
%if 0%{?suse_version}
Recommends: libproxy1-pacrunner = %{version}
Supplements: packageand(libproxy1:gnome-session-core)
%else
Requires: libproxy1-pacrunner = %{version}
%endif
Provides: libproxy-gnome = %{version}
Obsoletes: libproxy-gnome < %{version}
%description -n libproxy1-config-gnome3
@ -226,7 +227,6 @@ Group: Development/Languages/Python
Requires: libproxy1 = %{version}
%if 0%{?suse_version} > 1110
BuildArch: noarch
%py_requires
%endif
%description -n python-libproxy
@ -267,6 +267,7 @@ This package contains the Mono/.NET for libproxy.
%prep
%setup -q -n %{_sourcename}
%patch0 -p1
mkdir build
%build

21
libproxy-python3.7.patch Normal file
View File

@ -0,0 +1,21 @@
commit 2d6da65598b90480b4a62c4633eda035ea51681f
Author: David King <amigadave@amigadave.com>
Date: Wed Jun 27 06:36:00 2018 +0100
python: support Python 3.7 and 3.8
Add 3.7 and 3.8 to the list of accepted Python 3 versions.
diff --git a/cmake/FindPython3Interp.cmake b/cmake/FindPython3Interp.cmake
index c6cbe3d..8e5e409 100644
--- a/cmake/FindPython3Interp.cmake
+++ b/cmake/FindPython3Interp.cmake
@@ -39,7 +39,7 @@
unset(_Python3_NAMES)
-set(_Python3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+set(_Python3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
if(Python3Interp_FIND_VERSION)
if(Python3Interp_FIND_VERSION_COUNT GREATER 1)

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Oct 5 12:51:19 UTC 2018 - Dominique Leuenberger <dimstar@opensuse.org>
- Update Url tag to point to http://libproxy.github.io/libproxy/
- Add libproxy-python3.7.patch: Support python 3.7 and 3.8.
- Drop py_requires: no longer needed.
-------------------------------------------------------------------
Sat Jul 7 19:01:07 UTC 2018 - bjorn.lie@gmail.com

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -38,9 +38,11 @@ Release: 0
Summary: Automatic proxy configuration management for applications
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/
URL: http://libproxy.github.io/libproxy/
Source: https://github.com/libproxy/%{_name}/archive/%{version}.tar.gz
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM libproxy-python3.7.patch dimstar@opensuse.org -- Add support for python 3.7 and 3.8, taken from upstream
Patch0: libproxy-python3.7.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libmodman-devel
@ -123,15 +125,14 @@ an answer how to reach a certain network resource.
Summary: Libproxy module for GNOME3 configuration
Group: System/Libraries
Requires: libproxy1 = %{version}
Provides: libproxy-gnome = %{version}
Obsoletes: libproxy-gnome < %{version}
%if 0%{?suse_version}
Recommends: libproxy1-pacrunner = %{version}
Supplements: packageand(libproxy1:gnome-session-core)
%else
Requires: libproxy1-pacrunner = %{version}
%endif
Provides: libproxy-gnome = %{version}
Obsoletes: libproxy-gnome < %{version}
%description -n libproxy1-config-gnome3
@ -226,7 +227,6 @@ Group: Development/Languages/Python
Requires: libproxy1 = %{version}
%if 0%{?suse_version} > 1110
BuildArch: noarch
%py_requires
%endif
%description -n python-libproxy
@ -267,6 +267,7 @@ This package contains the Mono/.NET for libproxy.
%prep
%setup -q -n %{_sourcename}
%patch0 -p1
mkdir build
%build