X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=fonts-TTF-microsoft-tahoma.spec;h=4633cbfd38483e3088fc9251c5f0d719f37deb03;hb=HEAD;hp=f9bfb300b1e444e8116ba1a25bb5f5b40db4e005;hpb=ed7d13f3434e0967a350ac8ef047c92d0c5254c4;p=packages%2Ffonts-TTF-microsoft-tahoma.git

diff --git a/fonts-TTF-microsoft-tahoma.spec b/fonts-TTF-microsoft-tahoma.spec
index f9bfb30..4c1d91e 100644
--- a/fonts-TTF-microsoft-tahoma.spec
+++ b/fonts-TTF-microsoft-tahoma.spec
@@ -3,15 +3,15 @@
 %bcond_with	license_agreement	# generates package (requires Windows license)
 #
 %define		base_name		fonts-TTF-microsoft-tahoma
-Summary:	Microsoft Tahoma True Type font
-Summary(pl):	Font True Type Tahoma firmy Microsoft
+%define		_rel			6
+Summary:	Microsoft Tahoma TrueType font
+Summary(pl.UTF-8):	Font TrueType Tahoma firmy Microsoft
 %if %{with license_agreement}
 Name:		%{base_name}
 %else
 Name:		%{base_name}-installer
 %endif
 Version:	20020525
-%define		_rel	2
 Release:	%{_rel}%{?with_license_agreement:wla}
 # part of IE update - requires Windows license to use
 License:	Windows EULA
@@ -24,9 +24,11 @@ BuildRequires:	cabextract
 Requires(post,postun):	fontpostinst
 Requires:	%{_fontsdir}/TTF
 %else
-Source1:	license-installer.sh
+Source1:	http://svn.pld-linux.org/svn/license-installer/license-installer.sh
+# Source1-md5:  329c25f457fea66ec502b7ef70cb9ede
 Requires:	cabextract
-Requires:	rpm-build-tools
+Requires:	rpm-build-tools >= 4.4.37
+Requires:	rpmbuild(macros) >= 1.544
 %endif
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -34,10 +36,10 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		ttffontsdir	%{_fontsdir}/TTF
 
 %description
-Microsoft Tahoma True Type font.
+Microsoft Tahoma TrueType font.
 
-%description -l pl
-Font True Type Tahoma firmy Microsoft.
+%description -l pl.UTF-8
+Font TrueType Tahoma firmy Microsoft.
 
 %prep
 %if %{with license_agreement}
@@ -47,7 +49,7 @@ Font True Type Tahoma firmy Microsoft.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%if %{without license_agreement}
+%if !%{with license_agreement}
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}}
 
 sed -e '
@@ -57,6 +59,7 @@ sed -e '
 	s-@RELEASE@-%{release}-g
 	s,@USE_DISTFILES@,no,g
 	s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g
+	s,@DATADIR@,%{_datadir}/%{base_name},g
 ' %{SOURCE1} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
 
 install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}