Merge branch 'master' into f13

dist-git conversion
Initialize branch F-13 for uisp
2010-12-12 17:51:06 +02:00 · 2010-07-29 14:40:58 +00:00 · 2010-02-17 03:23:07 +00:00
6 changed files with 140 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+uisp-20050207.tar.gz
--- a/dead.package
+++ b/dead.package
@ -1 +0,0 @@
-Orphaned for 6+ weeks
--- a/1
+++ b/1
@ -0,0 +1 @@
+b1e499d5a1011489635c1a0e482b1627  uisp-20050207.tar.gz
--- a/uisp-20050207-m168-stk500-extendedFuseSupport.patch
+++ b/uisp-20050207-m168-stk500-extendedFuseSupport.patch
@ -0,0 +1,30 @@
+diff -cr uisp-20050207/src/Avr.C uisp-20050207-m168/src/Avr.C
+*** uisp-20050207/src/Avr.C	Tue Feb  8 00:55:08 2005
+--- uisp-20050207-m168/src/Avr.C	Mon Mar 28 02:17:52 2005
+***************
+*** 101,106 ****
+--- 101,107 ----
+    { "ATmega163",    0x94, 0x02,  16384, 128,  512, 15000, 3800, AVR_M163 },
+    { "ATmega16",     0x94, 0x03,  16384, 128,  512,  4500, 9000, AVR_M163 },
+    { "ATmega162",    0x94, 0x04,  16384, 128,  512,  4500, 9000, AVR_M128 },
+   { "ATmega168",    0x94, 0x06,  16384, 128,  512,  4500, 4000, AVR_M128 },
+    { "ATmega169",    0x94, 0x05,  16384, 128,  512,  4500, 9000, AVR_M128 },
+  
+    { "ATmega323",    0x95, 0x01,  32768, 128, 1024, 15000, 3800, AVR_M163 },
+diff -cr uisp-20050207/src/Stk500.C uisp-20050207-m168/src/Stk500.C
+*** uisp-20050207/src/Stk500.C	Tue Dec 28 16:54:12 2004
+--- uisp-20050207-m168/src/Stk500.C	Mon Mar 28 02:21:32 2005
+***************
+*** 215,220 ****
+--- 215,225 ----
+     {0x42, 0x83, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0xff, 0xff, 0xff,
+      0xff, {0x00, 0x80}, {0x02, 0x00}, {0x00, 0x00, 0x40, 0x00}, 0x20}
+    },
+   {"ATmega168",
+    {0x04, 0xD7, 0xA0, 0x01},
+    {0x42, 0x86, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0xff, 0xff, 0xff,
+     0xff, {0x00, 0x80}, {0x02, 0x00}, {0x00, 0x00, 0x40, 0x00}, 0x20}
+   },
+    {"ATmega169",
+     {0x04, 0xD7, 0xA0, 0x01},
+     {0x42, 0x84, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0xff, 0xff, 0xff,
--- a/uisp.spec
+++ b/uisp.spec
@ -0,0 +1,84 @@
+Name:           uisp
+Version:        20050207
+Release:        7%{?dist}
+Summary:        Universal In-System Programmer for Atmel AVR and 8051
+
+
+Group:          Applications/Engineering
+License:        GPLv2+
+URL:            http://www.nongnu.org/uisp
+Source0:        http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
+Patch0:         uisp_Werror.patch
+Patch1:         uisp-20050207-m168-stk500-extendedFuseSupport.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+#BuildRequires:
+#Requires:
+
+%description
+Uisp is utility for downloading/uploading programs to AVR devices. Can also be
+used for some Atmel 8051 type devices. In addition, uisp can erase the device,
+write lock bits, verify and set the active segment.
+
+For use with the following hardware to program the devices:
+  pavr      http://avr.jpk.co.nz/pavr/pavr.html
+  stk500    Atmel STK500
+  dapa      Direct AVR Parallel Access
+  stk200    Parallel Starter Kit STK200, STK300
+  abb       Altera ByteBlasterMV Parallel Port Download Cable
+  avrisp    Atmel AVR ISP (?)
+  bsd       http://www.bsdhome.com/avrprog/ (parallel)
+  fbprg     http://ln.com.ua/~real/avreal/adapters.html (parallel)
+  dt006     http://www.dontronics.com/dt006.html (parallel)
+  dasa      serial (RESET=RTS SCK=DTR MOSI=TXD MISO=CTS)
+  dasa2     serial (RESET=!TXD SCK=RTS MOSI=DTR MISO=CTS)
+
+
+%prep
+%setup -q
+%patch0 -p0
+%patch1 -p1
+
+%build
+%configure
+make
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS CHANGES CHANGES.old COPYING ChangeLog* TODO
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1.gz
+
+
+%changelog
+* Sun Dec 12 2010 Lucian Langa <cooly@gnome.eu.org> - 20050207-7
+- add atmega168 support (upstream #4041)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20050207-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20050207-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 20050207-4
+- fix patch
+
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 20050207-3
+- fix license tag
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 20050207-2
+- Autorebuild for GCC 4.3
+
+* Mon Mar 12 2007 Trond Danielsen <trond.danielsen@fedoraproject.org> - 20050207-1
+- Initial version.
+- Summary and description taken from spec file included in uisp.
--- a/uisp_Werror.patch
+++ b/uisp_Werror.patch
@ -0,0 +1,24 @@
+diff -u ../uisp-20050207/src/Makefile.am src/Makefile.am
+--- ../uisp-20050207/src/Makefile.am	2002-10-31 00:22:07.000000000 +0100
+++ src/Makefile.am	2007-03-12 14:30:56.000000000 +0100
+@@ -31,7 +31,7 @@
+ # Turn on all warnings and consider them errors. This kinda forces you to have
+ # to use gcc, but I'd rather have all warnings eliminated.
+ 
+-AM_CXXFLAGS          = -Wall -Werror
+AM_CXXFLAGS          = -Wall
+ 
+ bin_PROGRAMS         = uisp
+ uisp_SOURCES         = \
+diff -u ../uisp-20050207/src/Makefile.in src/Makefile.in
+--- ../uisp-20050207/src/Makefile.in	2005-02-07 22:48:13.000000000 +0100
+++ src/Makefile.in	2007-03-12 14:31:08.000000000 +0100
+@@ -145,7 +145,7 @@
+ 
+ # Turn on all warnings and consider them errors. This kinda forces you to have
+ # to use gcc, but I'd rather have all warnings eliminated.
+-AM_CXXFLAGS = -Wall -Werror
+AM_CXXFLAGS = -Wall
+ 
+ bin_PROGRAMS = uisp
+ uisp_SOURCES = \
Author	SHA1	Message	Date
Lucian Langa	f644e78593	Merge branch 'master' into f13	2010-12-12 17:51:06 +02:00
Fedora Release Engineering	28c8beffdd	dist-git conversion	2010-07-29 14:40:58 +00:00
Jesse Keating	6ef6434b70	Initialize branch F-13 for uisp	2010-02-17 03:23:07 +00:00
				`@ -0,0 +1 @@`
				`b1e499d5a1011489635c1a0e482b1627 uisp-20050207.tar.gz`