From 404a42c4d2ae45d334b6c0474329c3782d44c0b166a647be7acbd124f2cd94e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Tue, 4 Feb 2014 07:10:43 +0000 Subject: [PATCH] fix build OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=67 --- cfengine.spec | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/cfengine.spec b/cfengine.spec index 9df45fc..5573643 100644 --- a/cfengine.spec +++ b/cfengine.spec @@ -144,7 +144,7 @@ libpromises library. %package doc Summary: CFEngine automates large-scale IT computing infrastructure - documentation -Group: Productivity/Networking/System +Group: Documentation/Other %if 0%{?rhel_version} || 0%{?centos_version} BuildRequires: tetex BuildRequires: tetex-dvips @@ -155,6 +155,13 @@ BuildRequires: texinfo %description doc Full documentation for cfengine +%package examples +Summary: CFEngine example promises +Group: Documentation/Other + +%description examples +Lots of examples promises for CFEngine. + %package server Summary: CFEngine automates large-scale IT computing infrastructure - server Group: Productivity/Networking/System @@ -245,8 +252,8 @@ sed -i\ %endif # install docs -%{__install} -d %{buildroot}/%{_datadir}/doc/%{name} -%{__install} -m 0644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{buildroot}/%{_datadir}/doc/%{name} +%{__install} -d %{buildroot}/%{_docdir}/%{name} +%{__install} -m 0644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{buildroot}/%{_docdir}/%{name} # create symlinks for sbin_PROGRAMS # because: cf-promises needs to be installed in /var/cfengine/work/bin for pre-validation of full configuration @@ -303,11 +310,11 @@ fi %service_add_pre cf-serverd.service %post server -if [ ${1:-0} -ne 1 ]; then - cp -a /usr/share/cfengine/CoreBase/controls /var/cfengine/inputs - cp -a /usr/share/cfengine/CoreBase/libraries /var/cfengine/inputs - cp -a /usr/share/cfengine/CoreBase/services /var/cfengine/inputs -fi +#if [ ${1:-0} -ne 1 ]; then +# cp -a /usr/share/cfengine/CoreBase/controls /var/cfengine/inputs +# cp -a /usr/share/cfengine/CoreBase/libraries /var/cfengine/inputs +# cp -a /usr/share/cfengine/CoreBase/services /var/cfengine/inputs +#fi %service_add_post cf-serverd.service %preun server @@ -382,6 +389,8 @@ fi %doc LICENSE # %doc README %doc ChangeLog +%exclude %{_docdir}/%{name}/examples +%exclude %{_docdir}/%{name}/*.pdf %{_sbindir}/cf-agent %{_sbindir}/cf-execd %{_sbindir}/cf-key @@ -430,8 +439,13 @@ fi %files doc %defattr(-,root,root) -%dir %{_datadir}/doc/%{name} -%{_datadir}/doc/%{name}/* +%doc %{_docdir}/%{name}/*.pdf +%exclude %{_docdir}/%{name}/examples + +%files examples +%defattr(-,root,root) +%dir %{_docdir}/%{name}/examples +%doc %{_docdir}/%{name}/examples %files server %defattr(-,root,root)