From a24fe400194e1bf704ed09db4fc845e0c64e98e5e0f9fb20e97746bcfaed9be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Wed, 25 Feb 2015 06:44:30 +0000 Subject: [PATCH] Accepting request 287583 from home:dimstar:Factory - 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 --- cfengine.changes | 8 ++++++++ cfengine.spec | 17 +---------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/cfengine.changes b/cfengine.changes index 429d3a9..ec4bf48 100644 --- a/cfengine.changes +++ b/cfengine.changes @@ -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 diff --git a/cfengine.spec b/cfengine.spec index 1bc9bdc..c4fcf95 100644 --- a/cfengine.spec +++ b/cfengine.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -127,11 +127,6 @@ Requires: cron %endif %endif -%if 0%{?suse_version} -PreReq: %install_info_prereq -BuildRequires: texlive -%endif - %if %have_systemd BuildRequires: systemd %{?systemd_requires} @@ -351,9 +346,6 @@ install -D -m 644 %{S:1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d %post %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 if [ $1 -lt 2 ]; then # first install, generate key pair @@ -365,9 +357,6 @@ fi %postun %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 # clean up inputs cache dir on removal rm -rf %{basedir}/inputs/* @@ -392,14 +381,10 @@ fi %endif %post -%if 0%{?suse_version} > 1010 -%install_info --name=%{name} --info-dir=%{_infodir} %{_infodir}/cf3-reference.info.gz -%endif /sbin/ldconfig %postun %if 0%{?suse_version} > 1010 -%install_info_delete --name=%{name} --info-dir=%{_infodir} %{_infodir}/cf3-reference.info.gz %insserv_cleanup for i in execd monitord serverd; do %restart_on_update cf-${i}