Fix path to libdir in .pc (#1669664)

Use https for URL:
This commit is contained in:
Dominik 'Rathann' Mierzejewski 2019-01-27 11:43:09 +01:00
parent 41b8c32424
commit 6591d4b655
2 changed files with 21 additions and 2 deletions

View File

@ -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

View File

@ -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 <rpm@greysector.net> - 2.4.1-12
- Fix path to libdir in .pc (#1669664)
- Use https for URL:
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild