From 38f9aadde23a0b79c317733322854e2a60ce11e9 Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Aug 20 2014 23:47:45 +0000 Subject: New attempt to introduce 1.1.0 (ABI bump) --- diff --git a/.gitignore b/.gitignore index c66a108..fb3d473 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /iguanaIR-1.0.3.tar.bz2 /iguanaIR-1.1.0.tar.bz2 -/iguanaIR-1.0.5.tar.bz2 +clog diff --git a/iguanaIR.spec b/iguanaIR.spec index f8486ca..135c6fe 100644 --- a/iguanaIR.spec +++ b/iguanaIR.spec @@ -1,6 +1,6 @@ Name: iguanaIR -Version: 1.0.5 -Release: 5%{?dist} +Version: 1.1.0 +Release: 4%{?dist} Epoch: 1 Summary: Driver for Iguanaworks USB IR transceiver @@ -11,13 +11,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 @@ -36,7 +36,7 @@ control the Iguanaworks USB IR transceiver. %package devel Summary: Library and header files for iguanaIR Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{epoch}:%{name} = %{version}-%{release} %description devel The development files needed to interact with the iguanaIR igdaemon are @@ -65,17 +65,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} @@ -136,11 +139,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}/ @@ -163,6 +167,9 @@ fi %{_bindir}/%{name}-reflasher %changelog +* Thu Aug 21 2014 Alec Leamas - 1:1.1.0-4 +- New attempt to introduce 1.1.0 (ABI bump) + * Wed Aug 20 2014 Alec Leamas - 1:1.0.5-5 - Updating dependencies with epoch (sigh...). @@ -216,4 +223,3 @@ fi * Wed Jul 21 2010 Jarod Wilson 1.0-0.1.pre2 - Update to 1.0pre2 snapshot - Revamp spec to be more compliant with Fedora packaging guidelines -