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

Accepting request 287583 from home:dimstar:Factory

Browse Source 
- Remove install-info calls in post/postun: there is no info page
  being installed.
- rop texlive BuildRequires (there is no info page, and even if,
  makeinfo would be sufficien).

OBS-URL: https://build.opensuse.org/request/show/287583
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=112
This commit is contained in:
Klaus Kämpf 2015-02-25 06:44:30 +00:00 committed by Git OBS Bridge
parent c93c29f1e4
commit a24fe40019
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cfengine.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Feb 24 18:18:21 UTC 2015 - dimstar@opensuse.org
- Remove install-info calls in post/postun: there is no info page
being installed.
- rop texlive BuildRequires (there is no info page, and even if,
makeinfo would be sufficien).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 28 06:58:12 UTC 2015 - kkaempf@suse.com Wed Jan 28 06:58:12 UTC 2015 - kkaempf@suse.com

17
cfengine.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package cfengine # spec file for package cfengine
# #
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -127,11 +127,6 @@ Requires: cron
%endif %endif
%endif %endif
%if 0%{?suse_version}
PreReq: %install_info_prereq
BuildRequires: texlive
%endif
%if %have_systemd %if %have_systemd
BuildRequires: systemd BuildRequires: systemd
%{?systemd_requires} %{?systemd_requires}
@ -351,9 +346,6 @@ install -D -m 644 %{S:1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d
%post %post
%service_add_post cf-execd.service cf-monitord.service cf-serverd.service %service_add_post cf-execd.service cf-monitord.service cf-serverd.service
%if 0%{?suse_version} > 1010
%install_info --name=%{name} --info-dir=%{_infodir} %{_infodir}/cf3-reference.info.gz
%endif
/sbin/ldconfig /sbin/ldconfig
if [ $1 -lt 2 ]; then if [ $1 -lt 2 ]; then
# first install, generate key pair # first install, generate key pair
@ -365,9 +357,6 @@ fi
%postun %postun
%service_del_postun cf-execd.service cf-monitord.service cf-serverd.service %service_del_postun cf-execd.service cf-monitord.service cf-serverd.service
%if 0%{?suse_version} > 1010
%install_info_delete --name=%{name} --info-dir=%{_infodir} %{_infodir}/cf3-reference.info.gz
%endif
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
# clean up inputs cache dir on removal # clean up inputs cache dir on removal
rm -rf %{basedir}/inputs/* rm -rf %{basedir}/inputs/*
@ -392,14 +381,10 @@ fi
%endif %endif
%post %post
%if 0%{?suse_version} > 1010
%install_info --name=%{name} --info-dir=%{_infodir} %{_infodir}/cf3-reference.info.gz
%endif
/sbin/ldconfig /sbin/ldconfig
%postun %postun
%if 0%{?suse_version} > 1010 %if 0%{?suse_version} > 1010
%install_info_delete --name=%{name} --info-dir=%{_infodir} %{_infodir}/cf3-reference.info.gz
%insserv_cleanup %insserv_cleanup
for i in execd monitord serverd; do for i in execd monitord serverd; do
%restart_on_update cf-${i} %restart_on_update cf-${i}