Fixed a copy&paste error.

[cc65] / packages / rpm / redhat / cc65.spec

diff --git a/packages/rpm/redhat/cc65.spec b/packages/rpm/redhat/cc65.spec
index 2e748cbbcbacb009bf1d88a4a3454344ee70a1d6..e7d45c1a185830c8da627fb39c3791ef494fe8b8 100644 (file)
--- a/packages/rpm/redhat/cc65.spec
+++ b/packages/rpm/redhat/cc65.spec
@@ -11,7 +11,7 @@
 Summary: Crosscompiler/Crossassembler for 6502 systems
 %define name cc65
 Name: %{name}
-%define version 2.11.0
+%define version 2.13.0
 Version: %{version}
 Release: 1
 License: Freeware with exceptions - see docs
@@ -30,7 +30,8 @@ BuildRoot: /var/tmp/%{name}-%{version}
 A C crosscompiler for 6502 systems, including a macroassembler that
 supports 6502, 65SC02 and 65816 CPUs, a linker, an archiver and some
 other tools. To create programs for one of the supported target
-machines, you have to install at least one of the library packages.
+machines, you have to install at least one of the target platform
+packages in addition to the main package.
 
 %files
 %defattr(644,root,root,755)
@@ -48,9 +49,12 @@ machines, you have to install at least one of the library packages.
 %attr(755,root,root)                   /usr/bin/ld65
 %attr(755,root,root)                   /usr/bin/od65
 %attr(755,root,root) %dir      /usr/lib/cc65
+%attr(755,root,root) %dir      /usr/lib/cc65/cfg
 %attr(755,root,root) %dir      /usr/lib/cc65/emd
 %attr(755,root,root) %dir      /usr/lib/cc65/joy
 %attr(755,root,root) %dir      /usr/lib/cc65/lib
+%attr(755,root,root) %dir      /usr/lib/cc65/obj
+%attr(755,root,root) %dir      /usr/lib/cc65/ser
 %attr(755,root,root) %dir      /usr/lib/cc65/tgi
 %attr(755,root,root) %dir      /usr/lib/cc65/include
 %attr(644,root,root)                   /usr/lib/cc65/include/*.h
@@ -90,7 +94,6 @@ in HTML format. Other formats can be generated from the sources.
 %doc doc/internal.txt
 %doc doc/newvers.txt
 %doc samples
-%doc src/ld65/cfg/*.cfg
 
 
 
@@ -110,11 +113,13 @@ programs for the Apple ][ using the cc65 crosscompiler.
 
 %files apple2
 %attr(644,root,root)           /usr/lib/cc65/lib/apple2.lib
+%attr(644,root,root)           /usr/lib/cc65/obj/apple2-*.o
 %attr(644,root,root)           /usr/lib/cc65/emd/a2.*.emd
 %attr(644,root,root)           /usr/lib/cc65/joy/a2.*.joy
 %attr(644,root,root)           /usr/lib/cc65/mou/a2.*.mou
 %attr(644,root,root)           /usr/lib/cc65/ser/a2.*.ser
 %attr(644,root,root)           /usr/lib/cc65/tgi/a2.*.tgi
+%attr(644,root,root)                   /usr/lib/cc65/cfg/apple2-*.cfg
 
 
 
@@ -134,11 +139,13 @@ programs for the Apple //e using the cc65 crosscompiler.
 
 %files apple2enh
 %attr(644,root,root)           /usr/lib/cc65/lib/apple2enh.lib
+%attr(644,root,root)           /usr/lib/cc65/obj/apple2enh-*.o
 %attr(644,root,root)           /usr/lib/cc65/emd/a2e.*.emd
 %attr(644,root,root)           /usr/lib/cc65/joy/a2e.*.joy
 %attr(644,root,root)           /usr/lib/cc65/mou/a2e.*.mou
 %attr(644,root,root)           /usr/lib/cc65/ser/a2e.*.ser
 %attr(644,root,root)           /usr/lib/cc65/tgi/a2e.*.tgi
+%attr(644,root,root)                   /usr/lib/cc65/cfg/apple2enh-*.cfg
 
 
 
@@ -178,6 +185,7 @@ programs for the Oric Atmos using the cc65 crosscompiler.
 
 %files atmos
 %attr(644,root,root)           /usr/lib/cc65/lib/atmos.lib
+%attr(644,root,root)           /usr/lib/cc65/joy/atmos-*.joy
 %attr(644,root,root)           /usr/lib/cc65/tgi/atmos-*.tgi
 
 
@@ -339,6 +347,7 @@ programs for the Lynx Game Console using the cc65 crosscompiler.
 %files lynx
 %attr(644,root,root)           /usr/lib/cc65/lib/lynx.lib
 %attr(644,root,root)           /usr/lib/cc65/joy/lynx-*.joy
+%attr(644,root,root)           /usr/lib/cc65/ser/lynx-*.ser
 %attr(644,root,root)           /usr/lib/cc65/tgi/lynx-*.tgi
 
 
@@ -423,6 +432,7 @@ programs for the Supervision Game console using the cc65 crosscompiler.
 
 %files supervision
 %attr(644,root,root)           /usr/lib/cc65/lib/supervision.lib
+%attr(644,root,root)           /usr/lib/cc65/cfg/supervision-*.cfg
 
 
 
@@ -443,6 +453,7 @@ programs for the Commodore VIC20 using the cc65 crosscompiler.
 %files vic20
 %attr(644,root,root)           /usr/lib/cc65/lib/vic20.lib
 %attr(644,root,root)           /usr/lib/cc65/joy/vic20-*.joy
+%attr(644,root,root)                   /usr/lib/cc65/cfg/vic20-*.cfg
 
 
 
@@ -466,7 +477,7 @@ make -C doc html
 
 
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,lib/cc65/{asminc,emd,include/{em,geos,joystick,mouse,sys,tgi},joy,lib,mou,ser,tgi}}
+mkdir -p $RPM_BUILD_ROOT/usr/{bin,lib/cc65/{asminc,cfg,emd,include/{em,geos,joystick,mouse,sys,tgi},joy,lib,mou,obj,ser,tgi}}
 
 # Binaries
 install -s -m 755 src/ar65/ar65 $RPM_BUILD_ROOT/usr/bin
@@ -479,8 +490,9 @@ install -s -m 755 src/da65/da65 $RPM_BUILD_ROOT/usr/bin
 install -s -m 755 src/grc/grc $RPM_BUILD_ROOT/usr/bin
 install -s -m 755 src/ld65/ld65 $RPM_BUILD_ROOT/usr/bin
 install -s -m 755 src/od65/od65 $RPM_BUILD_ROOT/usr/bin
+
 # Libraries and includes
-install -m 644 libsrc/*.lib libsrc/*.o $RPM_BUILD_ROOT/usr/lib/cc65/lib
+install -m 644 libsrc/*.lib $RPM_BUILD_ROOT/usr/lib/cc65/lib
 install -m 644 include/*.h $RPM_BUILD_ROOT/usr/lib/cc65/include
 install -m 644 include/geos/*.h $RPM_BUILD_ROOT/usr/lib/cc65/include/geos
 install -m 644 include/em/*.h $RPM_BUILD_ROOT/usr/lib/cc65/include/em
@@ -490,6 +502,16 @@ install -m 644 include/sys/*.h $RPM_BUILD_ROOT/usr/lib/cc65/include/sys
 install -m 644 include/tgi/*.h $RPM_BUILD_ROOT/usr/lib/cc65/include/tgi
 install -m 644 asminc/*.inc $RPM_BUILD_ROOT/usr/lib/cc65/asminc
 
+# Extra object files
+for extra in libsrc/*-*.o; do
+    install -m 644 ${extra} $RPM_BUILD_ROOT/usr/lib/cc65/obj
+done
+
+# Additional linker configurations
+for config in src/ld65/cfg/*-*.cfg; do
+    install -m 644 ${config} $RPM_BUILD_ROOT/usr/lib/cc65/cfg
+done
+
 # Drivers
 install -m 644 libsrc/*.emd $RPM_BUILD_ROOT/usr/lib/cc65/emd
 install -m 644 libsrc/*.joy $RPM_BUILD_ROOT/usr/lib/cc65/joy