re-entrant install, cosmetics

diff --git a/fonts-TTF-RedHat-liberation.spec b/fonts-TTF-RedHat-liberation.spec
index 90224139a0a5f1b6109b126ad9243ee30a6136f7..22ddae58ba081394da7edd83314a69ee83530de9 100644 (file)
--- a/fonts-TTF-RedHat-liberation.spec
+++ b/fonts-TTF-RedHat-liberation.spec
@@ -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

diff --git a/generate.pe b/generate.pe
old mode 100644 (file)
new mode 100755 (executable)
index bf9bcb2..0b97159
--- a/generate.pe
+++ b/generate.pe
@@ -12,8 +12,8 @@ endif
 i = 1
 while ( i < $argc )
   Open($argv[i], 1)
-  #Use gen_flags=Defualt fmflags value as -1  
-  gen_flags = -1 
+  #Use gen_flags=Defualt fmflags value as -1
+  gen_flags = -1
   Generate("" + $fontname + ".ttf", "", gen_flags)
   i++
 endloop