Hello community,

here is the log from the commit of package cobbler for openSUSE:Factory
checked in at Tue Oct 11 16:52:05 CEST 2011.



--------
--- openSUSE:Factory/cobbler/cobbler.changes    2011-09-23 01:53:45.000000000 
+0200
+++ /mounts/work_src_done/STABLE/cobbler/cobbler.changes        2011-10-07 
16:47:07.000000000 +0200
@@ -1,0 +2,24 @@
+Fri Oct  7 16:44:05 CEST 2011 - u...@suse.de
+
+- Import modules, which allowed easy integration of...
+- Ubuntu and Debian support again!
+- Better support for SuSE
+- Support for FreeBSD
+- Support for ESX 4+/ESXi
+- Integration with the python TFTP server pytftpd
+- "fetchable files" and "boot files" support for distros that need to
+  get more files from the TFTP server
+- Faster sync using link cache
+- Support for EFI grub booting
+- Support for bridged interfaces
+- WSGI instead of mod_python for the web interface.
+- Lots of Web UI improvements
+- A lot more I'm sure I missed when going through the change log
+- version 2.2.1
+
+-------------------------------------------------------------------
+Sat Sep 17 23:18:43 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant tags/sections from specfile
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  0001-added-autoyast-.-parameter-to-the-ISO-building-code-.patch
  0001-render-the-cheetah-template-before-passing-the-XML-t.patch
  0002-calculate-meta-data-in-the-XML-file-without-cheetah-.patch
  added-SUSE-breed-to-import-webui.diff
  build_iso_for_suse.diff
  cobbler-2.1.0.tar.gz
  handle-autoyast-XML-files.diff
  import_suse_support.diff
  koan_install_tree_fix_for_suse.diff
  suse_tftp_root.diff
  upstream_patch_tainted_files.diff

New:
----
  cobbler-2.2.1.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ cobbler.spec ++++++
--- /var/tmp/diff_new_pack.O67SFV/_old  2011-10-11 16:52:02.000000000 +0200
+++ /var/tmp/diff_new_pack.O67SFV/_new  2011-10-11 16:52:02.000000000 +0200
@@ -15,19 +15,16 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from 
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from 
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 #%{!?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
 Summary:        Boot server configurator
-
 Name:           cobbler
 License:        GPLv2+
-AutoReq:        no
-Version:        2.1.0
-Release:        8
+Version: 2.2.1
+Release: 6
 Source0:        cobbler-%{version}.tar.gz
 Source1:        vendor-files.tar.bz2
 Patch0:         fix-initscript.dif
@@ -35,17 +32,6 @@
 Patch2:         cobbler_web_config.diff
 Patch13:        users_patch.diff
 Patch14:        setup_py.diff
-Patch15:        import_suse_support.diff
-Patch16:        suse_tftp_root.diff
-Patch17:        koan_install_tree_fix_for_suse.diff
-Patch18:        handle-autoyast-XML-files.diff
-Patch19:        build_iso_for_suse.diff
-Patch20:        added-SUSE-breed-to-import-webui.diff
-Patch21:        upstream_patch_tainted_files.diff
-Patch22:        0001-render-the-cheetah-template-before-passing-the-XML-t.patch
-Patch23:        0002-calculate-meta-data-in-the-XML-file-without-cheetah-.patch
-Patch24:        0001-added-autoyast-.-parameter-to-the-ISO-building-code-.patch
-#Patch100: importer.diff
 
 Group:          Applications/System
 Requires:       python >= 2.3
@@ -109,11 +95,12 @@
 
 BuildRequires:  python-yaml
 BuildRequires:  python-cheetah
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 #BuildArch: noarch
 Url:            http://fedorahosted.org/cobbler
 
 %description
+
 Cobbler is a network install server.  Cobbler 
 supports PXE, virtualized installs, and 
 reinstalling existing Linux machines.  The last two 
@@ -135,17 +122,6 @@
 %endif
 %patch13
 %patch14
-%patch15 -p1
-%patch16
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-#%patch100
 mv vendor-files/cobbler.1.gz docs
 
 %build
@@ -243,9 +219,6 @@
 
 %endif
 
-%clean
-test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
-
 %files
 
 %if 0%{suse_version} > 1120
@@ -334,8 +307,15 @@
 %config(noreplace)   /etc/cobbler/ldap/ldap_authconfig.template
 %config(noreplace)   /etc/cobbler/version
 
+# new in 2.2.1
+%dir                 /etc/cobbler/iso
+%config(noreplace)   /etc/cobbler/mongodb.conf
+%config(noreplace)   /etc/cobbler/iso/buildiso.template
+%config(noreplace)   /etc/cobbler/cobblerd.service
+
 %{_sbindir}/tftpd.py
 
+
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/modules
 %{python_sitelib}/cobbler/*.py*
@@ -415,7 +395,6 @@
 
 %package -n koan
 
-
 Summary:        Helper tool that performs cobbler orders on remote machines
 Group:          Applications/System
 Requires:       python >= 1.5
@@ -431,11 +410,13 @@
 %if 0%{?rhel} >= 4
 BuildRequires:  python-setuptools
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 #BuildArch: noarch
 Url:            http://fedorahosted.org/cobbler/
 
+
 %description -n koan
+
 Koan stands for kickstart-over-a-network and allows for both
 network installation of new virtualized guests and reinstallation 
 of an existing system.  For use with a boot-server configured with Cobbler
@@ -460,8 +441,8 @@
 %dir /var/log/koan
 %doc AUTHORS COPYING CHANGELOG README
 
-%package -n cobbler-web
 
+%package -n cobbler-web
 
 Summary:        Web interface for Cobbler
 Group:          Applications/System
@@ -477,11 +458,12 @@
 %else
 BuildRequires:  python-setuptools
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 #BuildArch: noarch
 Url:            http://fedorahosted.org/cobbler/
 
 %description -n cobbler-web
+
 Web interface for Cobbler that allows visiting http://server/cobbler_web to 
configure the install server.
 
 %files -n cobbler-web

++++++ cobbler-2.1.0.tar.gz -> cobbler-2.2.1.tar.gz ++++++
++++ 12825 lines of diff (skipped)

++++++ fix-initscript.dif ++++++
--- /var/tmp/diff_new_pack.O67SFV/_old  2011-10-11 16:52:02.000000000 +0200
+++ /var/tmp/diff_new_pack.O67SFV/_new  2011-10-11 16:52:02.000000000 +0200
@@ -1,11 +1,10 @@
 --- config/cobblerd
-+++ config/cobblerd    2011/08/31 14:44:00
-@@ -7,9 +7,9 @@
++++ config/cobblerd    2011/10/07 14:35:57
+@@ -7,8 +7,9 @@
  
  ### BEGIN INIT INFO
  # Provides: cobblerd
--# Required-Start: $network, xinetd, httpd
--# Required-Stop: $network
+-# Required-Start: $network $xinetd $httpd
 -# Default-Start: 3 4 5
 +# Required-Start: $syslog $local_fs $network $remote_fs apache2
 +# Required-Stop: $syslog $local_fs $network $remote_fs apache2
@@ -13,7 +12,7 @@
  # Default-Stop: 0 1 2 6
  # Short-Description: daemon for libvirt virtualization API
  # Description: This is a daemon that a provides remote cobbler API
-@@ -51,8 +51,26 @@
+@@ -50,8 +51,26 @@
  
  start() {
      echo -n $"Starting cobbler daemon: "
@@ -41,7 +40,7 @@
          rc_status -v
      elif [ -e $DEBIAN_VERSION ]; then
          if [ -f $LOCKFILE ]; then
-@@ -67,7 +85,7 @@
+@@ -66,7 +85,7 @@
      fi
      RETVAL=$?
      echo
@@ -50,7 +49,7 @@
      return $RETVAL
  }
  
-@@ -92,7 +110,9 @@
+@@ -91,7 +110,9 @@
      RETVAL=$?
      echo
      if [ $RETVAL -eq 0 ]; then
@@ -61,7 +60,7 @@
          rm -f /var/run/$SERVICE.pid
      fi
  }
-@@ -126,7 +146,7 @@
+@@ -125,7 +146,7 @@
          fi
          ;;
      condrestart)

++++++ suse_config.diff ++++++
--- /var/tmp/diff_new_pack.O67SFV/_old  2011-10-11 16:52:02.000000000 +0200
+++ /var/tmp/diff_new_pack.O67SFV/_new  2011-10-11 16:52:02.000000000 +0200
@@ -1,5 +1,5 @@
 --- config/cobbler.conf
-+++ config/cobbler.conf        2011/04/04 09:21:19
++++ config/cobbler.conf        2011/10/07 14:38:24
 @@ -1,15 +1,15 @@
  # This configuration file allows cobbler data
  # to be accessed over HTTP.
@@ -33,8 +33,8 @@
      Order allow,deny
      Allow from all
 --- config/settings
-+++ config/settings    2011/04/04 09:23:18
-@@ -311,7 +311,7 @@
++++ config/settings    2011/10/07 14:38:24
+@@ -342,7 +342,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.

continue with "q"...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to