[iguanaIR] Updating to latest version

[leamas]

commit b898e37d8ea3cedf2e6a88635552da777ffdf048
Author: Alec Leamas <leamas.alec at gmail.com>
Date:   Mon Aug 11 17:25:03 2014 +0200

    Updating to latest version
    
    - Old patches now upstreamed, new patches for cmake required. LIBDIR handling
      needs cleanup (not required part in rpath.patch).

 .gitignore                                         |    1 +
 ...se-platform-specific-python-extension-dir.patch |   25 ----------------
 ...invoke-systemd-support-not-sysV-init-file.patch |   13 --------
 changeset_2710.patch                               |   24 +++++++++++++++
 cmake-args.patch                                   |   11 +++++++
 iguanaIR.spec                                      |   31 +++++++++++++-------
 sources                                            |    2 +-
 7 files changed, 57 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 146d9d6..4dcfa6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /iguanaIR-1.0.3.tar.bz2
+/iguanaIR-1.1.0.tar.bz2
diff --git a/changeset_2710.patch b/changeset_2710.patch
new file mode 100644
index 0000000..395037a
--- /dev/null
+++ b/changeset_2710.patch
@@ -0,0 +1,24 @@
+Index: /trunk/software/usb_ir/CMakeLists.txt
+===================================================================
+--- trunk/software/usb_ir/CMakeLists.txt	(revision 2709)
++++ trunk/software/usb_ir/CMakeLists.txt	(revision 2710)
+@@ -1,4 +1,7 @@
+ cmake_minimum_required(VERSION 2.6)
+ project(IguanaIR C)
++
++Set(SOVERSION 0)
++Set(FULLVER 0.3)
+
+ #Set(TARGET_ANDROID true)
+@@ -98,9 +101,10 @@
+                      iguanaIR.c dataPackets.c ${PIPESRC}
+                      ${BASESRC})
++set_target_properties(iguanaIR PROPERTIES
++                      VERSION ${SOVERSION} SOVERSION ${FULLVER})
+ set_property(TARGET iguanaIR
+              APPEND PROPERTY COMPILE_DEFINITIONS IGUANAIR_EXPORTS)
+ install(TARGETS iguanaIR
+         DESTINATION ${LIBDIR})
+-
+
+ # build the service/server that controls hardware
diff --git a/cmake-args.patch b/cmake-args.patch
new file mode 100644
index 0000000..9f4031d
--- /dev/null
+++ b/cmake-args.patch
@@ -0,0 +1,11 @@
+diff --git a/runCmake b/runCmake
+index f37873c..6d19253 100755
+--- a/runCmake
++++ b/runCmake
+@@ -40,5 +40,5 @@ fi
+ # create the build path
+ mkdir -p $BUILDDIR
+ cd $BUILDDIR
+-PATH=${QTPATH}:${PYPATH}:${PATH} ARCH=${ARCH} CSPATH=${CSPATH} ${CMAKE} ${CHAIN} ..
++PATH=${QTPATH}:${PYPATH}:${PATH} ARCH=${ARCH} CSPATH=${CSPATH} ${CMAKE} ${CHAIN} $@ ..
+ cd ..
diff --git a/iguanaIR.spec b/iguanaIR.spec
index 1dc6b40..e4aa3cf 100644
--- a/iguanaIR.spec
+++ b/iguanaIR.spec
@@ -1,6 +1,6 @@
 Name:           iguanaIR
-Version:        1.0.5
-Release:        3%{?dist}
+Version:        1.1.0
+Release:        1%{?dist}
 Summary:        Driver for Iguanaworks USB IR transceiver
 
 Group:          System Environment/Daemons
@@ -10,13 +10,13 @@ Source0:        http://iguanaworks.net/downloads/%{name}-%{version}.tar.bz2
 Source1:        iguanaIR.service
 Source2:        iguanaIR-rescan
 Source3:        README.fedora
-# https://iguanaworks.net/projects/IguanaIR/ticket/205 for patch 5, 3, 2.
-Patch3:         0003-Use-platform-specific-python-extension-dir.patch
-# Fedora only
-Patch6:         0006-udev-invoke-systemd-support-not-sysV-init-file.patch
+# https://iguanaworks.net/projects/IguanaIR/ticket/317
+Patch1:         changeset_2710.patch
+Patch2:         rpath.patch
+Patch3:         cmake-args.patch
 
 Requires:       lirc, udev
-BuildRequires:  popt-devel, libusb1-devel, libusb-devel, systemd-units
+BuildRequires:  cmake,  popt-devel, libusb1-devel, libusb-devel, systemd-units
 Requires(post): systemd-units, systemd-sysv
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -64,17 +64,20 @@ what this means, you don't need it.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p3
+%patch2 -p1
 %patch3 -p1
-%patch6 -p1
 cp %{SOURCE3} README.fedora
 
 
 %build
-%configure %{?_disable_clock_gettime}
+./runCmake -DLIBDIR="%{_libdir}"
+cd build
 make CFLAGS="%{optflags} -fpic -DFEDORA=1" %{?_smp_mflags}
 
 
 %install
+cd build
 make install PREFIX=$RPM_BUILD_ROOT/usr DESTDIR=$RPM_BUILD_ROOT INLIBDIR=$RPM_BUILD_ROOT%{_libdir}
 
 install -m755 -d $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
@@ -135,11 +138,12 @@ fi
 
 
 %files
-%doc AUTHORS LICENSE LICENSE-LGPL WHY protocols.txt
-%doc README.txt notes.txt ChangeLog
+%doc AUTHORS LICENSE LICENSE-LGPL
+%doc README.txt WHY ChangeLog
 %doc README.fedora
 %{_bindir}/igdaemon
 %{_bindir}/igclient
+%{_bindir}/iguanaIR-rescan
 %{_libdir}/lib%{name}.so.*
 %{_libdir}/%{name}/*.so
 %{_libexecdir}/%{name}/
@@ -162,6 +166,11 @@ fi
 %{_bindir}/%{name}-reflasher
 
 %changelog
+* Mon Aug 11 2014 Alec Leamas <leamas.alec at gmail.com> - 1.1.0-1
+- Updating to latest version
+- Old patches now upstreamed, new patches for cmake required. LIBDIR handling
+  needs cleanup (not required part in rpath.patch).
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index e42db02..39942e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fbdf09dbef2aaf6c89804994d17b2440  iguanaIR-1.0.5.tar.bz2
+798eda1de8873c8da41fb50ffe221140  iguanaIR-1.1.0.tar.bz2