commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory
checked in at Thu Feb 3 02:02:40 CET 2011.
--------
--- cobbler/cobbler.changes 2011-01-19 16:17:36.000000000 +0100
+++ /mounts/work_src_done/STABLE/cobbler/cobbler.changes 2011-02-02 09:28:57.000000000 +0100
@@ -1,0 +2,10 @@
+Wed Feb 2 09:28:43 CET 2011 - ug@suse.de
+
+- spec file fixed
+
+-------------------------------------------------------------------
+Fri Jan 28 11:03:37 CET 2011 - ug@suse.de
+
+- fixed apache config to avoid warning
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
importer.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cobbler.spec ++++++
--- /var/tmp/diff_new_pack.bxCzTx/_old 2011-02-03 02:02:11.000000000 +0100
+++ /var/tmp/diff_new_pack.bxCzTx/_new 2011-02-03 02:02:11.000000000 +0100
@@ -21,14 +21,13 @@
#%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%define _binaries_in_noarch_packages_terminate_build 0
-%global debug_package %{nil}
Summary: Boot server configurator
Name: cobbler
License: GPLv2+
AutoReq: no
Version: 2.0.10
-Release: 1
+Release: 2
Source0: cobbler-%{version}.tar.gz
Source1: vendor-files.tar.bz2
Patch0: fix-initscript.dif
@@ -237,10 +236,13 @@
%files
-%if 0%{suse_version}
+%if 0%{suse_version} > 1120
%defattr(755,root,root)
%dir /%{_sysconfdir}/sysconfig/SuSEfirewall2.d
-/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler
+%endif
+%if 0%{suse_version}
+%defattr(755,root,root)
+%dir /%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler
%defattr(755,wwwrun,www)
%else
%defattr(755,apache,apache)
@@ -264,6 +266,8 @@
#/usr/share/cobbler/webui_templates/*.tmpl (MOVED to cobbler-web)
%if 0%{suse_version}
+%defattr(755,root,root)
+/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler
%defattr(755,wwwrun,www)
%else
%defattr(755,apache,apache)
@@ -321,7 +325,7 @@
%{_mandir}/man1/cobbler.1.gz
/etc/init.d/cobblerd
#%if 0%{?suse_version} >= 1000
-%config(noreplace) /etc/apache2/conf.d/cobbler.conf
+#%config(noreplace) /etc/apache2/conf.d/cobbler.conf
%config(noreplace) /etc/apache2/conf.d/cobbler_wsgi.conf
#%else
#%config(noreplace) /etc/httpd/conf.d/cobbler.conf
++++++ fhs_pathes_lazy_patch.diff ++++++
--- /var/tmp/diff_new_pack.bxCzTx/_old 2011-02-03 02:02:11.000000000 +0100
+++ /var/tmp/diff_new_pack.bxCzTx/_new 2011-02-03 02:02:11.000000000 +0100
@@ -244,7 +244,7 @@
# cobbler's public XMLRPC listens on this port. Change this only
# if absolutely needed, as you'll have to start supplying a new
--- config/cobbler_wsgi.conf
-+++ config/cobbler_wsgi.conf 2011/01/11 13:27:52
++++ config/cobbler_wsgi.conf 2011/01/28 09:54:03
@@ -1,13 +1,13 @@
# This configuration file allows cobbler data
# to be accessed over HTTP.
@@ -256,7 +256,8 @@
+AliasMatch ^/cobbler_track(.*)?$ "/srv/www/cobbler$1"
+AliasMatch ^/cobbler(.*)?$ "/srv/www/cobbler$1"
- WSGIScriptAliasMatch ^/cblr/svc/([^/]*) /var/www/cobbler/svc/services.wsgi
+-WSGIScriptAliasMatch ^/cblr/svc/([^/]*) /var/www/cobbler/svc/services.wsgi
++WSGIScriptAliasMatch ^/cblr/svc/([^/]*) /srv/www/cobbler/svc/services.wsgi
-
participants (1)
-
root@hilbert.suse.de