From 7af4ef43832d1dff04ab8e26e189989d98717024 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Fri, 1 Sep 2017 17:28:35 -0500 Subject: [PATCH] Update upstream URL for package, fixes RHBZ#1487568. Patch pkgconfig file to correct lib dir, fixes RHBZ#1487575. --- hamlib-pc.patch | 10 ++++++++++ hamlib.spec | 15 +++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 hamlib-pc.patch diff --git a/hamlib-pc.patch b/hamlib-pc.patch new file mode 100644 index 0000000..99f2259 --- /dev/null +++ b/hamlib-pc.patch @@ -0,0 +1,10 @@ +--- a/hamlib.pc.in ++++ b/hamlib.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ +-exec_prefix=${prefix} +-libdir=${exec_prefix}/lib ++libdir=@libdir@ + includedir=${prefix}/include + + Name: @PACKAGE_NAME@ diff --git a/hamlib.spec b/hamlib.spec index cea6e5c..7ac3248 100644 --- a/hamlib.spec +++ b/hamlib.spec @@ -9,14 +9,15 @@ Name: hamlib Version: 3.1 -Release: 8%{?pre:.%{pre}}%{?dist} +Release: 9%{?pre:.%{pre}}%{?dist} Summary: Run-time library to control radio transceivers and receivers License: GPLv2+ and LGPLv2+ -URL: http://hamlib.sourceforge.net +URL: http://www.hamlib.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?pre:~%{pre}}.tar.gz -Patch1: hamlib-3.0-perl_install.patch +Patch0: hamlib-3.0-perl_install.patch +Patch1: hamlib-pc.patch BuildRequires: python2-devel, swig, gd-devel, libxml2-devel, tcl-devel BuildRequires: libusb-devel, pkgconfig, boost-devel, libtool-ltdl-devel @@ -108,8 +109,7 @@ Hamlib TCL Language bindings to allow radio control from TCL scripts. %prep -%setup -q -n %{name}-%{version}%{?pre:~%{pre}} -%patch1 -p1 -b .perl_inst +%autosetup -p1 -n %{name}-%{version}%{?pre:~%{pre}} %build @@ -182,7 +182,6 @@ fi %files -%{!?_licensedir:%global license %doc} %license COPYING COPYING.LIB %doc AUTHORS ChangeLog PLAN README THANKS TODO %{_bindir}/* @@ -228,6 +227,10 @@ fi %changelog +* Fri Sep 1 2017 Richard Shaw - 3.1-9 +- Update upstream URL for package, fixes RHBZ#1487568. +- Patch pkgconfig file to correct lib dir, fixes RHBZ#1487575. + * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 3.1-8 - Python 2 binary package renamed to python2-hamlib See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3