Author: glen Date: Sun Aug 28 15:40:03 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use shared license-installer.sh script from SOURCES - includes copy-pasto fixes, like using inexistent Microsot-EULA.txt - rel 2
---- Files affected: SPECS: fonts-TTF-Microsoft-ArialUnicode.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/fonts-TTF-Microsoft-ArialUnicode.spec diff -u SPECS/fonts-TTF-Microsoft-ArialUnicode.spec:1.5 SPECS/fonts-TTF-Microsoft-ArialUnicode.spec:1.6 --- SPECS/fonts-TTF-Microsoft-ArialUnicode.spec:1.5 Mon Jun 6 10:18:56 2005 +++ SPECS/fonts-TTF-Microsoft-ArialUnicode.spec Sun Aug 28 17:39:57 2005 @@ -12,7 +12,7 @@ Name: %{base_name}-installer %endif Version: 1.0 -Release: 1%{?with_license_agreement:wla} +Release: 2%{?with_license_agreement:wla} # part of MS Office - may require Office license to use License: ? Group: Fonts @@ -24,6 +24,7 @@ Requires: %{_fontsdir}/TTF Requires(post,postun): fontpostinst %else +Source0: license-installer.sh Requires: cabextract Requires: rpm-build-tools Requires: wget @@ -35,25 +36,23 @@ %description Microsoft Arial Unicode True Type font. -%if ! %{with license_agreement} +%if %{without license_agreement} License issues made us not to include inherent files into this package by default (it probably requires MS Office 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 -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD/<your_arch>/PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %description -l pl Font True Type Arial Unicode firmy Microsoft. -%if ! %{with license_agreement} +%if %{without license_agreement} Kwestie licencji zmusiły nas do niedołączania do tego pakietu istotnych plików (prawdopodobnie wymaga licencji na MS Office). 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 -%{base_name}.install --with license_agreement ftp://ftp.pld-linux.org/dists/ac/PLD/<your_arch>/PLD/RPMS/%{base_name}-{version}-{release}.src.rpm %endif %prep @@ -64,63 +63,16 @@ %install rm -rf $RPM_BUILD_ROOT -%if ! %{with license_agreement} +%if %{without license_agreement} install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}} -cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install -#!/bin/sh -if [ "$1" = "--with" -a "$2" = "license_agreement" ] -then - TMPDIR=`rpm --eval "%%{tmpdir}"`; export TMPDIR - SPECDIR=`rpm --eval "%%{_specdir}"`; export SPECDIR - SRPMDIR=`rpm --eval "%%{_srcrpmdir}"`; export SRPMDIR - SOURCEDIR=`rpm --eval "%%{_sourcedir}"`; export SOURCEDIR - BUILDDIR=`rpm --eval "%%{_builddir}"`; export BUILDDIR - RPMDIR=`rpm --eval "%%{_rpmdir}"`; export RPMDIR - BACKUP_SPEC=0 - mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR - if [ -f $SPECDIR/%{base_name}.spec ]; then - BACKUP_SPEC=1 - mv -f $SPECDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec.prev - fi - if echo "$3" | grep '\.src\.rpm$' >/dev/null; then - ( cd $SRPMDIR - if echo "$3" | grep '://' >/dev/null; then - wget --passive-ftp -t0 "$3" - else - cp -f "$3" . - fi - rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i %{base_name}.spec ) ) - if ! cp -i $TMPDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec; then - exit 1 - fi - else - if ! cp -i "$3" $SPECDIR; then - exit 1 - fi - fi - ( cd $SPECDIR - %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec - if [ "$?" -ne 0 ]; then - exit 2 - fi - RPMNAME=%{base_name}-%{version}-%{release}wla.noarch.rpm - rpm -U $RPMDIR/$RPMNAME || \ - echo -e "Install manually the file:\n $RPMDIR/$RPMNAME" ) - if [ "$BACKUP_SPEC" -eq 1 ]; then - mv -f $SPECDIR/%{base_name}.spec.prev $SPECDIR/%{base_name}.spec - fi -else - cat %{_datadir}/%{base_name}/Microsot-EULA.txt - 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: - -$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec -" -fi -EOF +sed -e ' + s/@BASE_NAME@/%{base_name}/g + s/@TARGET_CPU@/%{_target_cpu}/g + [EMAIL PROTECTED]@-%{version}-g + [EMAIL PROTECTED]@-%{release}-g + s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g +' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name} @@ -165,6 +117,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2005/08/28 15:39:57 glen +- use shared license-installer.sh script from SOURCES +- includes copy-pasto fixes, like using inexistent Microsot-EULA.txt +- rel 2 + Revision 1.5 2005/06/06 08:18:56 glen - simplification fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/fonts-TTF-Microsoft-ArialUnicode.spec?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit