#7 Use make macros
Merged 3 years ago by mcsontos. Opened 3 years ago by tstellar.
rpms/ tstellar/lvm2 make-macros  into  master

file modified
+8 -4
@@ -57,7 +57,7 @@ 

  Epoch: %{rhel}

  %endif

  Version: 2.03.09

- Release: 2%{?dist}

+ Release: 3%{?dist}

  License: GPLv2

  URL: http://sourceware.org/lvm2

  Source0: ftp://sourceware.org/pub/lvm2/releases/LVM2.%{version}.tgz
@@ -171,16 +171,16 @@ 

  

  %configure --with-default-dm-run-dir=%{_default_dm_run_dir} --with-default-run-dir=%{_default_run_dir} --with-default-pid-dir=%{_default_pid_dir} --with-default-locking-dir=%{_default_locking_dir} --with-usrlibdir=%{_libdir} --enable-fsadm --enable-write_install --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-cmdlib --enable-dmeventd --enable-blkid_wiping %{?configure_cluster} %{?configure_cmirror} %{?configure_udev} %{?configure_thin} %{?configure_cache} %{?configure_lvmpolld} %{?configure_lockd_dlm} %{?configure_lockd_sanlock} %{?configure_lvmdbusd} %{?configure_dmfilemapd} %{?configure_writecache} %{?configure_vdo} --disable-silent-rules

  

- make %{?_smp_mflags}

+ %make_build

  

  %install

- make install DESTDIR=$RPM_BUILD_ROOT

+ %make_install

  make install_system_dirs DESTDIR=$RPM_BUILD_ROOT

  make install_systemd_units DESTDIR=$RPM_BUILD_ROOT

  make install_systemd_generators DESTDIR=$RPM_BUILD_ROOT

  make install_tmpfiles_configuration DESTDIR=$RPM_BUILD_ROOT

  %if %{enable_testsuite}

- make -C test install DESTDIR=$RPM_BUILD_ROOT

+ %make_install -C test

  %endif

  

  %post
@@ -723,6 +723,10 @@ 

  %endif

  

  %changelog

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

+ - Use make macros

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

+ 

  * Tue May 26 2020 Miro HronĨok <mhroncok@redhat.com> - 2.03.09-2

  - Rebuilt for Python 3.9

  

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.

Looks good. i was only concerned about order of arguments to make, but make handles the -C PATH after target just fine

Pull-Request has been merged by mcsontos

3 years ago