2 commits - client/tools rel-eng/packages
by Miroslav Suchý
client/tools/osad/osad.spec | 11 +++++++----
rel-eng/packages/osad | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit b3a93d253bd4ea6bfac76e9bd7a747c0252329f8
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Mar 1 09:16:44 2012 +0100
Automatic commit of package [osad] release [5.10.40-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 44482b5..8d4ccc2 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -16,7 +16,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.39
+Version: 5.10.40
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -278,6 +278,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Thu Mar 01 2012 Miroslav Suchý 5.10.40-1
+- creating files for %%ghost should be done in %%install instead of %%build
+
* Wed Feb 29 2012 Miroslav Suchý 5.10.39-1
- log file may contain password, set chmod to 600
- by default log to /var/log/osad
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index 05e5384..8723ce5 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.10.39-1 client/tools/osad/
+5.10.40-1 client/tools/osad/
commit 185fc92ef861eab2e7cf9026d7a70c28341ea401
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Mar 1 09:16:31 2012 +0100
creating files for %ghost should be done in %install instead of %build
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 369f514..44482b5 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -126,14 +126,14 @@ do
make -C osa-dispatcher-selinux NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
done
%endif
-mkdir -p %{buildroot}%{_var}/log/rhn
-touch %{buildroot}%{_var}/log/osad
-touch %{buildroot}%{_var}/log/rhn/osa-dispatcher.log
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{rhnroot}
make -f Makefile.osad install PREFIX=$RPM_BUILD_ROOT ROOT=%{rhnroot} INITDIR=%{_initrddir}
+mkdir -p %{buildroot}%{_var}/log/rhn
+touch %{buildroot}%{_var}/log/osad
+touch %{buildroot}%{_var}/log/rhn/osa-dispatcher.log
%if 0%{?include_selinux_package}
for selinuxvariant in %{selinux_variants}
12 years, 2 months