#4 Update to 3.14.2
Merged 4 years ago by ignatenkobrain. Opened 4 years ago by ignatenkobrain.
rpms/ ignatenkobrain/facter upgrade  into  master

file modified
+45 -48
@@ -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 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 @@ 

  %{_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

  

empty or binary file added
file modified
+2 -2
@@ -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