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 6556fb8e6b01d08109ed97254d5bea4b4e016dd2..22ddae58ba081394da7edd83314a69ee83530de9 100644 (file)
--- a/fonts-TTF-RedHat-liberation.spec
+++ b/fonts-TTF-RedHat-liberation.spec
@@ -1,17 +1,19 @@
 Summary:       Fonts to replace commonly used Microsoft Windows Fonts
 Summary(pl.UTF-8):     Fonty zastępujące popularne fonty z Microsoft Windows
 Name:          fonts-TTF-RedHat-liberation
-Version:       1.07.0
-Release:       1
+Version:       2.00.0
+Release:       2
 Epoch:         1
-License:       GPL v2 + exceptions
+License:       OFL
 Group:         Fonts
 Source0:       https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-%{version}.tar.gz
-# Source0-md5: 87ba9eea831ebc6fab9578abcebda9a5
-Source1:       %{name}.fontconfig
+# Source0-md5: 5b5055ed755025891f908b7726fea482
+Source1:       generate.pe
+Source2:       59-liberation-mono.conf
+Source3:       59-liberation-sans.conf
+Source4:       59-liberation-serif.conf
 URL:           https://fedorahosted.org/liberation-fonts/
 BuildRequires: fontforge >= 20090923
-BuildRequires: unzip
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/TTF
 Obsoletes:     liberation-fonts-ttf
@@ -42,19 +44,29 @@ Bitstream Vera Sans Mono).
 
 %prep
 %setup -q -n liberation-fonts-%{version}
+install -p %{SOURCE1} .
 
 %build
-%{__make}
+rm -f *.ttf
+./generate.pe src/*.sfd
+
+mv LiberationMono.ttf LiberationMono-Regular.ttf
+mv LiberationSerif.ttf LiberationSerif-Regular.ttf
+mv LiberationSans.ttf LiberationSans-Regular.ttf
 
 %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
+install -d $RPM_BUILD_ROOT{%{_ttffontsdir},%{_sysconfdir}/fonts/{conf.d,conf.avail}}
+
+cp -p *.ttf $RPM_BUILD_ROOT%{_ttffontsdir}
+
+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
 
-cp -a liberation-*/*.ttf $RPM_BUILD_ROOT%{_ttffontsdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail/60-liberation.conf
-ln -s ../conf.avail/60-liberation.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+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
+ln -s ../conf.avail/59-liberation-serif.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,10 +79,9 @@ fontpostinst TTF
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog License.txt README
-%{_ttffontsdir}/LiberationMono-*.ttf
-%{_ttffontsdir}/LiberationSans-*.ttf
-%{_ttffontsdir}/LiberationSansNarrow-*.ttf
-%{_ttffontsdir}/LiberationSerif-*.ttf
-%{_sysconfdir}/fonts/conf.avail/60-liberation.conf
-%{_sysconfdir}/fonts/conf.d/60-liberation.conf
+%doc AUTHORS ChangeLog README TODO
+%{_ttffontsdir}/LiberationMono*.ttf
+%{_ttffontsdir}/LiberationSans*.ttf
+%{_ttffontsdir}/LiberationSerif*.ttf
+%{_sysconfdir}/fonts/conf.avail/59-liberation-*.conf
+%{_sysconfdir}/fonts/conf.d/59-liberation-*.conf