commit 4dedec592b42f7725244bd9c67eb3ebf3f1e36c7 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Thu May 30 21:18:16 2024 +0200
- new URLs, updated to 0.8.6 ucsim-make.patch | 243 --------------------------------------------------- ucsim-newcmdcl.patch | 11 --- ucsim.spec | 60 ++++++++----- 3 files changed, 37 insertions(+), 277 deletions(-) --- diff --git a/ucsim.spec b/ucsim.spec index 9787140..84538fa 100644 --- a/ucsim.spec +++ b/ucsim.spec @@ -1,50 +1,64 @@ Summary: Microcontrollers simulator Summary(pl.UTF-8): Symulator mikrokontrolerów Name: ucsim -Version: 0.3.1 -Release: 2 +Version: 0.8.6 +Release: 1 Epoch: 1 -License: GPL -Group: X11/Applications -Source0: http://mazsola.iit.uni-miskolc.hu/~drdani/embedded/s51/download/unix/%{name}-%{version}.tar.gz -# Source0-md5: 9de42afa62a2f33263a3482547aa5d96 -Patch0: %{name}-make.patch -Patch1: %{name}-newcmdcl.patch -URL: http://mazsola.iit.uni-miskolc.hu/~drdani/embedded/s51/ -BuildRequires: autoconf +License: GPL v2+ +Group: Applications/Emulators +#Source0Download: https://github.com/danieldrotos/ucsim/releases +Source0: https://github.com/danieldrotos/ucsim/archive/%{name}-%{version}/%{name}-%{version}.tar.gz +# Source0-md5: 9c907cb140c2482d542dadb5d36436ff +URL: https://www.ucsim.hu/ BuildRequires: ncurses-devel >= 5.2 +BuildRequires: ncurses-ext-devel >= 5.2 BuildRequires: libstdc++-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -uCsim can be used to simulate microcontrollers. It supports MCS51 family. AVR -and Z80 support is under development. +uCsim can be used to simulate microcontrollers. It supports Intel +MCS51 family, 8080, 8085, XA, Z80, Rabbit, SM83, TLCS90, ST7, STM8, +PDK, MC6800, M68HC08, MC6809, M68HC11, M68HC12, MOS6502, PicoBlaze, +F8, p1516/p2223 and some AVR processors. %description -l pl.UTF-8 -uCsim może być używany do emulacji mikrokontrolerków. Wspiera on rodzinę -MCS51. Obsługa AVR oraz Z80 jest aktualnie rozwijana. +uCsim służy do symulowania mikrokontrolerów. Obsługuje rodzinę +procesorów Intel MCS51, 8080, 8085, XA, Z80, Rabbit, SM83, TLCS90, +ST7, STM8, PDK, MC6800, M68HC08, MC6809, M68HC11, M68HC12, MOS6502, +PicoBlaze, F8, p1516/p2223 i niektóre procesory AVR. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%setup -q -n %{name}-%{name}-%{version} %build -%{__autoconf} -%configure +%configure \ + STRIP=/bin/true %{__make} %install rm -rf $RPM_BUILD_ROOT %{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - docdir=%{_docdir}/%{name}-%{version} + DESTDIR=$RPM_BUILD_ROOT + +%{__make} -C src/apps/serio.src local_install \ + DESTDIR=$RPM_BUILD_ROOT + +%{__make} -C src/apps/ucsim.src local_install \ + DESTDIR=$RPM_BUILD_ROOT + +# packaged as %doc +%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/ucsim %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc README TODO doc/*.{html,gif,jpg} -%attr(755,root,root) %{_bindir}/* +%doc NEWS README.md docs/{stm8,*.html,*.jpg,*.png,*.svg,*.txt} +%attr(755,root,root) %{_bindir}/s51 +%attr(755,root,root) %{_bindir}/serialview +%attr(755,root,root) %{_bindir}/ucsim +%attr(755,root,root) %{_bindir}/ucsim_* +%{_mandir}/man1/ucsim.1* +%{_mandir}/man1/serialview.1* diff --git a/ucsim-make.patch b/ucsim-make.patch deleted file mode 100644 index 432e4d0..0000000 --- a/ucsim-make.patch +++ /dev/null @@ -1,243 +0,0 @@ -diff -urN ucsim-0.2.38.org/Makefile ucsim-0.2.38/Makefile ---- ucsim-0.2.38.org/Makefile Fri Feb 16 17:16:08 2001 -+++ ucsim-0.2.38/Makefile Thu Mar 29 18:33:25 2001 -@@ -33,7 +32,7 @@ - install: - $(MAKE) -f main.mk install - @for pkg in $(PKGS); do\ -- $(MAKE) -C $$pkg install ;\ -+ $(MAKE) -C $$pkg DESTDIR=$(DESTDIR) install ;\ - done - - -diff -urN ucsim-0.2.38.org/avr.src/Makefile.in ucsim-0.2.38/avr.src/Makefile.in ---- ucsim-0.2.38.org/avr.src/Makefile.in Fri Feb 16 17:16:08 2001 -+++ ucsim-0.2.38/avr.src/Makefile.in Thu Mar 29 18:20:44 2001 -@@ -56,13 +56,13 @@ - # Compiling and installing everything and runing test - # --------------------------------------------------- - install: all installdirs -- $(INSTALL) -s savr $(bindir) -+ $(INSTALL) savr $(DESTDIR)$(bindir) - - - # Deleting all the installed files - # -------------------------------- - uninstall: -- rm -f $(bindir)/savr -+ rm -f $(DESTDIR)$(bindir)/savr - - - # Performing self-test -@@ -78,7 +78,7 @@ - # Creating installation directories - # --------------------------------- - installdirs: -- test -d $(bindir) || $(INSTALL) -d $(bindir) -+ test -d $(DESTDIR)$(bindir) || $(INSTALL) -d $(DESTDIR)$(bindir) - - - # Creating dependencies -diff -urN ucsim-0.2.38.org/configure.in ucsim-0.2.38/configure.in ---- ucsim-0.2.38.org/configure.in Fri Feb 16 17:16:08 2001 -+++ ucsim-0.2.38/configure.in Thu Mar 29 18:28:53 2001 -@@ -38,8 +38,8 @@ - # Checking for header files. - # =========================================================================== - --if test -d /stuff/include; then -- CPPFLAGS="$CPPFLAGS -I/stuff/include" -+if test -d /usr/include/ncurses; then -+ CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" - fi - - AC_HEADER_STDC -@@ -105,16 +105,16 @@ - AC_CHECK_LIB(panel,panel_above, - panel_ok="yes" - curses_ok="yes" --CURSES_LIBS="-lpanel -lcurses" -+CURSES_LIBS="-lpanel -lncurses" - , - panel_ok="no" --AC_CHECK_LIB(curses,nl, -+AC_CHECK_LIB(ncurses,nl, - curses_ok="yes" --CURSES_LIBS="-lcurses" -+CURSES_LIBS="-lncurses" - , - ncurses_ok="no") - , ---lcurses) -+-lncurses) - AC_SUBST(panel_ok) - AC_SUBST(curses_ok) - AC_SUBST(CURSES_LIBS) -diff -urN ucsim-0.2.38.org/doc/Makefile.in ucsim-0.2.38/doc/Makefile.in ---- ucsim-0.2.38.org/doc/Makefile.in Fri Feb 16 17:16:08 2001 -+++ ucsim-0.2.38/doc/Makefile.in Thu Mar 29 18:20:44 2001 -@@ -34,16 +34,16 @@ - # Compiling and installing everything and runing test - # --------------------------------------------------- - install: all installdirs -- cp *.html $(docdir) -- cp *.gif $(docdir) -- cp *.jpg $(docdir) -- cp *.fig $(docdir) -+ cp *.html $(DESTDIR)$(docdir) -+ cp *.gif $(DESTDIR)$(docdir) -+ cp *.jpg $(DESTDIR)$(docdir) -+ cp *.fig $(DESTDIR)$(docdir) - - - # Deleting all the installed files - # -------------------------------- - uninstall: -- rm -f $(docdir)/* -+ rm -f $(DESTDIR)$(docdir)/* - - - # Performing self-test -@@ -59,7 +59,7 @@ - # Creating installation directories - # --------------------------------- - installdirs: -- test -d $(docdir) || $(INSTALL) -d $(docdir) -+ test -d $(DESTDIR)$(docdir) || $(INSTALL) -d $(DESTDIR)$(docdir) - - - # Creating dependencies -diff -urN ucsim-0.2.38.org/gui.src/Makefile.in ucsim-0.2.38/gui.src/Makefile.in ---- ucsim-0.2.38.org/gui.src/Makefile.in Fri Feb 16 17:16:08 2001 -+++ ucsim-0.2.38/gui.src/Makefile.in Thu Mar 29 18:20:44 2001 -@@ -66,7 +66,7 @@ - # --------------------------------------------------- - install: - @for pkg in $(PKGS); do\ -- cd $$pkg && $(MAKE) install ; cd ..;\ -+ cd $$pkg && $(MAKE) DESTDIR=$(DESTDIR) install ; cd ..;\ - done - - -@@ -74,7 +74,7 @@ - # -------------------------------- - uninstall: - @for pkg in $(PKGS); do\ -- cd $$pkg && $(MAKE) uninstall ; cd ..;\ -+ cd $$pkg && $(MAKE) DESTDIR=$(DESTDIR) uninstall ; cd ..;\ - done - - -@@ -98,7 +98,7 @@ - # --------------------------------- - installdirs: - @for pkg in $(PKGS); do\ -- cd $$pkg && $(MAKE) installdirs ; cd ..;\ -+ cd $$pkg && $(MAKE) DESTDIR=$(DESTDIR) installdirs ; cd ..;\ - done - - -diff -urN ucsim-0.2.38.org/gui.src/serio.src/Makefile.in ucsim-0.2.38/gui.src/serio.src/Makefile.in ---- ucsim-0.2.38.org/gui.src/serio.src/Makefile.in Fri Feb 16 17:16:08 2001 -+++ ucsim-0.2.38/gui.src/serio.src/Makefile.in Thu Mar 29 18:20:44 2001 -@@ -48,13 +48,13 @@ - # Compiling and installing everything and runing test - # --------------------------------------------------- - install: all installdirs -- $(INSTALL) -s serialview $(bindir) -+ $(INSTALL) serialview $(DESTDIR)$(bindir) - - - # Deleting all the installed files - # -------------------------------- - uninstall: -- rm -f $(bindir)/serialview -+ rm -f $(DESTDIR)$(bindir)/serialview - - - # Performing self-test -@@ -70,7 +70,7 @@ - # Creating installation directories - # --------------------------------- - installdirs: -- test -d $(bindir) || $(INSTALL) -d $(bindir) -+ test -d $(DESTDIR)$(bindir) || $(INSTALL) -d $(DESTDIR)$(bindir) - - - # Creating dependencies -diff -urN ucsim-0.2.38.org/main_in.mk ucsim-0.2.38/main_in.mk ---- ucsim-0.2.38.org/main_in.mk Fri Feb 16 17:16:08 2001 -+++ ucsim-0.2.38/main_in.mk Thu Mar 29 18:20:44 2001 -@@ -51,10 +51,10 @@ - # Deleting all the installed files - # -------------------------------- - uninstall: -- rm -f $(bindir)/s51 -- rm -f $(bindir)/savr -- rm -f $(bindir)/serialview -- rm -f $(bindir)/portmon -+ rm -f $(DESTDIR)$(bindir)/s51 -+ rm -f $(DESTDIR)$(bindir)/savr -+ rm -f $(DESTDIR)$(bindir)/serialview -+ rm -f $(DESTDIR)$(bindir)/portmon - - - # Performing self-test -diff -urN ucsim-0.2.38.org/s51.src/Makefile.in ucsim-0.2.38/s51.src/Makefile.in ---- ucsim-0.2.38.org/s51.src/Makefile.in Fri Feb 16 17:16:08 2001 -+++ ucsim-0.2.38/s51.src/Makefile.in Thu Mar 29 18:20:44 2001 -@@ -59,14 +59,14 @@ - # Compiling and installing everything and runing test - # --------------------------------------------------- - install: all installdirs -- if test -f s51.exe; then $(INSTALL) -s s51.exe $(bindir);fi -- if test -f s51; then $(INSTALL) -s s51 $(bindir);fi -+ if test -f s51.exe; then $(INSTALL) s51.exe $(DESTDIR)$(bindir);fi -+ if test -f s51; then $(INSTALL) s51 $(DESTDIR)$(bindir);fi - - - # Deleting all the installed files - # -------------------------------- - uninstall: -- rm -f $(bindir)/s51 -+ rm -f $(DESTDIR)$(bindir)/s51 - - - # Performing self-test -@@ -82,7 +82,7 @@ - # Creating installation directories - # --------------------------------- - installdirs: -- test -d $(bindir) || $(INSTALL) -d $(bindir) -+ test -d $(DESTDIR)$(bindir) || $(INSTALL) -d $(DESTDIR)$(bindir) - - - # Creating dependencies -diff -urN ucsim-0.2.38.org/z80.src/Makefile.in ucsim-0.2.38/z80.src/Makefile.in ---- ucsim-0.2.38.org/z80.src/Makefile.in Fri Feb 16 17:16:08 2001 -+++ ucsim-0.2.38/z80.src/Makefile.in Thu Mar 29 18:20:44 2001 -@@ -55,13 +55,13 @@ - # Compiling and installing everything and runing test - # --------------------------------------------------- - install: all installdirs -- $(INSTALL) -s sz80 $(bindir) -+ $(INSTALL) sz80 $(DESTDIR)$(bindir) - - - # Deleting all the installed files - # -------------------------------- - uninstall: -- rm -f $(bindir)/sz80 -+ rm -f $(DESTDIR)$(bindir)/sz80 - - - # Performing self-test -@@ -77,7 +77,7 @@ - # Creating installation directories - # --------------------------------- - installdirs: -- test -d $(bindir) || $(INSTALL) -d $(bindir) -+ test -d $(DESTDIR)$(bindir) || $(INSTALL) -d $(DESTDIR)$(bindir) - - - # Creating dependencies diff --git a/ucsim-newcmdcl.patch b/ucsim-newcmdcl.patch deleted file mode 100644 index be58b74..0000000 --- a/ucsim-newcmdcl.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNr ucsim-0.3.1/cmd.src/newcmdcl.h ucsim-0.3.1.new/cmd.src/newcmdcl.h ---- ucsim-0.3.1/cmd.src/newcmdcl.h Tue Jun 19 20:36:27 2001 -+++ ucsim-0.3.1.new/cmd.src/newcmdcl.h Fri Jul 5 01:21:26 2002 -@@ -31,6 +31,7 @@ - - #include "ddconfig.h" - -+#include <sys/types.h> - #include <stdio.h> - #if FD_HEADER_OK - # include HEADER_FD ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ucsim.git/commitdiff/4dedec592b42f7725244bd9c67eb3ebf3f1e36c7 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit