- Update to 2.4.0
  Major Features:
  - Dynamic Settings
  - Distro Signatures
  - Vastly improved support for Ubuntu, OpenSUSE and VMware ESXi (5.0 and 5.1)
  - Added in new templated scripting support (needs documentation)
  - New web interface improvements (tabs, etc.)
  - Added apt-specific fields for repositories to make mirroring them easier
  - Support for parameterized classes and defines in puppet using management classes
  Minor Features:
  - Added the bonded_bridge_slave interface type:
  - Improved template error reporting
  - Variables in fields are now evaluated through the templating engine
  - Added openvz as a virtualization type for koan
  - Added --virt-pxe-boot option for koan to force PXE booting of new systems
  - Added a per-interface gateway option, for systems that support it
  - Added support for new puppet command syntax
  - Exposed replication rsync options
  Major Bugfixes:
  - --available-as no longer copies all files.
  - Improved gPXE/iPXE support, including FreeBSD
  - Deleting objects now respects the --recursive option again
  Minor Bugfixes:
  - Too many to list

- fix filelist to fix build on factory: rpm does not allow to
  mark a non-directory as dir anymore 
--This line, and those below, will be ignored--

old: openSUSE:Factory/cobbler
new: systemsmanagement/cobbler rev 57
Index: cobbler.changes
===================================================================
--- cobbler.changes (revision 28)
+++ cobbler.changes (revision 57)
@@ -1,4 +1,41 @@
 -------------------------------------------------------------------
+Tue Aug 13 11:41:27 UTC 2013 - kkaempf@suse.com
+
+- Update to 2.4.0
+  Major Features:
+  - Dynamic Settings
+  - Distro Signatures
+  - Vastly improved support for Ubuntu, OpenSUSE and VMware ESXi (5.0 and 5.1)
+  - Added in new templated scripting support (needs documentation)
+  - New web interface improvements (tabs, etc.)
+  - Added apt-specific fields for repositories to make mirroring them easier
+  - Support for parameterized classes and defines in puppet using management classes
+
+  Minor Features:
+  - Added the bonded_bridge_slave interface type:
+  - Improved template error reporting
+  - Variables in fields are now evaluated through the templating engine
+  - Added openvz as a virtualization type for koan
+  - Added --virt-pxe-boot option for koan to force PXE booting of new systems
+  - Added a per-interface gateway option, for systems that support it
+  - Added support for new puppet command syntax
+  - Exposed replication rsync options
+
+  Major Bugfixes:
+  - --available-as no longer copies all files.
+  - Improved gPXE/iPXE support, including FreeBSD
+  - Deleting objects now respects the --recursive option again
+
+  Minor Bugfixes:
+  - Too many to list
+
+-------------------------------------------------------------------
+Wed Aug  7 15:59:31 CEST 2013 - ro@suse.de
+
+- fix filelist to fix build on factory: rpm does not allow to
+  mark a non-directory as dir anymore 
+
+-------------------------------------------------------------------
 Wed Apr 10 11:23:44 UTC 2013 - rbrownccb@opensuse.org
 
 - use systemd for openSUSE 12.3 and later
Index: cobbler.spec
===================================================================
--- cobbler.spec (revision 28)
+++ cobbler.spec (revision 57)
@@ -33,9 +33,9 @@
 Summary: Boot server configurator
 Name: cobbler
 License:        GPL-2.0+
-Version: 2.2.3
+Version: 2.4.0
 Release: 2
-Source0: cobbler-%{version}.tar.bz2
+Source0: cobbler-%{version}-1.tar.bz2
 Source1: vendor-files.tar.bz2
 Patch0:  fix-initscript.dif
 Patch1:  suse_config.diff
@@ -66,9 +66,16 @@
 #%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 #Requires: genisoimage
 #%else
+%if 0%{?suse_version}
+# for /usr/bin/mkisofs
+Requires: cdrkit-cdrtools-compat
+%else
 Requires: mkisofs
+%endif
 #%endif
+%if !0%{?suse_version}
 Requires: libyaml-0-2
+%endif
 Requires: python-cheetah
 Requires: python-netaddr
 Requires: python-simplejson
@@ -105,6 +112,10 @@
 #Requires: python(abi) >= %{pyver}
 #%endif
 
+%if 0%{?suse_version} > 01020
+BuildRequires:  fdupes
+%endif
+
 BuildRequires: python-yaml
 BuildRequires: python-cheetah
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -125,15 +136,15 @@
 a XMLRPC API for integration with other applications.
 
 %prep
-%setup -q
-%setup -a1
+%setup -q -n %{name}-%{name}-%{version}-1
+%setup -a1 -n %{name}-%{name}-%{version}-1
 %if 0%{?suse_version}
-%patch0
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2
-%patch13
+%patch13 -p1
 sed -i 's/\r//' config/distro_signatures.json
-%patch14
+%patch14 -p1
 sed -i 's/$'"/`echo \\\r`/" config/distro_signatures.json
 %endif
 mv vendor-files/cobbler.1.gz docs
@@ -155,6 +166,12 @@
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
 ln -sf ../../etc/init.d/cobblerd $RPM_BUILD_ROOT/usr/sbin/rccobblerd
 
+%if 0%{?suse_version} > 01020
+# can't fdupes full buildroot as this will create cross-partition
+# hardlinks and rpmlint will complain
+%fdupes %{buildroot}/usr/lib/python2.7/site-packages/cobbler
+%endif
+
 %pre
 %if 0%{?suse_version} >= 1230
 %service_add_pre cobblerd.service
@@ -256,7 +273,7 @@
 %endif
 %if 0%{?suse_version} >= 1110
 %defattr(755,root,root)
-%dir /%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler
+/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler
 %defattr(755,wwwrun,www)
 %else
 %defattr(755,apache,apache)
@@ -308,6 +325,8 @@
 %config(noreplace) /var/lib/cobbler/kickstarts/*.ks
 %config(noreplace) /var/lib/cobbler/kickstarts/*.xml
 %config(noreplace) /var/lib/cobbler/kickstarts/*.seed
+%config(noreplace) /var/lib/cobbler/scripts/preseed_early_default
+%config(noreplace) /var/lib/cobbler/scripts/preseed_late_default
 %config(noreplace) /etc/cobbler/*.template
 %config(noreplace) /etc/cobbler/pxe/*.template
 %config(noreplace) /etc/cobbler/reporting/*.template
@@ -364,6 +383,7 @@
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
+%dir /var/lib/cobbler/scripts
 %config(noreplace) /var/lib/cobbler/distro_signatures.json
 %dir /var/lib/cobbler/config/
 %dir /var/lib/cobbler/config/distros.d/
@@ -425,9 +445,11 @@
 %{python_sitelib}/cobbler-*-py%{py_ver}.egg-info
 %endif
 
+%if 0
 %dir /usr/share/augeas
 %dir /usr/share/augeas/lenses
 /usr/share/augeas/lenses/cobblersettings.aug
+%endif
 
 %doc AUTHORS CHANGELOG README COPYING
 
Index: fix-initscript.dif
===================================================================
--- fix-initscript.dif (revision 28)
+++ fix-initscript.dif (revision 57)
@@ -1,5 +1,6 @@
---- config/cobblerd
-+++ config/cobblerd	2012/04/19 08:55:40
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cobbler-cobbler-2.4.0-1/config/cobblerd ./config/cobblerd
+--- ../orig-cobbler-cobbler-2.4.0-1/config/cobblerd	2013-06-20 07:42:48.000000000 +0200
++++ ./config/cobblerd	2013-08-13 13:40:07.784665624 +0200
 @@ -7,8 +7,9 @@
  
  ### BEGIN INIT INFO
@@ -15,7 +16,7 @@
 @@ -50,8 +51,33 @@
  
  start() {
-     echo -n $"Starting cobbler daemon: "
+     echo -n "Starting cobbler daemon: "
 +    # Change the SECRET_KEY option in the Django settings.py file
 +    # required for security reasons, should be unique on all systems
 +    # the default is empty -> SECRET_KEY = ''
@@ -60,9 +61,8 @@
      RETVAL=$?
      echo
      if [ $RETVAL -eq 0 ]; then
--    rm -f $LOCKFILE
 +        if [ -f $DEBIAN_VERSION ]; then
-+            rm -f $LOCKFILE
+     rm -f $LOCKFILE
 +        fi
          rm -f /var/run/$SERVICE.pid
      fi
Index: suse_config.diff
===================================================================
--- suse_config.diff (revision 28)
+++ suse_config.diff (revision 57)
@@ -1,49 +1,47 @@
-Index: config/cobbler.conf
-===================================================================
---- config/cobbler.conf.orig
-+++ config/cobbler.conf
-@@ -1,15 +1,15 @@
- # This configuration file allows cobbler data
- # to be accessed over HTTP.
- 
--AliasMatch ^/cblr(?!/svc/)(.*)?$ "/var/www/cobbler$1"
--AliasMatch ^/cobbler_track(.*)?$ "/var/www/cobbler$1"
--#AliasMatch ^/cobbler(.*)?$ "/var/www/cobbler$1"
--Alias /cobbler /var/www/cobbler
--Alias /cobbler_webui_content /var/www/cobbler_webui_content
-+AliasMatch ^/cblr(?!/svc/)(.*)?$ "/srv/www/cobbler$1"
-+AliasMatch ^/cobbler_track(.*)?$ "/srv/www/cobbler$1"
-+#AliasMatch ^/cobbler(.*)?$ "/srv/www/cobbler$1"
-+Alias /cobbler /srv/www/cobbler
-+Alias /cobbler_webui_content /srv/www/cobbler_webui_content
- 
--WSGIScriptAliasMatch ^/cblr/svc/([^/]*) /var/www/cobbler/svc/services.py
-+WSGIScriptAliasMatch ^/cblr/svc/([^/]*) /srv/www/cobbler/svc/services.py
- 
--<Directory "/var/www/cobbler">
-+<Directory "/srv/www/cobbler">
-     Options Indexes FollowSymLinks
-     Order allow,deny
-     Allow from all
-@@ -26,7 +26,7 @@ BrowserMatch "MSIE" AuthDigestEnableQuer
- # and is visited at http://.../cobbler_web not this URL.
- # this is only a pointer to the new page.
- 
--<Directory "/var/www/cobbler/web/">
-+<Directory "/srv/www/cobbler/web/">
-     Options Indexes FollowSymLinks
-     Order allow,deny
-     Allow from all
-Index: config/settings
-===================================================================
---- config/settings.orig
-+++ config/settings
-@@ -401,7 +401,7 @@ virt_auto_boot: 1
- # cobbler's web directory.  Don't change this setting -- see the
- # Wiki on "relocating your cobbler install" if your /var partition
- # is not large enough.
--webdir: /var/www/cobbler
-+webdir: /srv/www/cobbler
- 
- # cobbler's public XMLRPC listens on this port.  Change this only
- # if absolutely needed, as you'll have to start supplying a new
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cobbler-cobbler-2.4.0-1/config/cobbler.conf ./config/cobbler.conf
+--- ../orig-cobbler-cobbler-2.4.0-1/config/cobbler.conf	2013-06-20 07:42:48.000000000 +0200
++++ ./config/cobbler.conf	2013-08-13 13:48:05.288587476 +0200
+@@ -1,15 +1,15 @@
+ # This configuration file allows cobbler data
+ # to be accessed over HTTP.
+ 
+-AliasMatch ^/cblr(?!/svc/)(.*)?$ "/var/www/cobbler$1"
+-AliasMatch ^/cobbler_track(.*)?$ "/var/www/cobbler$1"
+-#AliasMatch ^/cobbler(.*)?$ "/var/www/cobbler$1"
+-Alias /cobbler /var/www/cobbler
+-Alias /cobbler_webui_content /var/www/cobbler_webui_content
++AliasMatch ^/cblr(?!/svc/)(.*)?$ "/srv/www/cobbler$1"
++AliasMatch ^/cobbler_track(.*)?$ "/srv/www/cobbler$1"
++#AliasMatch ^/cobbler(.*)?$ "/srv/www/cobbler$1"
++Alias /cobbler /srv/www/cobbler
++Alias /cobbler_webui_content /srv/www/cobbler_webui_content
+ 
+-WSGIScriptAliasMatch ^/cblr/svc/([^/]*) /var/www/cobbler/svc/services.py
++WSGIScriptAliasMatch ^/cblr/svc/([^/]*) /srv/www/cobbler/svc/services.py
+ 
+-<Directory "/var/www/cobbler">
++<Directory "/srv/www/cobbler">
+     Options Indexes FollowSymLinks
+     Order allow,deny
+     Allow from all
+@@ -26,7 +26,7 @@
+ # and is visited at http://.../cobbler_web not this URL.
+ # this is only a pointer to the new page.
+ 
+-<Directory "/var/www/cobbler/web/">
++<Directory "/srv/www/cobbler/web/">
+     Options Indexes FollowSymLinks
+     Order allow,deny
+     Allow from all
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cobbler-cobbler-2.4.0-1/config/settings ./config/settings
+--- ../orig-cobbler-cobbler-2.4.0-1/config/settings	2013-06-20 07:42:48.000000000 +0200
++++ ./config/settings	2013-08-13 13:48:05.288587476 +0200
+@@ -412,7 +412,7 @@
+ # cobbler's web directory.  Don't change this setting -- see the
+ # Wiki on "relocating your cobbler install" if your /var partition
+ # is not large enough.
+-webdir: /var/www/cobbler
++webdir: /srv/www/cobbler
+ 
+ # cobbler's public XMLRPC listens on this port.  Change this only
+ # if absolutely needed, as you'll have to start supplying a new
Index: suse_newver.patch
===================================================================
--- suse_newver.patch (revision 28)
+++ suse_newver.patch (revision 57)
@@ -1,83 +1,85 @@
---- config/distro_signatures.json
-+++ config/distro_signatures.json
-@@ -263,6 +263,38 @@
-     "kernel_options_post":"",
-     "boot_files":[]
-    },
-+   "opensuse12.3": {
-+    "signatures":["suse"],
-+    "version_file":"openSUSE-release-12.3-(.*).rpm",
-+    "version_file_regex":null,
-+    "kernel_arch":"kernel-(.*)\\.rpm",
-+    "kernel_arch_regex":null,
-+    "supported_arches":["i386","i586","x86_64"],
-+    "supported_repo_breeds":["yum"],
-+    "kernel_file":"(linux|vmlinuz(.*))",
-+    "initrd_file":"initrd(.*)",
-+    "isolinux_ok":false,
-+    "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml",
-+    "kernel_options":"",
-+    "kernel_options_post":"",
-+    "boot_files":[]
-+   },
-+   "opensuse13.1": {
-+    "signatures":["suse"],
-+    "version_file":"openSUSE-release-13.1-(.*).rpm",
-+    "version_file_regex":null,
-+    "kernel_arch":"kernel-(.*)\\.rpm",
-+    "kernel_arch_regex":null,
-+    "supported_arches":["i386","i586","x86_64"],
-+    "supported_repo_breeds":["yum"],
-+    "kernel_file":"(linux|vmlinuz(.*))",
-+    "initrd_file":"initrd(.*)",
-+    "isolinux_ok":false,
-+    "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml",
-+    "kernel_options":"",
-+    "kernel_options_post":"",
-+    "boot_files":[]
-+   },
-    "sles11": {
-     "signatures":["suse"],
-     "version_file":"sles-release-11-(.*).rpm",
-@@ -298,6 +330,22 @@
-    "sles11sp2": {
-     "signatures":["suse"],
-     "version_file":"sles-release-11.2-(.*).rpm",
-+    "version_file_regex":null,
-+    "kernel_arch":"kernel-(.*)\\.rpm",
-+    "kernel_arch_regex":null,
-+    "supported_arches":["i386","i586","x86_64","ppc64"],
-+    "supported_repo_breeds":["yum"],
-+    "kernel_file":"linux[64.gz]?",
-+    "initrd_file":"initrd[64]?",
-+    "isolinux_ok":false,
-+    "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml",
-+    "kernel_options":"",
-+    "kernel_options_post":"",
-+    "boot_files":[]
-+   },
-+   "sles11sp3": {
-+    "signatures":["suse"],
-+    "version_file":"sles-release-11.3-(.*).rpm",
-     "version_file_regex":null,
-     "kernel_arch":"kernel-(.*)\\.rpm",
-     "kernel_arch_regex":null,
---- newtests/cli/imports/test_suse/suse_import_test.py
-+++ newtests/cli/imports/test_suse/suse_import_test.py
-@@ -18,9 +18,16 @@
-  {"name":"opensuse12.1-x86_64", "desc":"OpenSuSE 12.1 x86_64", "path":"/vagrant/distros/opensuse12.1_x86_64"},
-  {"name":"opensuse12.2-i386", "desc":"OpenSuSE 12.2 i586", "path":"/vagrant/distros/opensuse12.2_i586"},
-  {"name":"opensuse12.2-x86_64", "desc":"OpenSuSE 12.2 x86_64", "path":"/vagrant/distros/opensuse12.2_x86_64"},
-+ {"name":"opensuse12.3-i386", "desc":"OpenSuSE 12.3 i586", "path":"/vagrant/distros/opensuse12.3_i586"},
-+ {"name":"opensuse12.3-x86_64", "desc":"OpenSuSE 12.3 x86_64", "path":"/vagrant/distros/opensuse12.3_x86_64"},
-+ {"name":"opensuse13.1-i386", "desc":"OpenSuSE 13.1 i586", "path":"/vagrant/distros/opensuse13.1_i586"},
-+ {"name":"opensuse13.1-x86_64", "desc":"OpenSuSE 13.1 x86_64", "path":"/vagrant/distros/opensuse13.1_x86_64"},
-  {"name":"sles11_sp2-i386", "desc":"SLES 11 SP2 i586", "path":"/vagrant/distros/sles11_sp2_i586"},
-  {"name":"sles11_sp2-x86_64", "desc":"SLES 11 SP2 x86_64", "path":"/vagrant/distros/sles11_sp2_x86_64"},
-  {"name":"sles11_sp2-ppc64", "desc":"SLES 11 SP2 ppc64", "path":"/vagrant/distros/sles11_sp2_ppc64"},
-+ {"name":"sles11_sp3-i386", "desc":"SLES 11 SP3 i586", "path":"/vagrant/distros/sles11_sp3_i586"},
-+ {"name":"sles11_sp3-x86_64", "desc":"SLES 11 SP3 x86_64", "path":"/vagrant/distros/sles11_sp3_x86_64"},
-+ {"name":"sles11_sp3-ppc64", "desc":"SLES 11 SP3 ppc64", "path":"/vagrant/distros/sles11_sp3_ppc64"},
- ]
- 
- for i in range(0,len(distros)):
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cobbler-cobbler-2.4.0-1/config/distro_signatures.json ./config/distro_signatures.json
+--- ../orig-cobbler-cobbler-2.4.0-1/config/distro_signatures.json	2013-06-20 07:42:48.000000000 +0200
++++ ./config/distro_signatures.json	2013-08-13 13:45:15.437507529 +0200
+@@ -295,6 +295,38 @@
+     "kernel_options_post":"",
+     "boot_files":[]
+    },
++   "opensuse12.3": {
++    "signatures":["suse"],
++    "version_file":"openSUSE-release-12.3-(.*).rpm",
++    "version_file_regex":null,
++    "kernel_arch":"kernel-(.*)\\.rpm",
++    "kernel_arch_regex":null,
++    "supported_arches":["i386","i586","x86_64"],
++    "supported_repo_breeds":["yum"],
++    "kernel_file":"(linux|vmlinuz(.*))",
++    "initrd_file":"initrd(.*)",
++    "isolinux_ok":false,
++    "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml",
++    "kernel_options":"",
++    "kernel_options_post":"",
++    "boot_files":[]
++   },
++   "opensuse13.1": {
++    "signatures":["suse"],
++    "version_file":"openSUSE-release-13.1-(.*).rpm",
++    "version_file_regex":null,
++    "kernel_arch":"kernel-(.*)\\.rpm",
++    "kernel_arch_regex":null,
++    "supported_arches":["i386","i586","x86_64"],
++    "supported_repo_breeds":["yum"],
++    "kernel_file":"(linux|vmlinuz(.*))",
++    "initrd_file":"initrd(.*)",
++    "isolinux_ok":false,
++    "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml",
++    "kernel_options":"",
++    "kernel_options_post":"",
++    "boot_files":[]
++   },
+    "sles11": {
+     "signatures":["suse"],
+     "version_file":"sles-release-11-(.*).rpm",
+@@ -333,6 +365,22 @@
+     "version_file_regex":null,
+     "kernel_arch":"kernel-(.*)\\.rpm",
+     "kernel_arch_regex":null,
++    "supported_arches":["i386","i586","x86_64","ppc64"],
++    "supported_repo_breeds":["yum"],
++    "kernel_file":"linux[64.gz]?",
++    "initrd_file":"initrd[64]?",
++    "isolinux_ok":false,
++    "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml",
++    "kernel_options":"",
++    "kernel_options_post":"",
++    "boot_files":[]
++   },
++   "sles11sp3": {
++    "signatures":["suse"],
++    "version_file":"sles-release-11.3-(.*).rpm",
++    "version_file_regex":null,
++    "kernel_arch":"kernel-(.*)\\.rpm",
++    "kernel_arch_regex":null,
+     "supported_arches":["i386","i586","x86_64","ppc64"],
+     "supported_repo_breeds":["yum"],
+     "kernel_file":"linux[64.gz]?",
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cobbler-cobbler-2.4.0-1/newtests/cli/imports/test_suse/suse_import_test.py ./newtests/cli/imports/test_suse/suse_import_test.py
+--- ../orig-cobbler-cobbler-2.4.0-1/newtests/cli/imports/test_suse/suse_import_test.py	2013-06-20 07:42:48.000000000 +0200
++++ ./newtests/cli/imports/test_suse/suse_import_test.py	2013-08-13 13:43:48.513881642 +0200
+@@ -18,9 +18,16 @@
+  {"name":"opensuse12.1-x86_64", "desc":"OpenSuSE 12.1 x86_64", "path":"/vagrant/distros/opensuse12.1_x86_64"},
+  {"name":"opensuse12.2-i386", "desc":"OpenSuSE 12.2 i586", "path":"/vagrant/distros/opensuse12.2_i586"},
+  {"name":"opensuse12.2-x86_64", "desc":"OpenSuSE 12.2 x86_64", "path":"/vagrant/distros/opensuse12.2_x86_64"},
++ {"name":"opensuse12.3-i386", "desc":"OpenSuSE 12.3 i586", "path":"/vagrant/distros/opensuse12.3_i586"},
++ {"name":"opensuse12.3-x86_64", "desc":"OpenSuSE 12.3 x86_64", "path":"/vagrant/distros/opensuse12.3_x86_64"},
++ {"name":"opensuse13.1-i386", "desc":"OpenSuSE 13.1 i586", "path":"/vagrant/distros/opensuse13.1_i586"},
++ {"name":"opensuse13.1-x86_64", "desc":"OpenSuSE 13.1 x86_64", "path":"/vagrant/distros/opensuse13.1_x86_64"},
+  {"name":"sles11_sp2-i386", "desc":"SLES 11 SP2 i586", "path":"/vagrant/distros/sles11_sp2_i586"},
+  {"name":"sles11_sp2-x86_64", "desc":"SLES 11 SP2 x86_64", "path":"/vagrant/distros/sles11_sp2_x86_64"},
+  {"name":"sles11_sp2-ppc64", "desc":"SLES 11 SP2 ppc64", "path":"/vagrant/distros/sles11_sp2_ppc64"},
++ {"name":"sles11_sp3-i386", "desc":"SLES 11 SP3 i586", "path":"/vagrant/distros/sles11_sp3_i586"},
++ {"name":"sles11_sp3-x86_64", "desc":"SLES 11 SP3 x86_64", "path":"/vagrant/distros/sles11_sp3_x86_64"},
++ {"name":"sles11_sp3-ppc64", "desc":"SLES 11 SP3 ppc64", "path":"/vagrant/distros/sles11_sp3_ppc64"},
+ ]
+ 
+ for i in range(0,len(distros)):
Index: users_patch.diff
===================================================================
--- users_patch.diff (revision 28)
+++ users_patch.diff (revision 57)
@@ -1,32 +1,29 @@
-Index: cobbler/action_reposync.py
-===================================================================
---- cobbler/action_reposync.py.orig
-+++ cobbler/action_reposync.py
-@@ -560,7 +560,12 @@ class RepoSync:
-         a safeguard.
-         """
-         # all_path = os.path.join(repo_path, "*")
--        cmd1 = "chown -R root:apache %s" % repo_path
-+        owner = "root:apache"
-+        if os.path.exists("/etc/SuSE-release"):
-+            owner = "root:wwwrun"
-+
-+        cmd1 = "chown -R "+owner+" %s" % repo_path
-+
-         utils.subprocess_call(self.logger, cmd1)
- 
-         cmd2 = "chmod -R 755 %s" % repo_path
-Index: cobbler/cobblerd.py
-===================================================================
---- cobbler/cobblerd.py.orig
-+++ cobbler/cobblerd.py
-@@ -64,6 +64,8 @@
-         http_user = "apache"
-         if utils.check_dist() in [ "debian", "ubuntu" ]:
-             http_user = "www-data"
-+        elif utils.check_dist() == "suse":
-+            http_user = "wwwrun"
-         utils.os_system("chown %s /var/lib/cobbler/web.ss"%http_user )
-     else:
-         fd = os.open(ssfile,os.O_CREAT|os.O_RDWR,0600)
-
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cobbler-cobbler-2.4.0-1/cobbler/action_reposync.py ./cobbler/action_reposync.py
+--- ../orig-cobbler-cobbler-2.4.0-1/cobbler/action_reposync.py	2013-06-20 07:42:48.000000000 +0200
++++ ./cobbler/action_reposync.py	2013-08-13 13:46:50.341464250 +0200
+@@ -585,7 +585,12 @@
+         a safeguard.
+         """
+         # all_path = os.path.join(repo_path, "*")
+-        cmd1 = "chown -R root:apache %s" % repo_path
++        owner = "root:apache"
++        if os.path.exists("/etc/SuSE-release"):
++            owner = "root:wwwrun"
++
++        cmd1 = "chown -R "+owner+" %s" % repo_path
++
+         utils.subprocess_call(self.logger, cmd1)
+ 
+         cmd2 = "chmod -R 755 %s" % repo_path
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cobbler-cobbler-2.4.0-1/cobbler/cobblerd.py ./cobbler/cobblerd.py
+--- ../orig-cobbler-cobbler-2.4.0-1/cobbler/cobblerd.py	2013-06-20 07:42:48.000000000 +0200
++++ ./cobbler/cobblerd.py	2013-08-13 13:46:50.345464415 +0200
+@@ -64,6 +64,8 @@
+         http_user = "apache"
+         if utils.check_dist() in [ "debian", "ubuntu" ]:
+             http_user = "www-data"
++        elif utils.check_dist() == "suse":
++            http_user = "wwwrun"
+         utils.os_system("chown %s /var/lib/cobbler/web.ss"%http_user )
+     else:
+         fd = os.open(ssfile,os.O_CREAT|os.O_RDWR,0600)
Index: cobbler-2.4.0-1.tar.bz2
===================================================================
Binary files cobbler-2.4.0-1.tar.bz2 (revision 57) added
Index: cobbler-2.2.3.tar.bz2
===================================================================
Binary files cobbler-2.2.3.tar.bz2 (revision 28) deleted

• Files Changed
• Browse Source