Hello community, here is the log from the commit of package cfengine for openSUSE:Factory checked in at 2015-06-30 10:16:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cfengine (Old) and /work/SRC/openSUSE:Factory/.cfengine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cfengine" Changes: -------- --- /work/SRC/openSUSE:Factory/cfengine/cfengine.changes 2015-04-02 16:03:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cfengine.new/cfengine.changes 2015-06-30 10:16:04.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 17 13:09:09 UTC 2015 - kkae...@suse.com + +- Fix Fedora/RHEL builds + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cfengine.spec ++++++ --- /var/tmp/diff_new_pack.RLqKdI/_old 2015-06-30 10:16:05.000000000 +0200 +++ /var/tmp/diff_new_pack.RLqKdI/_new 2015-06-30 10:16:05.000000000 +0200 @@ -69,7 +69,6 @@ Patch8: 0001-Do-not-use-insecure-MD5-but-rather-SHA256.patch BuildRequires: bison BuildRequires: db-devel -BuildRequires: fdupes BuildRequires: flex BuildRequires: libacl-devel BuildRequires: libtool @@ -78,6 +77,10 @@ BuildRequires: openssl-devel BuildRequires: pam-devel BuildRequires: pcre-devel +%if 0%{?suse_version} == 0 +# for testing on RHEL/Fedora +BuildRequires: fakeroot +%endif Requires: %{libsoname} = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{have_systemd} @@ -104,12 +107,20 @@ %else # Without systemd we require cron Requires: cron +%if 0%{?suse_version} Requires(post): %insserv_prereq %fillup_prereq %endif +%endif # FHS was a hit with sle11 so it dies out otherwise %if 0%{?suse_version} <= 1110 BuildRequires: -post-build-checks %endif +%if 0%{?suse_version} > 1020 +BuildRequires: fdupes +%endif +%if 0%{?fedora_version} == 20 +BuildRequires: perl-Exporter +%endif %description CFEngine is the core of a configuration management system: ensuring @@ -205,7 +216,11 @@ %endif --with-libacl \ --with-libxml2 \ +%if 0%{?rhel_version} > 0 && 0%{?rhel_version} < 700 + --docdir=%{_docdir}/%{name}-%{version} \ +%else --docdir=%{_docdir}/%{name} \ +%endif --with-pam make %{?_smp_mflags} @@ -245,7 +260,7 @@ ln -s -f service %{buildroot}/%{_sbindir}/rccf-serverd %else # install init scripts -install -d %{buildroot}%{_sysconfdir}/init.d +install -d %{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-execd %{buildroot}/%{_sbindir}/rccf-execd @@ -281,7 +296,9 @@ install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/cfengine # Ckeabyo dyoes +%if 0%{?suse_version} > 1020 %fdupes %{buildroot}%{_datadir}/cfengine +%endif %pre %if %{have_systemd}