From 7490e2e35ccdb2bf24ea548adc64fdb17adabca2 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: May 29 2015 16:07:57 +0000
Subject: Drop %defattr, use %license, and other modernizations


---

diff --git a/fontpackages.spec b/fontpackages.spec
index c00fc4e..d51c331 100644
--- a/fontpackages.spec
+++ b/fontpackages.spec
@@ -2,6 +2,9 @@
 %global ftcgtemplatedir %{_datadir}/fontconfig/templates/
 %global rpmmacrodir     %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d/)
 
+# Use the same directory of the main package for subpackage licence and docs
+%global _docdir_fmt %{name}
+
 Name:    fontpackages
 Version: 1.44
 Release: 11%{?dist}
@@ -56,7 +59,7 @@ Requires: fedora-packager
 %endif
 
 %description tools
-This package contains tools used to check fonts and font packages
+This package contains tools used to check fonts and font packages.
 
 
 %prep
@@ -66,14 +69,10 @@ sed -i 's|/usr/bin/fedoradev-pkgowners|""|g' bin/repo-font-audit
 %endif
 
 %build
-for file in bin/repo-font-audit bin/compare-repo-font-audit ; do
 sed -i "s|^DATADIR\([[:space:]]*\)\?=\(.*\)$|DATADIR=%{_datadir}/%{name}|g" \
-  $file
-done
+  bin/repo-font-audit bin/compare-repo-font-audit
 
 %install
-rm -fr %{buildroot}
-
 # Pull macros out of macros.fonts and emulate them during install
 for dir in fontbasedir        fontconfig_masterdir \
            fontconfig_confdir fontconfig_templatedir ; do
@@ -102,24 +101,18 @@ install -m 0755 -p private/core-fonts-report \
 install -m 0755 -p bin/*                       %{buildroot}%{_bindir}
 
 cat <<EOF > %{name}-%{version}.files
-%defattr(0644,root,root,0755)
 %dir ${_fontbasedir}
 %dir ${_fontconfig_masterdir}
 %dir ${_fontconfig_confdir}
 %dir ${_fontconfig_templatedir}
 EOF
 
-%clean
-rm -fr %{buildroot}
-
-
 %files filesystem -f %{name}-%{version}.files
-%defattr(0644,root,root,0755)
 %dir %{_datadir}/fontconfig
 
 %files devel
-%defattr(0644,root,root,0755)
-%doc license.txt readme.txt
+%license license.txt
+%doc readme.txt
 %config(noreplace) %{spectemplatedir}/*.spec
 %{rpmmacrodir}/macros*
 %dir %{ftcgtemplatedir}
@@ -127,11 +120,10 @@ rm -fr %{buildroot}
 %{ftcgtemplatedir}/*txt
 
 %files tools
-%defattr(0644,root,root,0755)
-%doc license.txt readme.txt
+%license license.txt
+%doc readme.txt
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/repo-font-audit.mk
-%defattr(0755,root,root,0755)
 %{_datadir}/%{name}/core-fonts-report
 %{_datadir}/%{name}/font-links-report
 %{_datadir}/%{name}/fonts-report