Revert "- up to 3.10.0"

This reverts commit c00c5a83588288cede61a0191eaf68aa2a349c2e.

diff --git a/cgminer-system-jansson.patch b/cgminer-system-jansson.patch
index 00b35dc910e0f7e3a4de4a0e7afe59c68b2a1522..3e2e2d9a29a688c6aa61b5c63b4018a025fa9d29 100644 (file)
--- a/cgminer-system-jansson.patch
+++ b/cgminer-system-jansson.patch
@@ -1,6 +1,27 @@
-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
+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
 @@ -1,5 +1,5 @@
  
 -SUBDIRS       = jansson-2.5
@@ -8,10 +29,11 @@ diff -urN cgminer-3.10.0.org/compat/Makefile.am cgminer-3.10.0/compat/Makefile.a
  
  if WANT_USBUTILS
  if WANT_STATIC_LIBUSB
-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 @@
+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 @@
  
  AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno])
  
@@ -21,7 +43,7 @@ diff -urN cgminer-3.10.0.org/configure.ac cgminer-3.10.0/configure.ac
  PKG_PROG_PKG_CONFIG()
  
  if test "x$have_cgminer_sdk" = "xtrue"; then
-@@ -360,6 +357,8 @@
+@@ -331,6 +328,8 @@
        [libcurl=$enableval]
        )
  
@@ -30,32 +52,11 @@ diff -urN cgminer-3.10.0.org/configure.ac cgminer-3.10.0/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.])],
-@@ -422,6 +421,7 @@
- AC_DEFINE_UNQUOTED([CGMINER_PREFIX], ["$prefix/bin"], [Path to cgminer install])
+@@ -400,6 +399,7 @@
+ 
  
  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 3985260ac77caa2f8061024db05b69040f96e32d..d858c6cc1458702f7bd1e4667ba3225b4a3f1e2c 100644 (file)
--- a/cgminer.spec
+++ b/cgminer.spec
@@ -1,13 +1,13 @@
 %bcond_with    knc
 Summary:       FPGA/ASIC Miner by Con Kolivas
 Name:          cgminer
-Version:       3.10.0
-Release:       1
+Version:       3.8.3
+Release:       2
 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: 8d387e3f98703b00a78021ebca6c7118
+# Source0-md5: ec70aee505fa3e8d9cbe566a65d420cb
 Patch0:                %{name}-system-jansson.patch
 BuildRequires: autoconf
 BuildRequires: automake