#3 Use make macros
Closed 3 years ago by jstanek. Opened 3 years ago by tstellar.
rpms/ tstellar/libdb make-macros  into  master

file modified
+7 -3
@@ -5,7 +5,7 @@ 

  Summary: The Berkeley DB database library for C

  Name: libdb

  Version: 5.3.28

- Release: 41%{?dist}

+ Release: 42%{?dist}

  Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz

  Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz

  # For mt19937db.c
@@ -290,7 +290,7 @@ 

  perl -pi -e 's/^postdep_objects=".*$/postdep_objects=""/' libtool

  perl -pi -e 's/-shared -nostdlib/-shared/' libtool

  

- make %{?_smp_mflags}

+ %make_build

  

  # XXX hack around libtool not creating ./libs/libdb_java-X.Y.lai

  LDBJ=./.libs/libdb_java-%{__soversion}.la
@@ -308,7 +308,7 @@ 

  mkdir -p ${RPM_BUILD_ROOT}%{_libdir}

  mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1

  

- %makeinstall STRIP=/bin/true -C dist/dist-tls

+ %make_install STRIP=/bin/true -C dist/dist-tls

  

  # XXX Nuke non-versioned archives and symlinks

  rm -f ${RPM_BUILD_ROOT}%{_libdir}/{libdb.a,libdb_cxx.a,libdb_tcl.a,libdb_sql.a}
@@ -427,6 +427,10 @@ 

  %{_libdir}/libdb_java.so

  

  %changelog

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

+ - Use make macros

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

+ 

  * Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 5.3.28-41

  - 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 closed by jstanek

3 years ago