- up to 3.10.0

diff --git a/cgminer-system-jansson.patch b/cgminer-system-jansson.patch
index 3e2e2d9a29a688c6aa61b5c63b4018a025fa9d29..00b35dc910e0f7e3a4de4a0e7afe59c68b2a1522 100644 (file)
--- a/cgminer-system-jansson.patch
+++ b/cgminer-system-jansson.patch
@@ -1,27 +1,6 @@
-diff -dur cgminer-3.8.3.orig/Makefile.am cgminer-3.8.3/Makefile.am
---- cgminer-3.8.3.orig/Makefile.am     2013-11-22 13:52:57.000000000 +0100
-+++ cgminer-3.8.3/Makefile.am  2014-01-07 10:36:06.000000000 +0100
-@@ -1,8 +1,6 @@
- 
- ACLOCAL_AMFLAGS = -I m4
- 
--JANSSON_INCLUDES= -I$(top_builddir)/compat/jansson-2.5/src -I$(top_srcdir)/compat/jansson-2.5/src
--
- if WANT_USBUTILS
- USBUTILS_INCLUDES = -I$(top_builddir)/compat/libusb-1.0/libusb -I$(top_srcdir)/compat/libusb-1.0/libusb
- else
-@@ -18,7 +16,7 @@
- 
- SUBDIRS               = lib compat ccan
- 
--INCLUDES      = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) $(USBUTILS_INCLUDES)
-+INCLUDES      = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_CFLAGS) $(USBUTILS_INCLUDES)
- 
- bin_PROGRAMS  = cgminer
- 
-diff -dur cgminer-3.8.3.orig/compat/Makefile.am cgminer-3.8.3/compat/Makefile.am
---- cgminer-3.8.3.orig/compat/Makefile.am      2013-11-17 23:13:00.000000000 +0100
-+++ cgminer-3.8.3/compat/Makefile.am   2014-01-07 10:36:15.000000000 +0100
+diff -urN cgminer-3.10.0.org/compat/Makefile.am cgminer-3.10.0/compat/Makefile.am
+--- cgminer-3.10.0.org/compat/Makefile.am      2013-11-30 22:24:45.000000000 +0100
++++ cgminer-3.10.0/compat/Makefile.am  2014-01-19 19:43:30.709577832 +0100
 @@ -1,5 +1,5 @@
  
 -SUBDIRS       = jansson-2.5
@@ -29,11 +8,10 @@ diff -dur cgminer-3.8.3.orig/compat/Makefile.am cgminer-3.8.3/compat/Makefile.am
  
  if WANT_USBUTILS
  if WANT_STATIC_LIBUSB
-Only in cgminer-3.8.3/compat: Makefile.am~
-diff -dur cgminer-3.8.3.orig/configure.ac cgminer-3.8.3/configure.ac
---- cgminer-3.8.3.orig/configure.ac    2013-11-23 00:32:53.000000000 +0100
-+++ cgminer-3.8.3/configure.ac 2014-01-07 10:36:06.000000000 +0100
-@@ -308,9 +308,6 @@
+diff -urN cgminer-3.10.0.org/configure.ac cgminer-3.10.0/configure.ac
+--- cgminer-3.10.0.org/configure.ac    2014-01-09 06:38:58.000000000 +0100
++++ cgminer-3.10.0/configure.ac        2014-01-19 19:43:30.709577832 +0100
+@@ -337,9 +337,6 @@
  
  AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno])
  
@@ -43,7 +21,7 @@ diff -dur cgminer-3.8.3.orig/configure.ac cgminer-3.8.3/configure.ac
  PKG_PROG_PKG_CONFIG()
  
  if test "x$have_cgminer_sdk" = "xtrue"; then
-@@ -331,6 +328,8 @@
+@@ -360,6 +357,8 @@
        [libcurl=$enableval]
        )
  
@@ -52,11 +30,32 @@ diff -dur cgminer-3.8.3.orig/configure.ac cgminer-3.8.3/configure.ac
  if test "x$libcurl" != xno; then
        if test "x$have_win32" != xtrue; then
                PKG_CHECK_MODULES([LIBCURL], [libcurl >= 7.25.0], [AC_DEFINE([CURL_HAS_KEEPALIVE], [1], [Defined if version of curl supports keepalive.])],
-@@ -400,6 +399,7 @@
- 
+@@ -422,6 +421,7 @@
+ AC_DEFINE_UNQUOTED([CGMINER_PREFIX], ["$prefix/bin"], [Path to cgminer install])
  
  AC_SUBST(JANSSON_LIBS)
 +AC_SUBST(JANSSON_CFLAGS)
  AC_SUBST(PTHREAD_FLAGS)
  AC_SUBST(DLOPEN_FLAGS)
  AC_SUBST(PTHREAD_LIBS)
+diff -urN cgminer-3.10.0.org/Makefile.am cgminer-3.10.0/Makefile.am
+--- cgminer-3.10.0.org/Makefile.am     2014-01-09 06:20:18.000000000 +0100
++++ cgminer-3.10.0/Makefile.am 2014-01-19 19:44:00.330518487 +0100
+@@ -1,8 +1,6 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-JANSSON_CPPFLAGS= -I$(top_builddir)/compat/jansson-2.5/src -I$(top_srcdir)/compat/jansson-2.5/src
+-
+ if WANT_USBUTILS
+ USBUTILS_CPPFLAGS = -I$(top_builddir)/compat/libusb-1.0/libusb -I$(top_srcdir)/compat/libusb-1.0/libusb
+ else
+@@ -18,7 +16,7 @@
+ 
+ SUBDIRS               = lib compat ccan
+ 
+-cgminer_CPPFLAGS = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_CPPFLAGS) $(USBUTILS_CPPFLAGS)
++cgminer_CPPFLAGS = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_CFLAGS) $(USBUTILS_CPPFLAGS)
+ 
+ bin_PROGRAMS  = cgminer
+ 

diff --git a/cgminer.spec b/cgminer.spec
index 377ca96f2a0ede0b1ffd125112ab02e2e2bad1bd..17104050b51140768e0fac106cf31ef7835a7973 100644 (file)
--- a/cgminer.spec
+++ b/cgminer.spec
@@ -1,12 +1,12 @@
 Summary:       FPGA/ASIC Miner by Con Kolivas
 Name:          cgminer
-Version:       3.8.3
-Release:       2
+Version:       3.10.0
+Release:       1
 License:       GPL v2
 Group:         Applications/Networking
 URL:           http://forum.bitcoin.org/index.php?topic=28402.0
 Source0:       http://ck.kolivas.org/apps/cgminer/%{name}-%{version}.tar.bz2
-# Source0-md5: ec70aee505fa3e8d9cbe566a65d420cb
+# Source0-md5: 8d387e3f98703b00a78021ebca6c7118
 Patch0:                %{name}-system-jansson.patch
 BuildRequires: autoconf
 BuildRequires: automake