rpms/piklab/F-10 import.log, 1.1, 1.2 piklab-pickit2.patch, 1.1, 1.2 piklab.spec, 1.22, 1.23

Thibault North tnorth at fedoraproject.org
Mon Nov 10 20:06:50 UTC 2008


Author: tnorth

Update of /cvs/pkgs/rpms/piklab/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27554/F-10

Modified Files:
	import.log piklab-pickit2.patch piklab.spec 
Log Message:
Fix patch3



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/piklab/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Jun 2008 14:43:59 -0000	1.1
+++ import.log	10 Nov 2008 20:06:20 -0000	1.2
@@ -1 +1,2 @@
 piklab-0_15_3-1_fc9:HEAD:piklab-0.15.3-1.fc9.src.rpm:1212849812
+piklab-0_15_3-2_fc10:F-10:piklab-0.15.3-2.fc10.src.rpm:1226215095

piklab-pickit2.patch:

Index: piklab-pickit2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/piklab/F-10/piklab-pickit2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- piklab-pickit2.patch	7 Jun 2008 14:43:59 -0000	1.1
+++ piklab-pickit2.patch	10 Nov 2008 20:06:20 -0000	1.2
@@ -1,11 +1,11 @@
---- src/progs/pickit2/base/pickit2.h.orig	2008-06-06 14:43:25.000000000 +0530
-+++ src/progs/pickit2/base/pickit2.h	2008-06-06 15:14:21.000000000 +0530
-@@ -27,7 +27,7 @@
- public:
-   USBPort(Log::Base &log) : Pickit::USBPort(0x0033, log) {}
-   virtual Pickit::Array array() const { return Array(); }
--  void fillCommand(Pickit::Array &cmd, uchar cmd, uint nbBytes, uint address, uint i, bool longAddress = true) const;
-+  void fillCommand(Pickit::Array &command, uchar cmd, uint nbBytes, uint address, uint i, bool longAddress = true) const;
-   Pickit::Array createCommand(uchar cmd, uint nbBytes, uint address, bool longAddress = true) const;
- 
-   bool readFirmwareCodeMemory(Device::Array &data, const Device::Array *vdata);
+--- src/progs/pickit2/base/pickit2.h.orig	2008-11-09 01:19:54.000000000 -0500
++++ src/progs/pickit2/base/pickit2.h	2008-11-09 01:20:22.000000000 -0500
+@@ -27,7 +27,7 @@
+ public:
+   USBPort(Log::Base &log) : Pickit::USBPort(0x0033, log) {}
+   virtual Pickit::Array array() const { return Array(); }
+-  void fillCommand(Pickit::Array &cmd, uchar cmd, uint nbBytes, uint address, uint i, bool longAddress = true) const;
++  void fillCommand(Pickit::Array &command, uchar cmd, uint nbBytes, uint address, uint i, bool longAddress = true) const;
+   Pickit::Array createCommand(uchar cmd, uint nbBytes, uint address, bool longAddress = true) const;
+ 
+   bool readFirmwareCodeMemory(Device::Array &data, const Device::Array *vdata, ProgressMonitor &monitor);


Index: piklab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/piklab/F-10/piklab.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- piklab.spec	7 Jun 2008 14:43:59 -0000	1.22
+++ piklab.spec	10 Nov 2008 20:06:20 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:       piklab
 Version:    0.15.3
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):IDE pour applications à base de microcontrôleurs PIC et de dsPIC
 
@@ -135,6 +135,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Nov 10 2008 Thibault North <tnorth [AT] fedoraproject DOT org> - 0.15.3-2
+  - Fix %%patch3
+
 * Sat Jun 07 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.15.3-1
   - New upstream release
   - compiling with Qt 3.3




More information about the scm-commits mailing list