[asl: 1/2] Update to latest upstream snapshot.
Eric Smith
brouhaha at fedoraproject.org
Sun Jan 22 06:42:28 UTC 2012
commit 396a27210507bf917b7c5626241d3e1b846ef161
Author: Eric Smith <eric at brouhaha.com>
Date: Sat Jan 21 22:44:47 2012 -0800
Update to latest upstream snapshot.
.gitignore | 1 +
asl-install.sh.patch | 19 ++++++++++---------
asl.spec | 13 +++++++++----
sources | 2 +-
4 files changed, 21 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 127c9c0..6cf1761 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
asl-current-142-bld77-clean.tar.bz2
/asl-current-142-bld79.tar.bz2
/asl-current-142-bld81.tar.bz2
+/asl-current-142-bld82.tar.bz2
diff --git a/asl-install.sh.patch b/asl-install.sh.patch
index 28ba0fb..652287c 100644
--- a/asl-install.sh.patch
+++ b/asl-install.sh.patch
@@ -1,6 +1,7 @@
---- install.sh 2007-05-19 19:14:51.000000000 -0700
-+++ install.sh 2010-04-09 12:04:27.000000000 -0700
-@@ -31,7 +31,6 @@
+diff -up asl-142-Bld82/install.sh.install asl-142-Bld82/install.sh
+--- asl-142-Bld82/install.sh.install 2012-01-14 06:24:21.000000000 -0800
++++ asl-142-Bld82/install.sh 2012-01-21 22:29:48.614330602 -0800
+@@ -31,7 +31,6 @@ if [ "${BINPATH}" != "" ]; then
chmod 755 ${BINPATH}
for i in asl plist alink pbind p2hex p2bin; do
echo ${BINPATH}/$i
@@ -8,12 +9,12 @@
cp $i ${BINPATH}
chmod 755 ${BINPATH}/$i
done
-@@ -73,7 +73,7 @@
- chmod 755 ${DOCPATH}
+@@ -74,7 +73,7 @@ if [ "${DOCPATH}" != "" ]; then
for i in DE EN; do
- echo ${DOCPATH}/as-$i.doc
-- cp doc_$i/as.doc ${DOCPATH}/as-$i.doc
-+ cp doc_$i/as.doc ${DOCPATH}/as-$i.txt
+ if [ -f doc_$i/as.html ]; then
+ echo ${DOCPATH}/as-$i.doc
+- cp doc_$i/as.doc ${DOCPATH}/as-$i.doc
++ cp doc_$i/as.doc ${DOCPATH}/as-$i.txt
+ fi
echo ${DOCPATH}/as-$i.tex
cp doc_$i/as.tex ${DOCPATH}/as-$i.tex
- if [ -f doc_$i/as.html ]; then
diff --git a/asl.spec b/asl.spec
index 2aa2a5c..56ce480 100644
--- a/asl.spec
+++ b/asl.spec
@@ -6,12 +6,12 @@
#
# Spec file for Fedora modified by Eric Smith <eric at brouhaha.com>
-%global patchlevel bld81
+%global patchlevel bld82
Name: asl
URL: http://john.ccac.rwth-aachen.de:8000/as/index.html
Version: 1.42
-Release: 0.9.%{patchlevel}%{?dist}
+Release: 0.10.%{patchlevel}%{?dist}
Group: Development/Languages
License: GPLv2+
Summary: Macro Assembler AS
@@ -30,11 +30,13 @@ embedded processors and single-board computers, CPU families that are
used in workstations and PCs in the target list.
%prep
-%setup -q -n asl-current
+# It's a shame that the directory name has 142 instead of 1.42, and Bld82
+# instead of bld82. Makes use of variable substitution difficult.
+%setup -q -n asl-142-Bld82
%patch0 -p0 -b .m-def
%patch1 -p0 -b .sysdefs
-%patch2 -p0 -b .install
+%patch2 -p1 -b .install
%patch3 -p0 -b .destdir
%build
@@ -83,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
%lang(de) %doc doc/as-DE.html doc/as-DE.txt doc/as-DE.ps doc/as-DE.pdf doc/as-DE.dvi
%changelog -n asl
+* Sat Jan 21 2012 Eric Smith <eric at brouhaha.com> 1.42-0.10.bld82
+- updated to latest upstream snapshot
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.42-0.9.bld81
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 6b6dbe7..6ccdfcb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aff34f545f6b4c6d390ee1aa5b55d7e8 asl-current-142-bld81.tar.bz2
+03dbd1b759bbe980d076c9f7d2feb1cb asl-current-142-bld82.tar.bz2
More information about the scm-commits
mailing list