Update to 3.14.2

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>

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
+Version:        3.14.2
-Release:        7%{?dist}
+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
 
-
+BuildRequires:  gnupg2
-%if 0%{?fedora}
+BuildRequires:  cmake%{?cmake_suffix}
-BuildRequires: boost-devel
+BuildRequires:  make
-BuildRequires: cmake
+BuildRequires:  gcc-c++
-%else
+BuildRequires:  libcurl-devel
-BuildRequires: boost157-devel
+BuildRequires:  leatherman-devel
-BuildRequires: cmake3
+BuildRequires:  boost%{?boost_suffix}-devel
-%endif
+BuildRequires:  ruby-devel >= 1.9
-BuildRequires: openssl-devel
+BuildRequires:  yaml-cpp-devel
-BuildRequires: yaml-cpp-devel
+BuildRequires:  openssl-devel
-BuildRequires: libblkid-devel
+BuildRequires:  libblkid-devel
-BuildRequires: libcurl-devel
+BuildRequires:  cpp-hocon-devel
-BuildRequires: gcc-c++ make
+#BuildRequires:  whereami-devel
-BuildRequires: wget
-BuildRequires: tar
-BuildRequires: gettext
-BuildRequires: leatherman-devel
-BuildRequires: cpp-hocon-devel
-BuildRequires: ruby-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}
+Summary:        Ruby bindings for facter
-Requires: ruby
+Requires:       %{name}%{?_isa} = %{version}-%{release}
-Summary: ruby bindings for facter
+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 . -B%{_target_platform} \
-%cmake -DCMAKE_BUILD_TYPE=Debug \
+  -DBOOST_INCLUDEDIR=%{_includedir}/boost%{?boost_suffix} \
-       -DLIBFACTER_INSTALL_DESTINATION=%{_lib} \
+  -DBOOST_LIBRARYDIR=%{_libdir}/boost%{?boost_suffix} \
-       -DCMAKE_INSTALL_PREFIX=%{_prefix}
+  -DLeatherman_DIR=%{_libdir}/cmake%{?cmake_suffix}/leatherman \
-%else
+  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-%cmake3 -DBOOST_INCLUDEDIR=/usr/include/boost157 \
+  %{nil}
-        -DBOOST_LIBRARYDIR=%{_libdir}/boost157 \
+%make_build -C %{_target_platform}
-        -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
 
 %install
-%{make_install}
+%make_install -C %{_target_platform}
 
 %check
-%__make test
+%make_build -C %{_target_platform} test
-
-%ldconfig_scriptlets
 
 %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
 

sources

@@ -1,2 +1,2 @@
-SHA512 (facter-3.9.3.tar.gz) = 57a1b4799f5199ff65ae196ce1f5dd9284fd27cad21c29f03ab443f63ec27855a0015be6e395b28036279cb5cc135cf0f562218095a34099c6374469c8803661
+SHA512 (facter-3.14.2.tar.gz) = e8f0b8b509c5d5ea1d7f2c3a0a7ff36d25aa55001237cc9cdc96eafcd59da845eb2a01a8ac334c2376a1692e80862dc575a551340a03d7ae02d6f32e5215a3ec
-SHA512 (facter-3.9.3.tar.gz.asc) = c5dbdf279ee90d11772c86e07740fd76a7d6413cb15fb3c0b9f14c318d973e3fe1b9a27edba363e677805b5c41ceeefc0e25025dee2b94c0853584e38b9df31d
+SHA512 (facter-3.14.2.tar.gz.asc) = 99f167ec481f859b4201c96bec23ed5db2936ee01915bc0824afa4749032788dbd021108c32ab4bebd9696dcebb3dcc3d021b76ee2d33513ab6a302893db5b68