rpms
/
facter
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rawhide' into f34

Browse Source
epel9
Breno Brand Fernandes 4 years ago
parent 6377e9ae78 0b3ee6af33
commit e01748a40c
5 changed files with 70 additions and 138 deletions
Show Stats Download Patch File Download Diff File

3
.gitignore vendored
Unescape View File

@ -4,3 +4,6 @@
*.tar.gz.asc *.tar.gz.asc
/.build*.log /.build*.log
/facter-*/ /facter-*/
/*.gem
/*.gem.asc
/puppet-gpg-signing-key-20250406.pub

47
facter-gcc11.patch
Unescape View File

@ -1,47 +0,0 @@
diff --git a/lib/src/util/bsd/scoped_ifaddrs.cc b/lib/src/util/bsd/scoped_ifaddrs.cc
index d61d8a4..fbbea6d 100644
--- a/lib/src/util/bsd/scoped_ifaddrs.cc
+++ b/lib/src/util/bsd/scoped_ifaddrs.cc
@@ -1,3 +1,4 @@
+#include <cstddef>
#include <internal/util/bsd/scoped_ifaddrs.hpp>
using namespace std;
diff --git a/lib/src/util/posix/scoped_addrinfo.cc b/lib/src/util/posix/scoped_addrinfo.cc
index 1dc60b4..bf5bf00 100644
--- a/lib/src/util/posix/scoped_addrinfo.cc
+++ b/lib/src/util/posix/scoped_addrinfo.cc
@@ -1,3 +1,5 @@
+#include <cstddef>
+
#include <internal/util/posix/scoped_addrinfo.hpp>
using namespace std;
diff --git a/lib/src/util/posix/scoped_bio.cc b/lib/src/util/posix/scoped_bio.cc
index cdf25d6..dfb7f09 100644
--- a/lib/src/util/posix/scoped_bio.cc
+++ b/lib/src/util/posix/scoped_bio.cc
@@ -1,4 +1,5 @@
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#include <cstddef>
#include <internal/util/posix/scoped_bio.hpp>
using namespace std;
diff --git a/lib/src/util/posix/scoped_descriptor.cc b/lib/src/util/posix/scoped_descriptor.cc
index 3ba2d4e..7a131d3 100644
--- a/lib/src/util/posix/scoped_descriptor.cc
+++ b/lib/src/util/posix/scoped_descriptor.cc
@@ -1,3 +1,4 @@
+#include <cstddef>
#include <internal/util/posix/scoped_descriptor.hpp>
using namespace std;
diff --git a/lib/src/util/scoped_file.cc b/lib/src/util/scoped_file.cc
index 440d8e3..2369987 100644
--- a/lib/src/util/scoped_file.cc
+++ b/lib/src/util/scoped_file.cc
@@ -1,3 +1,4 @@
+#include <cstddef>
#include <internal/util/scoped_file.hpp>
#include <boost/nowide/cstdio.hpp>

142
facter.spec
Unescape View File

@ -1,47 +1,39 @@
%if 0%{?rhel} && 0%{?rhel} <= 7 %global gem_name facter
%global boost_suffix 169 %global debug_package %{nil}
%global cmake_suffix 3
%global cmake %%cmake%{?cmake_suffix}
%endif
Name: facter Name: facter
Version: 3.14.7 Version: 4.2.0
Release: 7%{?dist} Release: 2%{?dist}
Summary: Command and ruby library for gathering system information Summary: Command and ruby library for gathering system information
License: ASL 2.0 License: MIT
URL: https://puppetlabs.com/facter URL: https://puppetlabs.com/facter
Source0: https://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz Source0: https://downloads.puppetlabs.com/%{name}/%{name}-%{version}.gem
Source1: https://downloads.puppetlabs.com/%{name}/%{name}-%{version}.tar.gz.asc Source1: https://downloads.puppetlabs.com/%{name}/%{name}-%{version}.gem.asc
Source2: gpgkey-6F6B15509CF8E59E6E469F327F438280EF8D349F.gpg Source2: https://downloads.puppetlabs.com/puppet-gpg-signing-key-20250406.pub
Patch0: shared_cpp_hcon.patch
Patch1: %{name}-gcc11.patch
BuildRequires: gnupg2 BuildRequires: gnupg2
BuildRequires: cmake%{?cmake_suffix} BuildRequires: rubygems-devel
BuildRequires: make BuildRequires: ruby >= 2.3
BuildRequires: gcc-c++ Requires: ruby(rubygems)
BuildRequires: libcurl-devel
BuildRequires: leatherman-devel # Add runtime deps for testing
BuildRequires: boost%{?boost_suffix}-devel BuildRequires: rubygem(hocon)
BuildRequires: ruby-devel >= 1.9 BuildRequires: rubygem(thor)
BuildRequires: yaml-cpp-devel
BuildRequires: openssl-devel # Binaries that Facter can call for complete facts
BuildRequires: libblkid-devel %ifarch %ix86 x86_64 ia64
BuildRequires: cpp-hocon-devel Requires: dmidecode
#BuildRequires: whereami-devel Requires: pciutils
Requires: virt-what
# autoreq is not picking this one up so be specific %endif
Requires: leatherman%{?_isa} Requires: net-tools
%package devel Provides: ruby-%{name} = %{version}
Summary: Development libraries for building against facter Obsoletes: ruby-%{name} < 4
Requires: %{name}%{?_isa} = %{version}-%{release} Obsoletes: %{name}-devel < 4
%package -n ruby-%{name} BuildArch: noarch
Summary: Ruby bindings for facter
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: ruby%{?_isa}
%description %description
Facter is a lightweight program that gathers basic node information about the Facter is a lightweight program that gathers basic node information about the
@ -54,63 +46,57 @@ custom or site specific. It is easy to extend by including your own custom
facts. Facter can also be used to create conditional expressions in Puppet that facts. Facter can also be used to create conditional expressions in Puppet that
key off the values returned by facts. key off the values returned by facts.
%description devel
The headers to link against libfacter in other applications.
%description -n ruby-%{name} %package doc
The ruby bindings for libfacter. Summary: Documentation for %{name}
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description doc
Documentation for %{name}.
%prep %prep
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%autosetup -p1 %setup -q -n %{gem_name}-%{version}
%build %build
%cmake . -B%{_target_platform} \ gem build ../%{gem_name}-%{version}.gemspec
-DBOOST_INCLUDEDIR=%{_includedir}/boost%{?boost_suffix} \ %gem_install
-DBOOST_LIBRARYDIR=%{_libdir}/boost%{?boost_suffix} \
-DLeatherman_DIR=%{_libdir}/cmake%{?cmake_suffix}/leatherman \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
%{nil}
%make_build -C %{_target_platform}
%install %install
%make_install -C %{_target_platform} mkdir -p %{buildroot}%{gem_dir}
cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/
mkdir -p %{buildroot}%{_bindir}
cp -a .%{gem_instdir}/bin/facter %{buildroot}%{_bindir}
rm -rf %{buildroot}/%{gem_instdir}/bin
%check %check
# Tests depend too much on environment # No test suite can run since the spec files are not part of the gem
# 1: ------------------------------------------------------------------------------- # So try to run the executable and see if that works
# 1: Scenario: using the filesystem resolver GEM_HOME="%{buildroot}%{gem_dir}" %{buildroot}%{_bindir}/facter
# 1: When: populating facts
# 1: Then: non-tmpfs mounts should exist
# 1: -------------------------------------------------------------------------------
# 1: /builddir/build/BUILD/facter-3.14.2/lib/tests/facts/linux/filesystem_resolver.cc:37
# 1: ...............................................................................
# 1:
# 1: /builddir/build/BUILD/facter-3.14.2/lib/tests/facts/linux/filesystem_resolver.cc:38: FAILED:
# 1: REQUIRE( facts.query<facter::facts::map_value>("mountpoints./") )
# 1: with expansion:
# 1: NULL
#make_build -C %{_target_platform} test
%files %files
%license LICENSE %dir %{gem_instdir}
%doc README.md %{_bindir}/facter
%{_bindir}/%{name} %{gem_libdir}
# Note that leatherman has a hardcoded libfacter.so path for the installation %exclude %{gem_cache}
# of the library for the bindings: https://tickets.puppetlabs.com/browse/FACT-1772 %{gem_spec}
%{_libdir}/lib%{name}.so.*
%{_libdir}/lib%{name}.so
%{_mandir}/man8/%{name}*
%files devel %files doc
%{_includedir}/%{name}/ %doc %{gem_docdir}
%files -n ruby-%{name} %changelog
%{ruby_vendorlibdir}/%{name}.rb * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
%ldconfig_scriptlets * Wed Jun 02 2021 Joel Capitao <jcapitao@redhat.com> - 4.2.0-1
- Update to 4.2.0
%changelog
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.14.7-7 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.14.7-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

11
shared_cpp_hcon.patch
Unescape View File

@ -1,11 +0,0 @@
diff --git a/cmake/FindCPPHOCON.cmake b/cmake/FindCPPHOCON.cmake
index 00ba8bd..0df0a51 100644
--- a/cmake/FindCPPHOCON.cmake
+++ b/cmake/FindCPPHOCON.cmake
@@ -1,5 +1,5 @@
include(FindDependency)
-find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "libcpp-hocon.a")
+find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "libcpp-hocon.so")
include(FeatureSummary)
set_package_properties(CPPHOCON PROPERTIES DESCRIPTION "A C++ parser for the HOCON configuration language" URL "https://github.com/puppetlabs/cpp-hocon")

5
sources
Unescape View File

@ -1,2 +1,3 @@
SHA512 (facter-3.14.7.tar.gz) = df7c3343d0330e749915f34ab655141b7db5a4a0501c1ee6b2d59f7ffea0a13339ae9885b7555c429d7901532a2f7b23cb36b25594f357f9b41da4cdc750c7df SHA512 (facter-4.2.0.gem) = 6897c8a0cafa29c3afb19a7095d073fd7b85f99203427371946a850a12ab33f98bef5c1fb5e75b8713893570b9b01f4889790f55d83821dbd93cf668645f1abd
SHA512 (facter-3.14.7.tar.gz.asc) = 3ff074a639146d0550d75bbfd6e3b60acfd76c8b13242eda3035f0b8ea12ebe28948b9c822ae707c85c6a511c7cc107c72446466d7c28fe8b7a62238f0cd7b96 SHA512 (facter-4.2.0.gem.asc) = 30ff5c1c1936345d983fa7a4a7217086598bd672aeaf8c262a4a4c95a71e3db44347421c756ac8b71a5261f21036c1603e5f0cdd5888c41ff736b12c1ea43a44
SHA512 (puppet-gpg-signing-key-20250406.pub) = 571abab24c87f039d1e5194894f4c00784f39d4a57c2860de81fedd6a2d8e3ed222d845e8a852e3dc893557947bb200b2965fe15fc881f8f1932af9b5f061d09

Write Preview
Loading…
Cancel
Save