#3 Use make macros
Merged 3 years ago by mkasik. Opened 3 years ago by tstellar.
rpms/ tstellar/freetype make-macros  into  master

file modified
+6 -2
@@ -3,7 +3,7 @@ 

  Summary: A free and portable font rendering engine

  Name: freetype

  Version: 2.10.2

- Release: 1%{?dist}

+ Release: 2%{?dist}

  License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement

  URL: http://www.freetype.org

  Source:  http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.xz
@@ -96,7 +96,7 @@ 

             --with-brotli=yes

  sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' builds/unix/libtool

  sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' builds/unix/libtool

- make %{?_smp_mflags}

+ %make_build

  

  %if %{with_xfree86}

  # Build demos
@@ -197,6 +197,10 @@ 

  %{_mandir}/man1/*

  

  %changelog

+ * Tue Jul 21 2020 Tom Stellard <tstellar@redhat.com> - 2.10.2-2

+ - Use make macros

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

+ 

  * Wed Jul 15 2020 Marek Kasik <mkasik@redhat.com> - 2.10.2-1

  - Update to 2.10.2

  - Enable support for WOFF2 streams

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.

Hi, I've rebased freetype last week. You have to modify the pull request. Hopefully it is just the version string (2.10.1 -> 2.10.2).

rebased onto b7670a0

3 years ago

I've rebased the pull request.

Pull-Request has been merged by mkasik

3 years ago