From df945b598be8b5b0f0210812630ef148e980d4ec1087776d89f8e3e2888c8f48 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Fri, 12 Aug 2022 13:45:34 +0000
Subject: [PATCH] - spec-cleaner

OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=180
---
 freetype2.changes |  5 +++++
 freetype2.spec    |  9 ++++-----
 ft2demos.spec     | 20 ++++----------------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/freetype2.changes b/freetype2.changes
index 82901df..5063e99 100644
--- a/freetype2.changes
+++ b/freetype2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Aug 12 13:44:34 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- spec-cleaner
+
 -------------------------------------------------------------------
 Fri Aug 12 12:30:19 UTC 2022 - Stephan Kulow <coolo@suse.com>
 
diff --git a/freetype2.spec b/freetype2.spec
index a6e1d32..b56f724 100644
--- a/freetype2.spec
+++ b/freetype2.spec
@@ -29,9 +29,9 @@ Source1:        https://downloads.sourceforge.net/project/freetype/freetype-docs
 Source2:        %{name}.sh
 Source10:       https://downloads.sourceforge.net/project/freetype/freetype2/%{version}/freetype-%{version}.tar.xz.sig
 Source11:       https://downloads.sourceforge.net/project/freetype/freetype-docs/%{version}/freetype-doc-%{version}.tar.xz.sig
+Source12:       freetype2.keyring
 Source20:       https://downloads.sourceforge.net/project/freetype/freetype-demos/%{version}/ft2demos-%{version}.tar.xz
 Source21:       https://downloads.sourceforge.net/project/freetype/freetype-demos/%{version}/ft2demos-%{version}.tar.xz.sig
-Source12:       freetype2.keyring
 Source1000:     baselibs.conf
 Patch0:         bugzilla-308961-cmex-workaround.patch
 # PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc
@@ -114,15 +114,15 @@ export CFLAGS="%{optflags} -D_GNU_SOURCE $(getconf LFS_CFLAGS)"
 	--with-zlib \
     --enable-freetype-config \
 	--disable-static
-make %{?_smp_mflags} ANSIFLAGS=
+%make_build ANSIFLAGS=
 
 cd ft2demos-%{version}
-make %{?_smp_mflags} TOP_DIR=..  $PWD/bin/ftdump
+%make_build TOP_DIR=..  $PWD/bin/ftdump
 
 %install
 %make_install
 cd ft2demos-%{version}
-../builds/unix/libtool --mode=install /usr/bin/install -c bin/ftdump %{buildroot}%_bindir/ftdump
+../builds/unix/libtool --mode=install %{_bindir}/install -c bin/ftdump %{buildroot}%{_bindir}/ftdump
 cd ..
 install -Dm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
 
@@ -152,7 +152,6 @@ rm %{buildroot}%{_libdir}/libfreetype.la
 %{_datadir}/aclocal
 
 %files -n ftdump
-%defattr(-,root,root)
 %{_bindir}/ftdump
 
 %changelog
diff --git a/ft2demos.spec b/ft2demos.spec
index eadaaed..a39cc07 100644
--- a/ft2demos.spec
+++ b/ft2demos.spec
@@ -63,7 +63,6 @@ Requires:       ftstring = %{version}-%{release}
 Requires:       ftvalid = %{version}-%{release}
 Requires:       ftview = %{version}-%{release}
 Conflicts:      dtc < 1.4.0
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Freetype2 utilities and demo programs.
@@ -183,16 +182,17 @@ export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)"
     --enable-static \
     --without-bzip2
 
-make %{?_smp_mflags}
+%make_build
 pushd ..
     ln -s freetype-%{freetype_version} freetype
     cd ft2demos-%{version}
-    make %{?_smp_mflags}
+    %make_build
 
     cd src/ftinspect
     sed -i s/"-isystem "/"-I "/ ftinspect.pro
+# FIXME: you should use the %%qmake5 macro
     qmake-qt5 ftinspect.pro
-    make
+    %make_build
 popd
 
 %install
@@ -212,51 +212,39 @@ popd
 %{buildroot}%{_bindir}/ftbench -c 1 %{SOURCE1016}
 
 %files
-%defattr(-,root,root)
 %doc README
 
 %files -n ftbench
-%defattr(-,root,root)
 %{_bindir}/ftbench
 
 %files -n ftdiff
-%defattr(-,root,root)
 %{_bindir}/ftdiff
 
 %files -n ftgamma
-%defattr(-,root,root)
 %{_bindir}/ftgamma
 
 %files -n ftgrid
-%defattr(-,root,root)
 %{_bindir}/ftgrid
 
 %files -n ftinspect
-%defattr(-,root,root)
 %{_bindir}/ftinspect
 
 %files -n ftlint
-%defattr(-,root,root)
 %{_bindir}/ftlint
 
 %files -n ftmulti
-%defattr(-,root,root)
 %{_bindir}/ftmulti
 
 %files -n ftsdf
-%defattr(-,root,root)
 %{_bindir}/ftsdf
 
 %files -n ftstring
-%defattr(-,root,root)
 %{_bindir}/ftstring
 
 %files -n ftvalid
-%defattr(-,root,root)
 %{_bindir}/ftvalid
 
 %files -n ftview
-%defattr(-,root,root)
 %{_bindir}/ftview
 
 %changelog