From e84dd5fa0bd60e55a94c11e35a8a21bffe022b60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 4 Aug 2020 08:40:44 +0200 Subject: [PATCH] Fix build by switching to cmake macros instead of make --- libproxy.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/libproxy.spec b/libproxy.spec index cd9926e..811fcf5 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -4,7 +4,7 @@ Name: libproxy Version: 0.4.15 -Release: 21%{?dist} +Release: 22%{?dist} Summary: A library handling all the details of proxy configuration License: LGPLv2+ @@ -63,7 +63,7 @@ libproxy offers the following features: * only 3 functions in the stable external API * dynamic adjustment to changing network topology * a standard way of dealing with proxy settings across all scenarios - * a sublime sense of joy and accomplishment + * a sublime sense of joy and accomplishment %package bin @@ -162,11 +162,11 @@ developing applications that use %{name}. -DWITH_PYTHON3=OFF \ %endif . -%make_build +%cmake_build %install -%make_install INSTALL="install -p" +%cmake_install #In case all modules are disabled mkdir -p %{buildroot}%{_libdir}/%{name}/%{version}/modules @@ -176,12 +176,12 @@ install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/proxy.1 %check -make test +%ctest %ldconfig_scriptlets -%files +%files %doc AUTHORS README %license COPYING %{_libdir}/*.so.* @@ -226,6 +226,9 @@ make test %changelog +* Tue Aug 04 2020 Frantisek Zatloukal - 0.4.15-22 +- Fix build by switching to cmake macros instead of make + * Sat Aug 01 2020 Fedora Release Engineering - 0.4.15-21 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild @@ -458,7 +461,7 @@ make test - Update to 0.3.0 * Thu Sep 17 2009 kwizart < kwizart at gmail.com > - 0.2.3-12 -- Remove Requirement of %%{name}-pac virtual provides +- Remove Requirement of %%{name}-pac virtual provides from the main package - #524043 * Sat Jul 25 2009 Fedora Release Engineering - 0.2.3-11 @@ -473,7 +476,7 @@ make test * Thu Jan 22 2009 kwizart < kwizart at gmail.com > - 0.2.3-8 - Merge NetworkManager module into the main libproxy package -- Main Requires the -python and -bin subpackage +- Main Requires the -python and -bin subpackage (splitted for multilibs compliance). * Fri Oct 24 2008 kwizart < kwizart at gmail.com > - 0.2.3-7 @@ -500,7 +503,7 @@ make test - Add Requires: gecko-libs >= %%{gecko_version} - Fix some descriptions - Add plugin-webkit package - + * Fri Jul 11 2008 kwizart < kwizart at gmail.com > - 0.2.3-1 - Convert to Fedora spec