#1 Fix build by switching to cmake macros instead of make
Merged 7 months ago by ignatenkobrain. Opened 7 months ago by frantisekz.
rpms/ frantisekz/libproxy fix_build  into  master

file modified
+12 -9
@@ -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 @@ 

      * 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 @@ 

    -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 @@ 

  

  

  %check

- make test

+ %ctest

  

  %ldconfig_scriptlets

  

  

- %files 

+ %files

  %doc AUTHORS README

  %license COPYING

  %{_libdir}/*.so.*
@@ -226,6 +226,9 @@ 

  

  

  %changelog

+ * Tue Aug 04 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.4.15-22

+ - Fix build by switching to cmake macros instead of make

+ 

  * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.15-21

  - Second attempt - Rebuilt for

    https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
@@ -458,7 +461,7 @@ 

  - 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 <rel-eng@lists.fedoraproject.org> - 0.2.3-11
@@ -473,7 +476,7 @@ 

  

  * 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 @@ 

  - 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

  

no initial comment

Pull-Request has been merged by ignatenkobrain

7 months ago
Metadata