Author: pawelz Date: Sat Dec 26 13:00:23 2009 GMT Module: packages Tag: HEAD ---- Log message: - updated to new CVS layout - switch to license-installer.sh from SVN/DistFiles - R: rpm-build-tools >= 4.4.35 (due to new CVS layout) - parse @DATADIR@ macro from from new license-installer.sh - rel 4
---- Files affected: packages/fonts-TTF-microsoft-tahoma: fonts-TTF-microsoft-tahoma.spec (1.14 -> 1.15) , license-installer.sh (1.11 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/fonts-TTF-microsoft-tahoma/fonts-TTF-microsoft-tahoma.spec diff -u packages/fonts-TTF-microsoft-tahoma/fonts-TTF-microsoft-tahoma.spec:1.14 packages/fonts-TTF-microsoft-tahoma/fonts-TTF-microsoft-tahoma.spec:1.15 --- packages/fonts-TTF-microsoft-tahoma/fonts-TTF-microsoft-tahoma.spec:1.14 Tue Mar 25 00:04:13 2008 +++ packages/fonts-TTF-microsoft-tahoma/fonts-TTF-microsoft-tahoma.spec Sat Dec 26 14:00:18 2009 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 20020525 -%define _rel 3 +%define _rel 4 Release: %{_rel}%{?with_license_agreement:wla} # part of IE update - requires Windows license to use License: Windows EULA @@ -25,9 +25,10 @@ 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: 4fb1600353dd57fe088e0b12fb0ecac2 Requires: cabextract -Requires: rpm-build-tools +Requires: rpm-build-tools >= 4.4.35 %endif BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -58,6 +59,7 @@ 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} @@ -103,6 +105,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.15 2009/12/26 13:00:18 pawelz +- updated to new CVS layout +- switch to license-installer.sh from SVN/DistFiles +- R: rpm-build-tools >= 4.4.35 (due to new CVS layout) +- parse @DATADIR@ macro from from new license-installer.sh +- rel 4 + Revision 1.14 2008/03/24 23:04:13 qboosh - s/True Type/TrueType/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fonts-TTF-microsoft-tahoma/fonts-TTF-microsoft-tahoma.spec?r1=1.14&r2=1.15&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit