re-entrant install, cosmetics

[packages/fonts-TTF-RedHat-liberation.git] / fonts-TTF-RedHat-liberation.spec

diff --git a/fonts-TTF-RedHat-liberation.spec b/fonts-TTF-RedHat-liberation.spec
index 74483ddc8cb8d8f8e501c14a05fb62887857e4c4..22ddae58ba081394da7edd83314a69ee83530de9 100644 (file)
--- a/fonts-TTF-RedHat-liberation.spec
+++ b/fonts-TTF-RedHat-liberation.spec
@@ -7,7 +7,7 @@ Epoch:          1
 License:       OFL
 Group:         Fonts
 Source0:       https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-%{version}.tar.gz
-# Source0-md5: 293b364f3de019f0b19ddd54d36737e6
+# Source0-md5: 5b5055ed755025891f908b7726fea482
 Source1:       generate.pe
 Source2:       59-liberation-mono.conf
 Source3:       59-liberation-sans.conf
@@ -44,27 +44,25 @@ Bitstream Vera Sans Mono).
 
 %prep
 %setup -q -n liberation-fonts-%{version}
-install -m755 %{SOURCE1} .
+install -p %{SOURCE1} .
 
 %build
 rm -f *.ttf
 ./generate.pe src/*.sfd
 
-%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_ttffontsdir}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
-
 mv LiberationMono.ttf LiberationMono-Regular.ttf
 mv LiberationSerif.ttf LiberationSerif-Regular.ttf
 mv LiberationSans.ttf LiberationSans-Regular.ttf
 
-cp -a *.ttf $RPM_BUILD_ROOT%{_ttffontsdir}
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_ttffontsdir},%{_sysconfdir}/fonts/{conf.d,conf.avail}}
+
+cp -p *.ttf $RPM_BUILD_ROOT%{_ttffontsdir}
 
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail/59-liberation-mono.conf
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail/59-liberation-sans.conf
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail/59-liberation-serif.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail/59-liberation-mono.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail/59-liberation-sans.conf
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail/59-liberation-serif.conf
 
 ln -s ../conf.avail/59-liberation-mono.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 ln -s ../conf.avail/59-liberation-sans.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d