Use system jansson

diff --git a/cgminer-system-jansson.patch b/cgminer-system-jansson.patch
new file mode 100644 (file)
index 0000000..3e2e2d9
--- /dev/null
+++ b/cgminer-system-jansson.patch
@@ -0,0 +1,62 @@
+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
++SUBDIRS       =
+ 
+ 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 @@
+ 
+ AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno])
+ 
+-AC_CONFIG_SUBDIRS([compat/jansson-2.5])
+-JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a"
+-
+ PKG_PROG_PKG_CONFIG()
+ 
+ if test "x$have_cgminer_sdk" = "xtrue"; then
+@@ -331,6 +328,8 @@
+       [libcurl=$enableval]
+       )
+ 
++PKG_CHECK_MODULES([JANSSON], [jansson >= 2.5])
++
+ 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 @@
+ 
+ 
+ AC_SUBST(JANSSON_LIBS)
++AC_SUBST(JANSSON_CFLAGS)
+ AC_SUBST(PTHREAD_FLAGS)
+ AC_SUBST(DLOPEN_FLAGS)
+ AC_SUBST(PTHREAD_LIBS)

diff --git a/cgminer.spec b/cgminer.spec
index 1b2fe9eb0dbebced2d8760bbd816d54847d3313c..377ca96f2a0ede0b1ffd125112ab02e2e2bad1bd 100644 (file)
--- a/cgminer.spec
+++ b/cgminer.spec
@@ -1,14 +1,17 @@
-# TODO -devel subpackage
 Summary:       FPGA/ASIC Miner by Con Kolivas
 Name:          cgminer
 Version:       3.8.3
-Release:       1
+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: ec70aee505fa3e8d9cbe566a65d420cb
+Patch0:                %{name}-system-jansson.patch
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: curl-devel
+BuildRequires: jansson-devel
 BuildRequires: libusb-devel
 BuildRequires: ncurses-devel
 BuildRequires: pkgconfig >= 0.9.0
@@ -21,10 +24,13 @@ This is a miner for Bitcoin.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses" \
        --disable-silent-rules \
@@ -63,8 +69,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc API-README ASIC-README AUTHORS FPGA-README
 %doc NEWS README
 %attr(755,root,root) %{_bindir}/%{name}
-%attr(755,root,root) %{_libdir}/libjansson.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libjansson.so.4
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/%{name}
 %{_libdir}/%{name}/bitstreams