From 6591d4b6552a39ebef9a9eda35a0e65ec73352d0 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 27 Jan 2019 11:43:09 +0100 Subject: [PATCH] Fix path to libdir in .pc (#1669664) Use https for URL: --- openbabel-fix-libdir-in-pkgconfig.patch | 11 +++++++++++ openbabel.spec | 12 ++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 openbabel-fix-libdir-in-pkgconfig.patch diff --git a/openbabel-fix-libdir-in-pkgconfig.patch b/openbabel-fix-libdir-in-pkgconfig.patch new file mode 100644 index 0000000..ee52003 --- /dev/null +++ b/openbabel-fix-libdir-in-pkgconfig.patch @@ -0,0 +1,11 @@ +diff -up openbabel-openbabel-2-4-1/openbabel-2.0.pc.cmake.p openbabel-openbabel-2-4-1/openbabel-2.0.pc.cmake +--- openbabel-openbabel-2-4-1/openbabel-2.0.pc.cmake.p 2016-10-10 17:56:17.000000000 +0200 ++++ openbabel-openbabel-2-4-1/openbabel-2.0.pc.cmake 2019-01-27 10:47:00.905546971 +0100 +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${exec_prefix}/@LIB_INSTALL_DIR@ ++libdir=${exec_prefix}/lib@LIB_SUFFIX@ + includedir=${prefix}/include + pkgincludedir=${includedir}/openbabel-2.0 + diff --git a/openbabel.spec b/openbabel.spec index 0575ed2..b21d0d5 100644 --- a/openbabel.spec +++ b/openbabel.spec @@ -9,11 +9,11 @@ Name: openbabel Version: 2.4.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Chemistry software file format converter License: GPLv2 Group: Applications/File -URL: http://openbabel.org/ +URL: https://openbabel.org/ Source0: https://github.com/openbabel/openbabel/archive/openbabel-%(echo %{version} | tr '.' '-').tar.gz Source1: obgui.desktop # fix perl modules install path @@ -31,6 +31,9 @@ Patch7: openbabel-ruby19-vendorarch.patch # Upstream bugs: https://sourceforge.net/p/openbabel/bugs/927/ https://sourceforge.net/p/openbabel/bugs/945/ Patch8: openbabel-disable-tests.patch Patch9: openbabel-narrowing-conversion.patch +# Fix path to libdir in .pc file +# https://bugzilla.redhat.com/show_bug.cgi?id=1669664 +Patch10: openbabel-fix-libdir-in-pkgconfig.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: eigen3-devel @@ -150,6 +153,7 @@ Ruby wrapper for the Open Babel library. %patch8 -p1 -b .tests %endif %patch9 -p1 -b .nc +%patch10 -p1 convert src/GUI/babel.xpm -transparent white babel.png # Remove duplicate html files @@ -274,6 +278,10 @@ make test %{ruby_vendorarchdir}/openbabel.so %changelog +* Sun Jan 27 2019 Dominik Mierzejewski - 2.4.1-12 +- Fix path to libdir in .pc (#1669664) +- Use https for URL: + * Thu Feb 08 2018 Fedora Release Engineering - 2.4.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild