diff --git a/libsigrok-0.2.2-libftdi1.patch b/libsigrok-0.2.2-libftdi1.patch new file mode 100644 index 0000000..ff8d1ff --- /dev/null +++ b/libsigrok-0.2.2-libftdi1.patch @@ -0,0 +1,18 @@ +diff -up libsigrok-0.2.2/configure.ac.ftdi1 libsigrok-0.2.2/configure.ac +--- libsigrok-0.2.2/configure.ac.ftdi1 2014-06-10 16:05:50.042485899 +0200 ++++ libsigrok-0.2.2/configure.ac 2014-06-10 16:06:20.938025413 +0200 +@@ -284,10 +284,10 @@ esac + AM_CONDITIONAL(NEED_USB, test "x$have_libusb1_0" != xno) + + # libftdi is only needed for some hardware drivers. Disable them if not found. +-PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16], +- [CFLAGS="$CFLAGS $libftdi_CFLAGS"; +- LIBS="$LIBS $libftdi_LIBS"; +- SR_PKGLIBS="$SR_PKGLIBS libftdi"], ++PKG_CHECK_MODULES([libftdi1], [libftdi1 >= 1.1], ++ [CFLAGS="$CFLAGS $libftdi1_CFLAGS"; ++ LIBS="$LIBS $libftdi1_LIBS"; ++ SR_PKGLIBS="$SR_PKGLIBS libftdi1"], + [HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA8="no"; HW_IKALOGIC_SCANAPLUS="no"]) + + # libudev is only needed for some hardware drivers. Disable them if not found. diff --git a/libsigrok.spec b/libsigrok.spec index adcc2c9..d4bd056 100644 --- a/libsigrok.spec +++ b/libsigrok.spec @@ -1,6 +1,6 @@ Name: libsigrok Version: 0.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Basic hardware access drivers for logic analyzers # Combined GPLv3+ and GPLv2+ and BSD License: GPLv3+ @@ -8,6 +8,8 @@ URL: http://www.sigrok.org/ Source0: http://sigrok.org/download/source/libsigrok/%{name}-%{version}.tar.gz # http://sigrok.org/gitweb/?p=libsigrok.git;a=commit;h=8dce54f7aa9eed362f2c9e41412c6b71ba1a32b6 Patch0: %{name}-0.2.1-udev.patch +# update for libftdi-1 detection +Patch1: %{name}-0.2.2-libftdi1.patch BuildRequires: glib2-devel BuildRequires: libzip-devel @@ -19,6 +21,7 @@ BuildRequires: doxygen BuildRequires: graphviz # link-mso19 driver was disabed by upstream for this release (only udev user) #BuildRequires: libudev-devel +BuildRequires: libtool %description %{name} is a shared library written in C which provides the basic API @@ -48,6 +51,9 @@ with %{name}. %prep %setup -q %patch0 -p1 -b .udev +%patch1 -p1 -b .ftdi1 + +autoreconf -vif %build @@ -89,6 +95,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Tue Jun 10 2014 Dan HorĂ¡k - 0.2.2-3 +- rebuilt for libftdi1 + * Sat Jun 07 2014 Fedora Release Engineering - 0.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild