[libconcord] add the two upstream changes since 0.23, inc fix for 525/550 RHBZ #772517

[Adam Williamson]

commit 21664ae11f7109b6740df467346b7075f44a4a7a
Author: Adam Williamson <awilliam at redhat.com>
Date:   Mon Jan 16 18:16:47 2012 -0800

    add the two upstream changes since 0.23, inc fix for 525/550 RHBZ #772517

 libconcord-0.23-525_flash_base.patch |   21 +++++++++++++++++++++
 libconcord-0.23-name_515.patch       |   25 +++++++++++++++++++++++++
 libconcord.spec                      |    9 +++++++++
 3 files changed, 55 insertions(+), 0 deletions(-)
---
diff --git a/libconcord-0.23-525_flash_base.patch b/libconcord-0.23-525_flash_base.patch
new file mode 100644
index 0000000..9b08853
--- /dev/null
+++ b/libconcord-0.23-525_flash_base.patch
@@ -0,0 +1,21 @@
+--- concordance-0.23/libconcord/remote_info.h	2010/08/01 14:35:52	1.12
++++ concordance-0.23/libconcord/remote_info.h	2011/03/13 09:39:14	1.13
+@@ -1,7 +1,7 @@
+ /*
+  * vi: formatoptions+=tc textwidth=80 tabstop=8 shiftwidth=8 noexpandtab:
+  *
+- * $Id: remote_info.h,v 1.12 2010/08/01 14:35:52 jaymzh Exp $
++ * $Id: remote_info.h,v 1.13 2011/03/13 09:39:14 jaymzh Exp $
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -313,7 +313,7 @@
+ 	{
+ 		SERIAL_LOCATION_FLASH,		// serial_location
+ 		0x000110,			// serial_address
+-		0x000000,			// flash_base
++		0x800000,			// flash_base
+ 		0x810000,			// firmware_base
+ 		0x820000,			// config_base
+ 		0x810000,			// firmware_update_base
+
diff --git a/libconcord-0.23-name_515.patch b/libconcord-0.23-name_515.patch
new file mode 100644
index 0000000..85db7db
--- /dev/null
+++ b/libconcord-0.23-name_515.patch
@@ -0,0 +1,25 @@
+--- concordance-0.23/libconcord/remote_info.h	2011/03/13 09:39:14	1.13
++++ concordance-0.23/libconcord/remote_info.h	2011/03/13 09:43:27	1.14
+@@ -1,7 +1,7 @@
+ /*
+  * vi: formatoptions+=tc textwidth=80 tabstop=8 shiftwidth=8 noexpandtab:
+  *
+- * $Id: remote_info.h,v 1.13 2011/03/13 09:39:14 jaymzh Exp $
++ * $Id: remote_info.h,v 1.14 2011/03/13 09:43:27 jaymzh Exp $
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -97,7 +97,11 @@
+ 	{ MFG_UNK,	"Unknown",			NULL },
+ 	{ MFG_UNK,	"Unknown",			NULL },
+ 	{ MFG_UNK,	"Unknown",			NULL },
+-	{ MFG_HAR,	"Harmony 700",		"Molson" }
++	{ MFG_HAR,	"Harmony 700",		"Molson" },
++	{ MFG_HAR,	"Harmony 515",		NULL },
++	{ MFG_UNK,	"Unknown",			NULL },
++	{ MFG_UNK,	"Unknown",			NULL },
++	{ MFG_UNK,	"Unknown",			NULL },			// 70
+ };
+ 
+ static const unsigned int max_model=sizeof(ModelList)/sizeof(TModel)-1;
+
diff --git a/libconcord.spec b/libconcord.spec
index e4399f4..939f824 100644
--- a/libconcord.spec
+++ b/libconcord.spec
@@ -16,6 +16,10 @@ Patch1: libconcord-0.23-gcc47.patch
 # Add a 'modern udev' option to the rules generator, which hooks into
 # udev-acl support, and also update some long-deprecated key names
 Patch2: libconcord-0.23-modern_udev.patch
+# From upstream: fix the flash_base of the 525 (and 550), RHBZ #772517
+Patch3: libconcord-0.23-525_flash_base.patch
+# From upstream: name the 515, for prettiness' sake
+Patch4: libconcord-0.23-name_515.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: libusb-devel
@@ -69,6 +73,8 @@ Python bindings for libconcord
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 cd %{name}
@@ -186,6 +192,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
   which uses udev-acl support, and use it. should finally fix
   permissions issues, RHBZ #559412. Also fixes RHBZ #622670
 - drop the old acl patch, modern_udev.patch supersedes it
+- from upstream CVS:
+	+ fix flash_base for the 525 (and 550) - RHBZ #772517
+	+ give the 515 a name, just to prettify output
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild