#8 Use make macros
Opened a year ago by tstellar. Modified a year ago
rpms/ tstellar/389-ds-base make-macros  into  rawhide

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

  Summary:          389 Directory Server (base)

  Name:             389-ds-base

  Version:          1.4.4.4

- Release:          %{?relprefix}1%{?prerel}%{?dist}

+ Release:          %{?relprefix}1%{?prerel}%{?dist}.1

  License:          GPLv3+

  URL:              https://www.port389.org

  Conflicts:        selinux-policy-base < 3.9.8
@@ -359,7 +359,7 @@ 

          --libdir=%{_libdir}/%{pkgname}/lib \

          --bindir=%{_libdir}/%{pkgname}/bin \

          --enable-prof

- make %{?_smp_mflags}

+ %make_build

  popd

  %endif

  
@@ -394,7 +394,7 @@ 

  # Generate symbolic info for debuggers

  export XCFLAGS=$RPM_OPT_FLAGS

  

- #make %{?_smp_mflags}

+ #%make_build

  make

  

  %install
@@ -403,7 +403,7 @@ 

  %if %{use_cockpit}

  mkdir -p %{buildroot}%{_datadir}/cockpit

  %endif

- make DESTDIR="$RPM_BUILD_ROOT" install

+ %make_install

  

  %if %{use_cockpit}

  find %{buildroot}%{_datadir}/cockpit/389-console -type d | sed -e "s@%{buildroot}@@" | sed -e 's/^/\%dir /' > cockpit.list
@@ -794,6 +794,10 @@ 

  %endif

  

  %changelog

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

+ - Use make macros

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

+ 

  * Wed Jul 8 2020 Mark Reynolds <mreynolds@redhat.com> - 1.4.4.4-1

  - Bump version to 1.4.4.4

  - Issue 51175 - resolve plugin name leaking

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.

LGTM, I'm assuming you tested that the package still builds correctly...

@mreynolds I'm relying on the simple-koji-ci job to test the builds, and it looks like that passed. However, the "Fedora CI" job seems to have failed.