#10 Use make macros
Closed 6 months ago by jkolarik. Opened 3 years ago by tstellar.
rpms/ tstellar/createrepo_c make-macros  into  rawhide

file modified
+9 -5
@@ -36,7 +36,7 @@ 

  Summary:        Creates a common metadata repository

  Name:           createrepo_c

  Version:        0.15.11

- Release:        1%{?dist}

+ Release:        2%{?dist}

  License:        GPLv2+

  URL:            https://github.com/rpm-software-management/createrepo_c

  Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
@@ -145,7 +145,7 @@ 

  %if %{with python2}

  pushd build-py2

    %cmake .. -DPYTHON_DESIRED:FILEPATH=%{__python2} %{!?with_zchunk:-DWITH_ZCHUNK=OFF} %{!?with_libmodulemd:-DWITH_LIBMODULEMD=OFF}

-   make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"

+   %make_build RPM_OPT_FLAGS="%{optflags}"

    %if %{without python3}

    # Build C documentation

    make doc-c
@@ -157,7 +157,7 @@ 

  %if %{with python3}

  pushd build-py3

    %cmake .. -DPYTHON_DESIRED:FILEPATH=%{__python3} %{!?with_zchunk:-DWITH_ZCHUNK=OFF} %{!?with_libmodulemd:-DWITH_LIBMODULEMD=OFF}

-   make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"

+   %make_build RPM_OPT_FLAGS="%{optflags}"

    # Build C documentation

    make doc-c

  popd
@@ -191,14 +191,14 @@ 

  %if %{with python2}

  pushd build-py2

    # Install createrepo_c with Python 2

-   make install DESTDIR=%{buildroot}

+   %make_install

  popd

  %endif

  

  %if %{with python3}

  pushd build-py3

    # Install createrepo_c with Python 3

-   make install DESTDIR=%{buildroot}

+   %make_install

  popd

  %endif

  
@@ -260,6 +260,10 @@ 

  %endif

  

  %changelog

+ * Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 0.15.11-2

+ - Use make macros

+ - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro

+ 

  * Tue Jun 02 2020 Ales Matej <amatej@redhat.com> - 0.15.11-1

  - Update to 0.15.11

  - Switch updateinfo to explicitly include bool values (RhBug:1772466)

This pull request was create automatically for the f33 change:
https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro

Please review the patch and if you approve the changes, merge it after the simple-koji-ci test passes.

This pull request will be automatically merged in 1 week if there are not objections.

Pull-Request has been closed by jkolarik

6 months ago