pool/cfengine
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix Fedora/RHEL builds

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=126
This commit is contained in:
Klaus Kämpf 2015-06-17 13:29:35 +00:00 committed by Git OBS Bridge
parent 1e89aa3bad
commit 04cdd861ad
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cfengine.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jun 17 13:09:09 UTC 2015 - kkaempf@suse.com
- Fix Fedora/RHEL builds
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 23 10:19:37 UTC 2015 - tchvatal@suse.com Mon Mar 23 10:19:37 UTC 2015 - tchvatal@suse.com

13
cfengine.spec
View File

@ -69,7 +69,6 @@ Patch7: cfengine-fips.patch
Patch8: 0001-Do-not-use-insecure-MD5-but-rather-SHA256.patch Patch8: 0001-Do-not-use-insecure-MD5-but-rather-SHA256.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: db-devel BuildRequires: db-devel
BuildRequires: fdupes
BuildRequires: flex BuildRequires: flex
BuildRequires: libacl-devel BuildRequires: libacl-devel
BuildRequires: libtool BuildRequires: libtool
@ -78,6 +77,8 @@ BuildRequires: lmdb-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: pcre-devel BuildRequires: pcre-devel
# for testing
BuildRequires: fakeroot
Requires: %{libsoname} = %{version} Requires: %{libsoname} = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{have_systemd} %if %{have_systemd}
@ -104,13 +105,19 @@ BuildRequires: systemd
%else %else
# Without systemd we require cron # Without systemd we require cron
Requires: cron Requires: cron
%if 0%{?suse_version}
Requires(post): %insserv_prereq %fillup_prereq Requires(post): %insserv_prereq %fillup_prereq
%endif %endif
%endif
# FHS was a hit with sle11 so it dies out otherwise # FHS was a hit with sle11 so it dies out otherwise
%if 0%{?suse_version} <= 1110 %if 0%{?suse_version} <= 1110
BuildRequires: -post-build-checks BuildRequires: -post-build-checks
%endif %endif
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
%description %description
CFEngine is the core of a configuration management system: ensuring CFEngine is the core of a configuration management system: ensuring
the availability, security and compliance of mission-critical the availability, security and compliance of mission-critical
@ -245,7 +252,7 @@ ln -s -f service %{buildroot}/%{_sbindir}/rccf-execd
ln -s -f service %{buildroot}/%{_sbindir}/rccf-serverd ln -s -f service %{buildroot}/%{_sbindir}/rccf-serverd
%else %else
# install init scripts # install init scripts
install -d %{buildroot}%{_sysconfdir}/init.d install -d %{buildroot}%{_initddir}
install -m 0755 %{SOURCE7} %{SOURCE8} %{SOURCE9} %{buildroot}%{_initddir}/ install -m 0755 %{SOURCE7} %{SOURCE8} %{SOURCE9} %{buildroot}%{_initddir}/
ln -s -f ../..%{_initddir}/cf-monitord %{buildroot}/%{_sbindir}/rccf-monitord ln -s -f ../..%{_initddir}/cf-monitord %{buildroot}/%{_sbindir}/rccf-monitord
ln -s -f ../..%{_initddir}/cf-execd %{buildroot}/%{_sbindir}/rccf-execd ln -s -f ../..%{_initddir}/cf-execd %{buildroot}/%{_sbindir}/rccf-execd
@ -281,7 +288,9 @@ done
install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/cfengine install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/cfengine
# Ckeabyo dyoes # Ckeabyo dyoes
%if 0%{?suse_version} > 1020
%fdupes %{buildroot}%{_datadir}/cfengine %fdupes %{buildroot}%{_datadir}/cfengine
%endif
%pre %pre
%if %{have_systemd} %if %{have_systemd}