#4 Use make macros
Merged 3 years ago by jgrulich. Opened 3 years ago by tstellar.
rpms/ tstellar/tigervnc make-macros  into  master

file modified
+8 -4
@@ -1,6 +1,6 @@ 

  Name:           tigervnc

  Version:        1.10.1

- Release:        6%{?dist}

+ Release:        7%{?dist}

  Summary:        A TigerVNC remote display system

  

  %global _hardened_build 1
@@ -159,7 +159,7 @@ 

  export CXXFLAGS="$CFLAGS -std=c++11"

  

  %{cmake} .

- make %{?_smp_mflags}

+ %make_build

  

  pushd unix/xserver

  autoreconf -fiv
@@ -180,7 +180,7 @@ 

          --disable-devel-docs \

          --disable-selective-werror

  

- make %{?_smp_mflags}

+ %make_build

  popd

  

  # Build icons
@@ -193,7 +193,7 @@ 

  rm -f %{buildroot}%{_docdir}/%{name}-%{version}/{README.rst,LICENCE.TXT}

  

  pushd unix/xserver/hw/vnc

- make install DESTDIR=%{buildroot}

+ %make_install

  popd

  

  # Install systemd unit file
@@ -280,6 +280,10 @@ 

  %{_datadir}/icons/hicolor/*/apps/*

  

  %changelog

+ * Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 1.10.1-7

+ - Use make macros

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

+ 

  * Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.10.1-6

  - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11

  

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 merged by jgrulich

3 years ago