diff --git a/.gitignore b/.gitignore index 247cae4..b2afd68 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ rhnpush-0.4.5.tar.gz /rhnpush-5.5.24.tar.gz /rhnpush-5.5.36.tar.gz /rhnpush-5.5.42.tar.gz +/rhnpush-5.5.55.tar.gz diff --git a/rhnpush.spec b/rhnpush.spec index 0c6c75b..8046e30 100644 --- a/rhnpush.spec +++ b/rhnpush.spec @@ -4,13 +4,13 @@ Name: rhnpush Group: Applications/System License: GPLv2 URL: http://fedorahosted.org/spacewalk -Version: 5.5.42 -Release: 2%{?dist} +Version: 5.5.55 +Release: 1%{?dist} Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: rpm-python -Requires: rhnlib >= 2.5.38 +Requires: rhnlib Requires: spacewalk-backend-libs >= 1.7.17 Requires: rhn-client-tools %if 0%{?suse_version} @@ -19,6 +19,12 @@ BuildRequires: rhn-client-tools %endif BuildRequires: docbook-utils, gettext BuildRequires: python-devel +%if 0%{?fedora} > 15 || 0%{?rhel} > 5 +# pylint check +BuildRequires: spacewalk-pylint >= 0.6 +BuildRequires: rhn-client-tools +BuildRequires: spacewalk-backend-libs > 1.8.33 +%endif Summary: Package uploader for the Red Hat Network Satellite Server @@ -39,25 +45,83 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/%{rhnroot} make -f Makefile.rhnpush install PREFIX=$RPM_BUILD_ROOT ROOT=%{rhnroot} \ MANDIR=%{_mandir} +%if 0%{?rhel} && 0%{?rhel} < 6 +rm -fv $RPM_BUILD_ROOT%{_bindir}/solaris2mpm +rm -fv $RPM_BUILD_ROOT%{rhnroot}/rhnpush/solaris2mpm.py* +rm -fv $RPM_BUILD_ROOT%{_mandir}/man8/solaris2mpm.8* +%endif %clean rm -rf $RPM_BUILD_ROOT +%check +%if 0%{?fedora} > 15 || 0%{?rhel} > 5 +# check coding style +export PYTHONPATH=$RPM_BUILD_ROOT%{python_sitelib}:/usr/share/rhn +spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot} +%endif %files -%defattr(-,root,root) %dir %{rhnroot}/rhnpush %{rhnroot}/rhnpush/* %attr(755,root,root) %{_bindir}/rhnpush %attr(755,root,root) %{_bindir}/rpm2mpm -%attr(755,root,root) %{_bindir}/solaris2mpm %config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/rhn/rhnpushrc %{_mandir}/man8/rhnpush.8* +%if 0%{?fedora} || 0%{?rhel} > 5 +%attr(755,root,root) %{_bindir}/solaris2mpm %{_mandir}/man8/solaris2mpm.8* +%endif +%doc COPYING %changelog -* Sat Jul 21 2012 Fedora Release Engineering - 5.5.42-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild +* Tue Oct 30 2012 Jan Pazdziora 5.5.55-1 +- Update the copyright year. + +* Mon Oct 22 2012 Jan Pazdziora 5.5.54-1 +- Revert "Revert "Revert "get_server_capability() is defined twice in osad and + rhncfg, merge and move to rhnlib and make it member of rpclib.Server""" + +* Fri Aug 24 2012 Michael Mraka 5.5.53-1 +- latest spacewalk-pylint is required + +* Fri Aug 24 2012 Michael Mraka 5.5.52-1 +- turned on pylint checks +- fixed pylint errors/warnings +* Tue Aug 21 2012 Michael Mraka 5.5.51-1 +- removed dead code +- fixed pylint errors + +* Wed Jul 25 2012 Michael Mraka 5.5.50-1 +- fixed pylint warnings and errors + +* Fri Jul 13 2012 Michael Mraka 5.5.49-1 +- fixed man page +- removed dead --no-cache option +- fixed --no-session-caching option + +* Fri Jul 13 2012 Michael Mraka 5.5.48-1 +- 838044 - solaris2mpm on RHEL5 is not supported +- remove trailing '/' from from archive dir + +* Tue Jun 26 2012 Michael Mraka 5.5.47-1 +- reuse UploadError from uploadLib +- removed functions not used in rhnpush/rhn-package-manager +- simplified authentication code + +* Fri Jun 22 2012 Michael Mraka 5.5.46-1 +- removed commented out code and obsoleted comments + +* Sat Jun 16 2012 Miroslav Suchý 5.5.45-1 +- 827022 - add COPYING file + +* Mon May 21 2012 Jan Pazdziora 5.5.44-1 +- 823491 - Use the correct a_pkg variable. +- %%defattr is not needed since rpm 4.4 + +* Mon Mar 05 2012 Michael Mraka 5.5.43-1 +- removed unused get_header_struct_size() +- removed unused function get_header_byte_range() * Fri Mar 02 2012 Jan Pazdziora 5.5.42-1 - Update the copyright year info. diff --git a/sources b/sources index 3c4726c..cab0f19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05bb5799d978d8956566af352b7eb437 rhnpush-5.5.42.tar.gz +29655f617241f0fa25f138f057abf733 rhnpush-5.5.55.tar.gz