diff --git a/.gitignore b/.gitignore index 2add606..ba3090d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /spacewalk-backend-1.3.56.tar.gz /spacewalk-backend-1.4.39.tar.gz /spacewalk-backend-1.6.66.tar.gz +/spacewalk-backend-1.7.38.tar.gz diff --git a/sources b/sources index c2fdab8..57ddcde 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -931f529bbd27ab037c354f1633e38204 spacewalk-backend-1.6.66.tar.gz +f5a9466d824b9a08080398a01004aa84 spacewalk-backend-1.7.38.tar.gz diff --git a/spacewalk-backend.spec b/spacewalk-backend.spec index b2455ab..93d4905 100644 --- a/spacewalk-backend.spec +++ b/spacewalk-backend.spec @@ -11,9 +11,9 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet -License: GPLv2 and Python -Version: 1.6.66 -Release: 2%{?dist} +License: GPLv2 +Version: 1.7.38 +Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,6 +28,13 @@ Requires: %{name}-libs >= 1.1.16-1 BuildRequires: /usr/bin/msgfmt BuildRequires: /usr/bin/docbook2man BuildRequires: docbook-utils +%if 0%{?fedora} > 15 || 0%{?rhel} > 5 +BuildRequires: spacewalk-pylint +BuildRequires: rhnlib >= 2.5.38 +BuildRequires: rpm-python +BuildRequires: python-crypto +BuildRequires: python-debian +%endif Requires(pre): httpd Requires: httpd # we don't really want to require this redhat-release, so we protect @@ -56,15 +63,15 @@ Requires: %{name}-sql-virtual = %{version}-%{release} This package contains the basic code that provides SQL connectivity for the Spacewalk backend modules. -#%package sql-oracle -#Summary: Oracle backend for Spacewalk -#Group: Applications/Internet -#Requires: python(:DBAPI:oracle) -#Provides: %{name}-sql-virtual = %{version}-%{release} -# -#%description sql-oracle -#This package contains provides Oracle connectivity for the Spacewalk backend -#modules. +%package sql-oracle +Summary: Oracle backend for Spacewalk +Group: Applications/Internet +Requires: python(:DBAPI:oracle) +Provides: %{name}-sql-virtual = %{version}-%{release} + +%description sql-oracle +This package contains provides Oracle connectivity for the Spacewalk backend +modules. %package sql-postgresql Summary: Postgresql backend for Spacewalk @@ -273,8 +280,6 @@ Libraries required by various exporting tools %build make -f Makefile.backend all -export PYTHON_MODULE_NAME=%{name} -export PYTHON_MODULE_VERSION=%{version} %install rm -rf $RPM_BUILD_ROOT @@ -294,14 +299,19 @@ rm -v $RPM_BUILD_ROOT/%{apacheconfd}/zz-spacewalk-server-python.conf %find_lang %{name}-server -rm -f $RPM_BUILD_ROOT/%{pythonrhnroot}/server/rhnSQL/driver_cx_Oracle.py* - %clean rm -rf $RPM_BUILD_ROOT %check make -f Makefile.backend PYTHONPATH=$RPM_BUILD_ROOT/%{python_sitelib} test || : +%if 0%{?fedora} > 15 || 0%{?rhel} > 5 +# check coding style +export PYTHONPATH=$RPM_BUILD_ROOT/%{python_sitelib}:/usr/lib/rhn +spacewalk-pylint $RPM_BUILD_ROOT%{pythonrhnroot}/common \ + $RPM_BUILD_ROOT%{pythonrhnroot}/wsgi +%endif + %pre server OLD_SECRET_FILE=%{_var}/www/rhns/server/secret/rhnSecret.py if [ -f $OLD_SECRET_FILE ]; then @@ -333,7 +343,7 @@ rm -f %{rhnconf}/rhnSecret.py* %files %defattr(-,root,root) -%doc PYTHON-LICENSES.txt LICENSE +%doc LICENSE %dir %{pythonrhnroot} %dir %{pythonrhnroot}/common %{pythonrhnroot}/common/apache.py* @@ -367,7 +377,7 @@ rm -f %{rhnconf}/rhnSecret.py* %files sql %defattr(-,root,root) -%doc PYTHON-LICENSES.txt LICENSE +%doc LICENSE # Need __init__ = share it with rhns-server %dir %{pythonrhnroot}/server %{pythonrhnroot}/server/__init__.py* @@ -378,19 +388,19 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/server/rhnSQL/__init__.py* %{pythonrhnroot}/server/rhnSQL/sql_*.py* -#%files sql-oracle -#%defattr(-,root,root,-) -#%doc PYTHON-LICENSES.txt LICENSE -#%{pythonrhnroot}/server/rhnSQL/driver_cx_Oracle.py* +%files sql-oracle +%defattr(-,root,root,-) +%doc LICENSE +%{pythonrhnroot}/server/rhnSQL/driver_cx_Oracle.py* %files sql-postgresql %defattr(-,root,root,-) -%doc PYTHON-LICENSES.txt LICENSE +%doc LICENSE %{pythonrhnroot}/server/rhnSQL/driver_postgresql.py* %files server -f %{name}-server.lang %defattr(-,root,root) -%doc PYTHON-LICENSES.txt LICENSE +%doc LICENSE # modules %{pythonrhnroot}/server/apacheAuth.py* %{pythonrhnroot}/server/apacheHandler.py* @@ -473,7 +483,7 @@ rm -f %{rhnconf}/rhnSecret.py* %files xmlrpc %defattr(-,root,root) -%doc PYTHON-LICENSES.txt LICENSE +%doc LICENSE %dir %{rhnroot}/server/handlers/xmlrpc %{rhnroot}/server/handlers/xmlrpc/* %dir %{pythonrhnroot}/server/action @@ -487,7 +497,7 @@ rm -f %{rhnconf}/rhnSecret.py* %files applet %defattr(-,root,root) -%doc PYTHON-LICENSES.txt LICENSE +%doc LICENSE %dir %{rhnroot}/server/handlers/applet %{rhnroot}/server/handlers/applet/* # config files @@ -497,7 +507,7 @@ rm -f %{rhnconf}/rhnSecret.py* %files app %defattr(-,root,root) -%doc PYTHON-LICENSES.txt LICENSE +%doc LICENSE %dir %{rhnroot}/server/handlers/app %{rhnroot}/server/handlers/app/* # config files @@ -507,7 +517,7 @@ rm -f %{rhnconf}/rhnSecret.py* %files xp %defattr(-,root,root) -%doc PYTHON-LICENSES.txt LICENSE +%doc LICENSE %dir %{rhnroot}/server/handlers/xp %{rhnroot}/server/handlers/xp/* # config files @@ -517,7 +527,7 @@ rm -f %{rhnconf}/rhnSecret.py* %files iss %defattr(-,root,root) -%doc PYTHON-LICENSES.txt LICENSE +%doc LICENSE %dir %{rhnroot}/server/handlers/sat %{rhnroot}/server/handlers/sat/* %config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-iss @@ -525,7 +535,7 @@ rm -f %{rhnconf}/rhnSecret.py* %files iss-export %defattr(-,root,root) -%doc PYTHON-LICENSES.txt LICENSE +%doc LICENSE %dir %{pythonrhnroot}/satellite_exporter %{pythonrhnroot}/satellite_exporter/__init__.py* %{pythonrhnroot}/satellite_exporter/satexport.py* @@ -542,7 +552,7 @@ rm -f %{rhnconf}/rhnSecret.py* %files libs %defattr(-,root,root) -%doc PYTHON-LICENSES.txt LICENSE +%doc LICENSE %{pythonrhnroot}/__init__.py* %dir %{pythonrhnroot}/common %{pythonrhnroot}/common/__init__.py* @@ -555,14 +565,14 @@ rm -f %{rhnconf}/rhnSecret.py* %files config-files-common %defattr(-,root,root) -%doc PYTHON-LICENSES.txt LICENSE +%doc LICENSE %{pythonrhnroot}/server/configFilesHandler.py* %dir %{pythonrhnroot}/server/config_common %{pythonrhnroot}/server/config_common/* %files config-files %defattr(-,root,root) -%doc PYTHON-LICENSES.txt LICENSE +%doc LICENSE %dir %{rhnroot}/server/handlers/config %{rhnroot}/server/handlers/config/* %attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_config-management.conf @@ -571,7 +581,7 @@ rm -f %{rhnconf}/rhnSecret.py* %files config-files-tool %defattr(-,root,root) -%doc PYTHON-LICENSES.txt LICENSE +%doc LICENSE %dir %{rhnroot}/server/handlers/config_mgmt %{rhnroot}/server/handlers/config_mgmt/* %attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_config-management-tool.conf @@ -580,7 +590,7 @@ rm -f %{rhnconf}/rhnSecret.py* %files package-push-server %defattr(-,root,root) -%doc PYTHON-LICENSES.txt LICENSE +%doc LICENSE %dir %{rhnroot}/upload_server %{rhnroot}/upload_server/__init__.py* %dir %{rhnroot}/upload_server/handlers @@ -593,7 +603,7 @@ rm -f %{rhnconf}/rhnSecret.py* %files tools %defattr(-,root,root) -%doc PYTHON-LICENSES.txt LICENSE +%doc LICENSE %attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_satellite.conf %config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-tools %attr(755,root,root) %{_bindir}/rhn-charsets @@ -660,7 +670,7 @@ rm -f %{rhnconf}/rhnSecret.py* %files xml-export-libs %defattr(-,root,root) -%doc PYTHON-LICENSES.txt LICENSE +%doc LICENSE %dir %{pythonrhnroot}/satellite_tools %{pythonrhnroot}/satellite_tools/__init__.py* %{pythonrhnroot}/satellite_tools/geniso.py* @@ -677,8 +687,152 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog -* Sat Jan 14 2012 Fedora Release Engineering - 1.6.66-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild +* Fri Mar 02 2012 Michael Mraka 1.7.38-1 +- channel id have to be number + +* Fri Mar 02 2012 Jan Pazdziora 1.7.37-1 +- Update the copyright year info. + +* Tue Feb 28 2012 Jan Pazdziora 1.7.36-1 +- Update .po and .pot files for spacewalk-backend. +- Download translations from Transifex for spacewalk-backend. +- Remove unstructured debugging outputs. (slukasik@redhat.com) + +* Tue Feb 28 2012 Michael Mraka 1.7.35-1 +- fixed 'speeded up searching whether package is already synced' + +* Tue Feb 28 2012 Jan Pazdziora 1.7.34-1 +- Avoid vn_rhnpackageevr_epoch violation. + +* Mon Feb 27 2012 Simon Lukasik 1.7.33-1 +- OpenSCAP integration -- Backend API interface. (slukasik@redhat.com) +- convert empty string to NULL for postgresql (michael.mraka@redhat.com) + +* Mon Feb 27 2012 Michael Mraka 1.7.32-1 +- use already known channel id +- speeded up searching whether package is already synced + +* Mon Feb 27 2012 Michael Mraka 1.7.31-1 +- merged solve_dependencies_arch() and solve_dependencies() +- merged listChannelsSource() and listChannels() + +* Fri Feb 24 2012 Michael Mraka 1.7.30-1 +- 727979 - don't hardcode package suffix + +* Thu Feb 23 2012 Michael Mraka 1.7.29-1 +- removed unused pygettext.py +- we are now just GPL + +* Wed Feb 22 2012 Michael Mraka 1.7.26-1 +- diffing packages speedup on postgresql + +* Wed Feb 22 2012 Michael Mraka 1.7.25-1 +- fixed pylint error in rpm check +- parseRPMFilename() should stay in server/rpmLib + +* Wed Feb 22 2012 Michael Mraka 1.7.24-1 +- import rhnLog stuff once +- moved parseRPMName() from server/rhnLib to common/rhnLib + +* Mon Feb 20 2012 Michael Mraka 1.7.23-1 +- fixed up2date --show-available on PG + +* Fri Feb 17 2012 Michael Mraka 1.7.22-1 +- wsgi should be pylint clean from now +- pylint cleanup in backend/wsgi +* Fri Feb 17 2012 Michael Mraka 1.7.21-1 +- insert empty strings as NULL for postgresql + +* Wed Feb 15 2012 Michael Mraka 1.7.20-1 +- use spacewalk-pylint for coding style check +- fixed pylint errors +- removed unused function + +* Fri Feb 10 2012 Michael Mraka 1.7.19-1 +- empty epoch have to be None +- compute payload_size including its header +- idn_ascii_to_pune() expects string not list +- made mod_wsgi configuration consistent with mod_python + +* Wed Feb 08 2012 Michael Mraka 1.7.18-1 +- added description to pushed debian packages + +* Tue Feb 07 2012 Michael Mraka 1.7.17-1 +- fixed KeyError during deb package push +- fixed ERROR: unhandled exception occurred: ('epoch'). +- fixed InvalidPackageErrorduring push of deb package +- converted rhnpush to use A_Package interface + +* Mon Feb 06 2012 Michael Mraka 1.7.16-1 +- fixed rpmbuild on RHEL5 + +* Mon Feb 06 2012 Michael Mraka 1.7.15-1 +- fixed nsglms errors +- fixed pylint error on Fedora 16 +- fixed tempfile error on RHEL5 + +* Sat Feb 04 2012 Michael Mraka 1.7.14-1 +- fixed macros in changelog +- check common/* for pylint errors +- fixed pylint errors and warnings in common/*.py + +* Fri Feb 03 2012 Michael Mraka 1.7.13-1 +- simplified checksum_exists condition +- merged duplicated h.execute() call +- version and release should be strings, epoch should be None or string +- modified RPM/MPM/DEB package for payload_checksum +- generic code to compute checksum of package +- spacewalk-repo-sync updated to use new package object +- created DEB_Package +- moved InvalidPackageError to rhn_pkg +- created RPM_Package +- create proper package object +- compute checksum while saving payload +- rewritten package_push handler to use package object +- created virtual class for RPM/MPM/DEB packages + +* Thu Feb 02 2012 Jan Pazdziora 1.7.12-1 +- Call the test entitlement count check for satellite-sync as well. + +* Wed Feb 01 2012 Aron Parsons 1.7.11-1 +- fix incorrect parsing of errata bug data on import (parsonsa@bit-sys.com) + +* Thu Jan 26 2012 Michael Mraka 1.7.10-1 +- fixed rhnpush ERROR: unhandled exception occurred: (timed out) + +* Tue Jan 24 2012 Michael Mraka 1.7.9-1 +- Use shutil instead of os to push packages + +* Mon Jan 23 2012 Aron Parsons 1.7.8-1 +- use the correct tag for the bugzilla href field (aronparsons@gmail.com) + +* Mon Jan 23 2012 Michael Mraka 1.7.7-1 +- 756918 - workaround for package_group issue + +* Tue Jan 17 2012 Michael Mraka 1.7.6-1 +- use name_ids to speedup reposync + +* Mon Jan 16 2012 Miroslav Suchý 1.7.5-1 +- Avoing rhnChecksum_seq.nextval Oracle syntax. + +* Tue Jan 10 2012 Jan Pazdziora 1.7.4-1 +- Revert "695282 - censor password from registration.reserve_user if it appears + in TB" +- 749890 - setting up seclist in reserve_user, new_system, and + new_system_user_pass. + +* Thu Jan 05 2012 Jan Pazdziora 1.7.3-1 +- Removing the debugging prints. +- removed dead code (michael.mraka@redhat.com) + +* Tue Jan 03 2012 Michael Mraka 1.7.2-1 +- code cleanup +- removed dead remaining_subscriptions() + +* Thu Dec 22 2011 Jan Pazdziora 1.7.1-1 +- Check for channel family entitlement counts. +- Also show what the certificate slot is called in the WebUI. +- Better explanation of slot changes. * Wed Dec 21 2011 Milan Zazrivec 1.6.66-1 - update copyright info @@ -1024,7 +1178,7 @@ rm -f %{rhnconf}/rhnSecret.py* - We need to specifically check for None when calling decode. * Fri May 20 2011 Jan Pazdziora 1.5.27-1 -- Removing %{pythonrhnroot}/common/UserDictCase.py* from %files. +- Removing %%{pythonrhnroot}/common/UserDictCase.py* from %%files. * Fri May 20 2011 Michael Mraka 1.5.26-1 - package path should contain epoch @@ -1442,7 +1596,7 @@ rm -f %{rhnconf}/rhnSecret.py* - fixed %%files for spacewalk-backend-libs * Thu Dec 16 2010 Jan Pazdziora 1.3.27-1 -- Dropping satellite_tools/exporter/exporter.py from the Makefile and %files. +- Dropping satellite_tools/exporter/exporter.py from the Makefile and %%files. * Wed Dec 15 2010 Miroslav Suchý 1.3.26-1 - 624092 - update package if pushing using --force and package with same NVREA @@ -1477,7 +1631,7 @@ rm -f %{rhnconf}/rhnSecret.py* - fixed column aliases (PG) * Wed Dec 01 2010 Jan Pazdziora 1.3.20-1 -- Ignore the %check results for now. +- Ignore the %%check results for now. * Wed Dec 01 2010 Lukas Zapletal 1.3.19-1 - 644985 - SELinux context cleared from RHEL4 rhncfg-client