Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2012-05-21 07:24:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cobbler", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2012-04-20 15:12:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2012-05-21 07:24:05.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 3 10:35:30 CEST 2012 - [email protected] + +- require syslinux only on x86 arch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cobbler.spec ++++++ --- /var/tmp/diff_new_pack.nMmdxf/_old 2012-05-21 07:24:06.000000000 +0200 +++ /var/tmp/diff_new_pack.nMmdxf/_new 2012-05-21 07:24:06.000000000 +0200 @@ -51,7 +51,9 @@ Requires: apache2-mod_python Requires: apache2-mod_wsgi #Requires: tftp +%ifarch %ix86 x86_64 Requires: syslinux +%endif BuildRequires: apache2 apache2-mod_python tftp distribution-release %else Requires: httpd @@ -125,7 +127,7 @@ %prep %setup -q %setup -a1 -%if 0%{suse_version} +%if 0%{?suse_version} %patch0 %patch1 %patch2 @@ -140,13 +142,15 @@ %install test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT -%if 0%{?suse_version} >= 1000 +%if 0%{?suse_version} +%if 0%{?suse_version} >= 1110 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/SuSEfirewall2.d mv vendor-files/cobbler_firewall_settings $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler +%endif PREFIX="--prefix=/usr" mkdir -p $RPM_BUILD_ROOT/etc/apache2/vhosts.d -mkdir -p $RPM_BUILD_ROOT/%{www_path}/www/logs %endif +mkdir -p $RPM_BUILD_ROOT/%{www_path}/www/logs %{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX mkdir -p $RPM_BUILD_ROOT/usr/sbin ln -sf ../../etc/init.d/cobblerd $RPM_BUILD_ROOT/usr/sbin/rccobblerd @@ -232,11 +236,11 @@ %files -%if 0%{suse_version} > 1120 +%if 0%{?suse_version} > 1120 %defattr(755,root,root) %dir /%{_sysconfdir}/sysconfig/SuSEfirewall2.d %endif -%if 0%{suse_version} +%if 0%{?suse_version} >= 1110 %defattr(755,root,root) %dir /%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler %defattr(755,wwwrun,www) @@ -261,7 +265,7 @@ %dir /var/log/cobbler %dir /var/log/cobbler/tasks %dir /var/log/cobbler/kicklog -%if 0%{suse_version} +%if 0%{?suse_version} %defattr(755,wwwrun,www) %else %defattr(755,apache,apache) @@ -272,7 +276,7 @@ %dir /%{www_path}/www/cobbler/ks_mirror %dir /%{www_path}/www/cobbler/ks_mirror/config %dir /%{www_path}/www/cobbler/links -%dir /srv/www/cobbler/aux +%dir /%{www_path}/www/cobbler/aux %defattr(444,%{apache_user},%{apache_group}) /%{www_path}/www/cobbler/aux/anamon /%{www_path}/www/cobbler/aux/anamon.init @@ -331,12 +335,12 @@ %endif %{_mandir}/man1/cobbler.1.gz /etc/init.d/cobblerd -#%if 0%{?suse_version} >= 1000 +%if 0%{?suse_version} >= 1000 %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 -#%endif +%else +%config(noreplace) /etc/httpd/conf.d/cobbler.conf +%endif %dir /var/log/cobbler/syslog %dir /var/log/cobbler/anamon @@ -395,7 +399,9 @@ %defattr(664,root,root) %defattr(-,root,root) +%if 0%{?suse_version} >= 1110 %{python_sitelib}/cobbler-%{version}-py%{py_ver}.egg-info +%endif %doc AUTHORS CHANGELOG README COPYING %package -n koan @@ -475,7 +481,7 @@ %defattr(-,%{apache_user},%{apache_group}) %dir /usr/share/cobbler/web /usr/share/cobbler/web/* -%if 0%{?suse_version} >= 1030 +%if 0%{?suse_version} >= 1010 %config(noreplace) /etc/apache2/vhosts.d/cobbler_web.conf %else %config(noreplace) /etc/httpd/conf.d/cobbler_web.conf ++++++ setup_py.diff ++++++ --- /var/tmp/diff_new_pack.nMmdxf/_old 2012-05-21 07:24:06.000000000 +0200 +++ /var/tmp/diff_new_pack.nMmdxf/_new 2012-05-21 07:24:06.000000000 +0200 @@ -14,7 +14,7 @@ webroot = "/usr/share/cobbler/webroot/" else: webconfig = "/etc/httpd/conf.d" -+ vhostconfig = "/etc/apache2/conf.d" ++ vhostconfig = "/etc/httpd/conf.d" webroot = "/var/www/" webcontent = webroot + "cobbler_webui_content/" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
