- parse @DATADIR@ macro in license_installer.sh

[packages/fonts-TTF-microsoft.git] / fonts-TTF-microsoft.spec

diff --git a/fonts-TTF-microsoft.spec b/fonts-TTF-microsoft.spec
index 3ef8839fef4aa9894993d8a994e1176ede23c0cf..d9d25a2b13e6f8d2735427a5f70964c0d6b39bfb 100644 (file)
--- a/fonts-TTF-microsoft.spec
+++ b/fonts-TTF-microsoft.spec
@@ -5,18 +5,18 @@
 #
 # Conditional build:
 %bcond_with    license_agreement       # generates package
-#
+
 %define                base_name       fonts-TTF-microsoft
-Summary:       Microsoft True Type fonts
-Summary(pl.UTF-8):   Fonty True Type firmy Microsoft
+%define                rel     9
+Summary:       Microsoft TrueType fonts
+Summary(pl.UTF-8):     Fonty TrueType firmy Microsoft
 %if %{with license_agreement}
 Name:          %{base_name}
 %else
 Name:          %{base_name}-installer
 %endif
-%define                _rel    8
 Version:       20020525
-Release:       %{_rel}%{?with_license_agreement:wla}
+Release:       %{rel}%{?with_license_agreement:wla}
 License:       Microsoft EULA (for non-commercial use)
 Group:         Fonts
 %if %{with license_agreement}
@@ -56,7 +56,7 @@ Requires:     fontpostinst
 %else
 Requires:      cabextract
 Requires:      mktemp > 1.5-18
-Requires:      rpm-build-tools
+Requires:      rpm-build-tools >= 4.4.35
 %endif
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,10 +64,10 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                ttffontsdir     %{_fontsdir}/TTF
 
 %description
-Microsoft free True Type fonts collection.
+Microsoft free TrueType fonts collection.
 
 %description -l pl.UTF-8
-Kolekcja darmowych fontów True Type firmy Microsoft.
+Kolekcja darmowych fontów TrueType firmy Microsoft.
 
 %prep
 %if %{with license_agreement}
@@ -89,6 +89,7 @@ sed -e '
        s-@VERSION@-%{version}-g
        s-@RELEASE@-%{release}-g
        s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g
+       s,@DATADIR@,%{_datadir}/%{base_name},g
        s,@LICENSE@,%{_datadir}/%{base_name}/Microsoft-EULA.txt,
 ' %{SOURCE21} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install