SPECS: fonts-TTF-microsoft-tahoma.spec - wget required by rpm-buil...

[glen]

Author: glen                         Date: Sat Apr 22 18:46:48 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- wget required by rpm-build-tools
- cleanups

---- Files affected:
SPECS:
   fonts-TTF-microsoft-tahoma.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/fonts-TTF-microsoft-tahoma.spec
diff -u SPECS/fonts-TTF-microsoft-tahoma.spec:1.8 SPECS/fonts-TTF-microsoft-tahoma.spec:1.9
--- SPECS/fonts-TTF-microsoft-tahoma.spec:1.8	Mon Jan  2 12:01:33 2006
+++ SPECS/fonts-TTF-microsoft-tahoma.spec	Sat Apr 22 20:46:43 2006
@@ -1,33 +1,33 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	license_agreement	# generates package (may require Windows license?)
+%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		base_name		fonts-TTF-microsoft-tahoma
 %if %{with license_agreement}
 Name:		%{base_name}
 %else
 Name:		%{base_name}-installer
 %endif
 Version:	20020525
-Release:	2%{?with_license_agreement:wla}
-# part of IE update - may require Windows license to use
-License:	?
+%define		_rel	2
+Release:	%{_rel}%{?with_license_agreement:wla}
+# part of IE update - requires Windows license to use
+License:	Windows EULA
 Group:		Fonts
 %if %{with license_agreement}
-# also at http://dl.sourceforge.net/corefonts/
 Source0:	http://download.microsoft.com/download/ie6sp1/finrel/6_sp1/W98NT42KMeXP/EN-US/IELPKTH.CAB
 # NoSource0-md5: 358584cddb75ac90472c25f01b308ebe
+NoSource:	0
 BuildRequires:	cabextract
-Requires:	%{_fontsdir}/TTF
 Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/TTF
 %else
-Source0:	license-installer.sh
+Source1:	license-installer.sh
 Requires:	cabextract
 Requires:	rpm-build-tools
-Requires:	wget
 %endif
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -36,29 +36,14 @@
 
 %description
 Microsoft Tahoma True Type font.
-%if %{without license_agreement}
-License issues made us not to include inherent files into this package
-by default (it probably requires Windows license). If you want to
-create full working package please build it with one of the following
-command:
-
-%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec
-%endif
 
 %description -l pl
 Font True Type Tahoma firmy Microsoft.
-%if %{without license_agreement}
-Kwestie licencji zmusiły nas do niedołączania do tego pakietu istotnych
-plików (prawdopodobnie wymaga licencji na Windows). Jeśli chcesz stworzyć
-w pełni funkcjonalny pakiet, zbuduj go za pomocą polecenia:
-
-%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec
-%endif
 
 %prep
 %if %{with license_agreement}
 %setup -q -c -T
-/usr/bin/cabextract -L %{SOURCE0}
+%{_bindir}/cabextract -L %{SOURCE0}
 %endif
 
 %install
@@ -71,8 +56,9 @@
 	s/@TARGET_CPU@/%{_target_cpu}/g
 	s- at VERSION@-%{version}-g
 	s- at RELEASE@-%{release}-g
+	s, at USE_DISTFILES@,no,g
 	s, at SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g
-' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
+' %{SOURCE1} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
 
 install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}
 
@@ -95,10 +81,10 @@
 %post
 echo "
 License issues made us not to include inherent files into this package
-by default (it probably requires Windows license). If you want to
-create full working package please build it with the following command:
+by default (You need Windows license). If you want to create full
+working package please build it with the following command:
 
-%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec
+%{_bindir}/%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec
 "
 %endif
 
@@ -117,6 +103,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2006/04/22 18:46:43  glen
+- wget required by rpm-build-tools
+- cleanups
+
 Revision 1.8  2006/01/02 11:01:33  glen
 - run script in %post
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/fonts-TTF-microsoft-tahoma.spec?r1=1.8&r2=1.9&f=u