Author: pawelz Date: Mon Oct 26 08:29:07 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- use new cvs layout
- BR rpm-build-tools >= 0:4.4.35 (needs builder.sh that uses new cvs layout)
---- Files affected:
packages/fonts-TTF-microsoft:
fonts-TTF-microsoft.spec (1.36 -> 1.37) , license-installer.sh (1.11 ->
1.12)
---- Diffs:
================================================================
Index: packages/fonts-TTF-microsoft/fonts-TTF-microsoft.spec
diff -u packages/fonts-TTF-microsoft/fonts-TTF-microsoft.spec:1.36
packages/fonts-TTF-microsoft/fonts-TTF-microsoft.spec:1.37
--- packages/fonts-TTF-microsoft/fonts-TTF-microsoft.spec:1.36 Tue Mar 25
00:04:13 2008
+++ packages/fonts-TTF-microsoft/fonts-TTF-microsoft.spec Mon Oct 26
09:29:02 2009
@@ -57,7 +57,7 @@
%else
Requires: cabextract
Requires: mktemp > 1.5-18
-Requires: rpm-build-tools
+Requires: rpm-build-tools > 0:4.4.35
%endif
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -139,6 +139,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.37 2009/10/26 08:29:02 pawelz
+- use new cvs layout
+- BR rpm-build-tools >= 0:4.4.35 (needs builder.sh that uses new cvs layout)
+
Revision 1.36 2008/03/24 23:04:13 qboosh
- s/True Type/TrueType/
================================================================
Index: packages/fonts-TTF-microsoft/license-installer.sh
diff -u packages/fonts-TTF-microsoft/license-installer.sh:1.11
packages/fonts-TTF-microsoft/license-installer.sh:1.12
--- packages/fonts-TTF-microsoft/license-installer.sh:1.11 Sat Apr 22
20:44:56 2006
+++ packages/fonts-TTF-microsoft/license-installer.sh Mon Oct 26 09:29:02 2009
@@ -1,12 +1,11 @@
#!/bin/sh
if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then
tmp=$(mktemp -d)
- SPECDIR=`rpm --define "_topdir $tmp" --eval "%{_specdir}"`
SRPMDIR=`rpm --define "_topdir $tmp" --eval "%{_srcrpmdir}"`
- SOURCEDIR=`rpm --define "_topdir $tmp" --eval "%{_sourcedir}"`
BUILDDIR=`rpm --define "_topdir $tmp" --eval "%{_builddir}"`
RPMDIR=`rpm --define "_topdir $tmp" --eval "%{_rpmdir}"`
- mkdir -p $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR
+ PACKAGEDIR="$tmp/packages/acroread"
+ mkdir -p $SRPMDIR $RPMDIR $SRPMDIR $BUILDDIR $PACKAGEDIR
if echo "$3" | grep '\.src\.rpm$' >/dev/null; then
(
@@ -16,20 +15,20 @@
else
cp -f "$3" $SRPMDIR
fi
- rpm2cpio `basename "$3"` | ( cd $SPECDIR; cpio -i
@[email protected] )
+ rpm2cpio `basename "$3"` | ( cd $PACKAGEDIR; cpio -i
@[email protected] )
if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then
- rpm2cpio `basename "$3"` | ( cd $SOURCEDIR; cpio -i
@COPYSOURCES@ )
+ rpm2cpio `basename "$3"` | ( cd $PACKAGEDIR; cpio -i
@COPYSOURCES@ )
fi
)
else
- cp -i "$3" $SPECDIR || exit 1
+ cp -i "$3" $PACKAGEDIR || exit 1
if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then
for i in @COPYSOURCES@; do
- cp -i @DATADIR@/$i $SOURCEDIR/$i || exit 1
+ cp -i @DATADIR@/$i $PACKAGEDIR/$i || exit 1
done
fi
fi
- ( cd $SPECDIR
+ ( cd $PACKAGEDIR
nd=
if [ '@USE_DISTFILES@' = 'no' ]; then
nd=-nd
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fonts-TTF-microsoft/fonts-TTF-microsoft.spec?r1=1.36&r2=1.37&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fonts-TTF-microsoft/license-installer.sh?r1=1.11&r2=1.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
