Accepting request 906141 from home:dimstar:Factory

- Do no longer BuildRequire libmodman-devel: libproxy 0.4.17 was
  changed upstream to only support to internal version (no other
  consumer of libmodman exists).
- No longer pass -DFORCE_SYSTEM_LIBMODMAN=ON to cmake: not
  understood anymore (boo#1188265).

OBS-URL: https://build.opensuse.org/request/show/906141
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=156
This commit is contained in:
Dominique Leuenberger 2021-07-20 07:13:03 +00:00 committed by Git OBS Bridge
parent e246f15c03
commit 93718035aa
2 changed files with 12 additions and 4 deletions

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Jul 13 13:33:13 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Do no longer BuildRequire libmodman-devel: libproxy 0.4.17 was
changed upstream to only support to internal version (no other
consumer of libmodman exists).
- No longer pass -DFORCE_SYSTEM_LIBMODMAN=ON to cmake: not
understood anymore (boo#1188265).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 29 11:35:09 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org> Tue Dec 29 11:35:09 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -1,7 +1,7 @@
# #
# spec file for package libproxy # spec file
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2021 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -49,7 +49,6 @@ Source: https://github.com/libproxy/libproxy/releases/download/%{version
Source99: baselibs.conf Source99: baselibs.conf
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libmodman-devel
# netcfg is needed for the test suite. # netcfg is needed for the test suite.
BuildRequires: netcfg BuildRequires: netcfg
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -128,6 +127,7 @@ support. libproxy exists to abstract this issue and provides
an answer how to reach a certain network resource. an answer how to reach a certain network resource.
%else %else
%package -n libproxy1-config-gnome3 %package -n libproxy1-config-gnome3
Summary: Libproxy module for GNOME3 configuration Summary: Libproxy module for GNOME3 configuration
Group: System/Libraries Group: System/Libraries
@ -299,7 +299,6 @@ cmake \
%if %{with mono} %if %{with mono}
-DWITH_DOTNET=1 \ -DWITH_DOTNET=1 \
%endif %endif
-DFORCE_SYSTEM_LIBMODMAN=ON \
%endif %endif
-DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DBIN_INSTALL_DIR=%{_bindir} \ -DBIN_INSTALL_DIR=%{_bindir} \