2 commits - proxy/proxy rel-eng/packages spacewalk/spacewalk-setup-jabberd

Michael Mraka mmraka at fedoraproject.org
Mon Jun 11 12:37:15 UTC 2012


 proxy/proxy/spacewalk-proxy.spec                               |    8 +++++++-
 rel-eng/packages/spacewalk-proxy                               |    2 +-
 spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec |    1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit f594ef2abbe1a41d1873f4e28f74eae5690d83ff
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Mon Jun 11 14:37:02 2012 +0200

    Automatic commit of package [spacewalk-proxy] release [1.8.4-1].

diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 70ef3a0..e7b72fe 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group:   Applications/Internet
 License: GPLv2
 URL:     https://fedorahosted.org/spacewalk
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.8.3
+Version: 1.8.4
 Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: python
@@ -331,6 +331,10 @@ fi
 
 
 %changelog
+* Mon Jun 11 2012 Michael Mraka <michael.mraka at redhat.com> 1.8.4-1
+- provide /usr/share/spacewalk in proxy
+- %%defattr is not needed since rpm 4.4
+
 * Wed Apr 18 2012 Miroslav Suchý <msuchy at redhat.com> 1.8.3-1
 - add pylint warning
 
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index b786896..bd74585 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.8.3-1 proxy/proxy/
+1.8.4-1 proxy/proxy/


commit 09a4c70c4fddcc44963f1593753c588613e91a07
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Mon Jun 11 14:35:47 2012 +0200

    provide /usr/share/spacewalk in proxy

diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index b9043b6..70ef3a0 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -166,6 +166,7 @@ make -f Makefile.proxy
 rm -rf $RPM_BUILD_ROOT
 make -f Makefile.proxy install PREFIX=$RPM_BUILD_ROOT
 install -d -m 750 $RPM_BUILD_ROOT/%{_var}/cache/rhn/proxy-auth
+install -d -m 750 $RPM_BUILD_ROOT/%{_datadir}/spacewalk
 
 mkdir -p $RPM_BUILD_ROOT/%{_var}/spool/rhn-proxy/list
 
@@ -292,6 +293,7 @@ fi
 %attr(750,apache,apache) %dir %{_var}/spool/rhn-proxy
 %attr(750,apache,apache) %dir %{_var}/spool/rhn-proxy/list
 %attr(770,root,apache) %dir %{_var}/log/rhn
+%attr(755,root,apache) %dir %{_datadir}/spacewalk
 # config files
 %attr(755,root,apache) %dir %{rhnconf}
 %attr(645,root,apache) %config %{rhnconf}/rhn.conf
diff --git a/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
index aaacf2f..ed939fc 100644
--- a/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
+++ b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec
@@ -13,6 +13,7 @@ BuildArch:      noarch
 Requires:       perl
 Requires:       libxslt
 Requires:       jabberd
+Requires:       %{_datadir}/spacewalk
 
 %description
 Script, which setup Jabberd for Spacewalk. Used during installation of




More information about the spacewalk-commits mailing list