rpms/sjasm/devel sjasm-0.39-64bitfix.patch, NONE, 1.1 sjasm-0.39-fixmakefile.patch, NONE, 1.1 sjasm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Ian Chapman (oddsocks)
fedora-extras-commits at redhat.com
Sun Aug 20 19:43:47 UTC 2006
Author: oddsocks
Update of /cvs/extras/rpms/sjasm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28286/devel
Modified Files:
.cvsignore sources
Added Files:
sjasm-0.39-64bitfix.patch sjasm-0.39-fixmakefile.patch
sjasm.spec
Log Message:
auto-import sjasm-0.39-0.3.g1 on branch devel from sjasm-0.39-0.3.g1.src.rpm
sjasm-0.39-64bitfix.patch:
--- NEW FILE sjasm-0.39-64bitfix.patch ---
--- sjasmsrc039g1/loose.cpp.orig 2006-04-12 13:33:00.000000000 +0100
+++ sjasmsrc039g1/loose.cpp 2006-08-12 17:01:29.000000000 +0100
@@ -49,7 +49,7 @@
*ach=f;
}
fp=fopen(nieuwzp,"r"); if (fp) fclose(fp);
- return (int)fp;
+ return (long)fp;
}
#endif
sjasm-0.39-fixmakefile.patch:
--- NEW FILE sjasm-0.39-fixmakefile.patch ---
--- sjasmsrc039g1/Makefile.orig 2004-04-09 16:14:00.000000000 +0100
+++ sjasmsrc039g1/Makefile 2006-08-11 01:38:57.000000000 +0100
@@ -8,7 +8,8 @@
TARGETS = sjasm$(EXTENSION)
OBJECTS = direct.o loose.o parser.o piz80.o reader.o sjasm.o sjio.o tables.o
-BINDIR = /usr/local/bin
+BINDIR = /usr/bin
+DESTDIR =
CXXFLAGS = -Wall -O2
ifneq ($(ISMINGW),)
@@ -25,14 +26,14 @@
sjasm$(EXTENSION): $(DEPDIR) $(OBJECTS)
g++ $(LDFLAGS) -o $@ $(OBJECTS)
- strip $@
clean:
$(RM) $(OBJECTS) $(TARGETS)
$(RM) -r $(DEPDIR)
install: all
- cp -f $(TARGETS) $(BINDIR)
+ mkdir -p $(DESTDIR)/usr/bin
+ cp -f $(TARGETS) $(DESTDIR)/usr/bin
%.o : %.cpp
$(CXX) -Wp,-MD,$(DEPFILE).d $(CXXFLAGS) -c -o $@ $<
--- NEW FILE sjasm.spec ---
Name: sjasm
Version: 0.39
Release: 0.3.g1%{?dist}
Summary: A z80 cross assembler
Group: Development/Languages
License: Artistic
URL: http://www.xl2s.tk
Source0: http://home.planet.nl/~realfun/%{name}39g1.zip
Patch0: sjasm-0.39-fixmakefile.patch
Patch1: sjasm-0.39-64bitfix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
SjASM is a two pass macro Z80 cross assembler
%prep
%setup -qcn %{name}-%{version}
%patch0 -p0
%patch1 -p0
sed -i 's/\r//' sjasm.txt
%build
make -C sjasmsrc039g1 %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS -DMAX_PATH=MAXPATHLEN"
%install
rm -rf %{buildroot}
make -C sjasmsrc039g1 install DESTDIR=%{buildroot}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%doc sjasm.txt
%changelog
* Sun Aug 20 2006 Ian Chapman <packages at amiga-hardware.com> 0.39-0.3.g1%{?dist}
- Bump release in preparation for FE migration
* Sat Aug 12 2006 Ian Chapman <packages at amiga-hardware.com> 0.39-0.2.g1%{?dist}
- Added patch for compiling on 64bit systems
* Fri Aug 11 2006 Ian Chapman <packages at amiga-hardware.com> 0.39-0.1.g1%{?dist}
- Initial Release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sjasm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 20 Aug 2006 19:42:37 -0000 1.1
+++ .cvsignore 20 Aug 2006 19:43:46 -0000 1.2
@@ -0,0 +1 @@
+sjasm39g1.zip
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sjasm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 20 Aug 2006 19:42:37 -0000 1.1
+++ sources 20 Aug 2006 19:43:46 -0000 1.2
@@ -0,0 +1 @@
+7776b4adb40ec6b5f772bfa700ef905a sjasm39g1.zip
More information about the fedora-extras-commits
mailing list