From cc8648918632fb5b97986938df460a1229414648 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Wed, 24 Jul 2019 12:05:16 +0200
Subject: [PATCH] Update to 3.14.2

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 facter.spec                                   |  93 +++++++++---------
 ...6B15509CF8E59E6E469F327F438280EF8D349F.gpg | Bin 0 -> 2259 bytes
 sources                                       |   4 +-
 3 files changed, 47 insertions(+), 50 deletions(-)
 create mode 100644 gpgkey-6F6B15509CF8E59E6E469F327F438280EF8D349F.gpg

diff --git a/facter.spec b/facter.spec
index ac1be98..4fa3108 100644
--- a/facter.spec
+++ b/facter.spec
@@ -1,45 +1,46 @@
+%if 0%{?rhel} && 0%{?rhel} <= 7
+%global boost_suffix 169
+%global cmake_suffix 3
+%global cmake %%cmake%{?cmake_suffix}
+%endif
+
 Name:           facter
-Version:        3.9.3
-Release:        7%{?dist}
+Version:        3.14.2
+Release:        1%{?dist}
 Summary:        Command and ruby library for gathering system information
 
 License:        ASL 2.0
-URL:            https://puppetlabs.com/%{name}
+URL:            https://puppetlabs.com/facter
 Source0:        https://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz
 Source1:        https://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz.asc
+Source2:        gpgkey-6F6B15509CF8E59E6E469F327F438280EF8D349F.gpg
 Patch0:         shared_cpp_hcon.patch
 
-
-%if 0%{?fedora}
-BuildRequires: boost-devel
-BuildRequires: cmake
-%else
-BuildRequires: boost157-devel
-BuildRequires: cmake3
-%endif
-BuildRequires: openssl-devel
-BuildRequires: yaml-cpp-devel
-BuildRequires: libblkid-devel
-BuildRequires: libcurl-devel
-BuildRequires: gcc-c++ make
-BuildRequires: wget
-BuildRequires: tar
-BuildRequires: gettext
-BuildRequires: leatherman-devel
-BuildRequires: cpp-hocon-devel
-BuildRequires: ruby-devel
+BuildRequires:  gnupg2
+BuildRequires:  cmake%{?cmake_suffix}
+BuildRequires:  make
+BuildRequires:  gcc-c++
+BuildRequires:  libcurl-devel
+BuildRequires:  leatherman-devel
+BuildRequires:  boost%{?boost_suffix}-devel
+BuildRequires:  ruby-devel >= 1.9
+BuildRequires:  yaml-cpp-devel
+BuildRequires:  openssl-devel
+BuildRequires:  libblkid-devel
+BuildRequires:  cpp-hocon-devel
+#BuildRequires:  whereami-devel
 
 # autoreq is not picking this one up so be specific
-Requires: leatherman
+Requires: leatherman%{?_isa}
 
 %package devel
-Requires:  %{name}%{?_isa} = %{version}-%{release}
-Summary: Development libraries for building against facter
+Summary:        Development libraries for building against facter
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %package -n ruby-%{name}
-Requires:  %{name}%{?_isa} = %{version}-%{release}
-Requires: ruby
-Summary: ruby bindings for facter
+Summary:        Ruby bindings for facter
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       ruby%{?_isa}
 
 %description
 Facter is a lightweight program that gathers basic node information about the
@@ -59,32 +60,23 @@ The headers to link against libfacter in other applications.
 The ruby bindings for libfacter.
 
 %prep
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -p1
 
 %build
-%if 0%{?fedora}
-%cmake -DCMAKE_BUILD_TYPE=Debug \
-       -DLIBFACTER_INSTALL_DESTINATION=%{_lib} \
-       -DCMAKE_INSTALL_PREFIX=%{_prefix}
-%else
-%cmake3 -DBOOST_INCLUDEDIR=/usr/include/boost157 \
-        -DBOOST_LIBRARYDIR=%{_libdir}/boost157 \
-        -DLIBFACTER_INSTALL_DESTINATION=%{_lib} \
-        -DCMAKE_BUILD_TYPE=Debug \
-        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-        -DLeatherman_DIR=%{_libdir}/cmake3/leatherman
-%endif
-%make_build
-# facter hardcode the path to lib, so set it correctly on other platforms
-sed -i 's#set(LIBFACTER_INSTALL_DESTINATION lib)#set(LIBFACTER_INSTALL_DESTINATION %{_lib})#' lib/CMakeLists.txt
+%cmake . -B%{_target_platform} \
+  -DBOOST_INCLUDEDIR=%{_includedir}/boost%{?boost_suffix} \
+  -DBOOST_LIBRARYDIR=%{_libdir}/boost%{?boost_suffix} \
+  -DLeatherman_DIR=%{_libdir}/cmake%{?cmake_suffix}/leatherman \
+  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+  %{nil}
+%make_build -C %{_target_platform}
 
 %install
-%{make_install}
+%make_install -C %{_target_platform}
 
 %check
-%__make test
-
-%ldconfig_scriptlets
+%make_build -C %{_target_platform} test
 
 %files
 %license LICENSE
@@ -97,12 +89,17 @@ sed -i 's#set(LIBFACTER_INSTALL_DESTINATION lib)#set(LIBFACTER_INSTALL_DESTINATI
 %{_mandir}/man8/%{name}*
 
 %files devel
-%{_includedir}/%{name}
+%{_includedir}/%{name}/
 
 %files -n ruby-%{name}
 %{ruby_vendorlibdir}/%{name}.rb
 
+%ldconfig_scriptlets
+
 %changelog
+* Wed Aug 14 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.14.2-1
+- Update to 3.14.2
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/gpgkey-6F6B15509CF8E59E6E469F327F438280EF8D349F.gpg b/gpgkey-6F6B15509CF8E59E6E469F327F438280EF8D349F.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..2d64c0c0522426e9941e659e37467c6429f5609b
GIT binary patch
literal 2259
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

literal 0
HcmV?d00001

diff --git a/sources b/sources
index 7a6c691..46947dc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (facter-3.9.3.tar.gz) = 57a1b4799f5199ff65ae196ce1f5dd9284fd27cad21c29f03ab443f63ec27855a0015be6e395b28036279cb5cc135cf0f562218095a34099c6374469c8803661
-SHA512 (facter-3.9.3.tar.gz.asc) = c5dbdf279ee90d11772c86e07740fd76a7d6413cb15fb3c0b9f14c318d973e3fe1b9a27edba363e677805b5c41ceeefc0e25025dee2b94c0853584e38b9df31d
+SHA512 (facter-3.14.2.tar.gz) = e8f0b8b509c5d5ea1d7f2c3a0a7ff36d25aa55001237cc9cdc96eafcd59da845eb2a01a8ac334c2376a1692e80862dc575a551340a03d7ae02d6f32e5215a3ec
+SHA512 (facter-3.14.2.tar.gz.asc) = 99f167ec481f859b4201c96bec23ed5db2936ee01915bc0824afa4749032788dbd021108c32ab4bebd9696dcebb3dcc3d021b76ee2d33513ab6a302893db5b68