rpms/cobbler/devel .cvsignore, 1.57, 1.58 cobbler.spec, 1.86, 1.87 sources, 1.73, 1.74

Michael DeHaan mdehaan at fedoraproject.org
Thu Sep 17 16:54:10 UTC 2009


Author: mdehaan

Update of /cvs/extras/rpms/cobbler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27985/devel

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is cobbler 2.0.  Note that this now generates 3 packages -- cobbler, koan, and cobbler-web.   Previously cobbler-web was part of the cobbler package and koan was generated by a seperate entry in the build system CVS.  Now they are all ruled by cobbler.spec (see dead.package file in koan's CVS).




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	12 Jun 2009 20:17:11 -0000	1.57
+++ .cvsignore	17 Sep 2009 16:54:10 -0000	1.58
@@ -54,3 +54,4 @@ cobbler-1.6.3.tar.gz
 cobbler-1.6.4.tar.gz
 cobbler-1.6.5.tar.gz
 cobbler-1.6.6.tar.gz
+cobbler-2.0.0.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- cobbler.spec	24 Jul 2009 19:11:43 -0000	1.86
+++ cobbler.spec	17 Sep 2009 16:54:10 -0000	1.87
@@ -1,19 +1,16 @@
 %{!?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
-AutoReq: no
-Version: 1.6.6
-Release: 2%{?dist}
-Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
+AutoReq: no
+Version: 2.0.0
+Release: 1%{?dist}
+Source0: cobbler-%{version}.tar.gz
 Group: Applications/System
 Requires: python >= 2.3
-Requires: python-urlgrabber
-%ifarch %{ix86} x86_64
-Requires: syslinux
-%endif
 %if 0%{?suse_version} >= 1000
 Requires: apache2
 Requires: apache2-mod_python
@@ -23,39 +20,50 @@ Requires: httpd
 Requires: tftp-server
 Requires: mod_python
 %endif
-Requires: python-devel
+
 Requires: createrepo
-Requires: python-cheetah
-Requires: rsync
-Requires: python-netaddr
-Requires: PyYAML
-Requires: python-simplejson
-BuildRequires: PyYAML
-Requires: libyaml
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+Requires: fence-agents
+%endif
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 Requires: genisoimage
 %else
 Requires: mkisofs
 %endif
+Requires: libyaml
+Requires: python-cheetah
+Requires: python-devel
+Requires: python-netaddr
+Requires: python-simplejson
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+Requires: python-urlgrabber
+Requires: PyYAML
+%if 0%{?suse_version} < 0
+BuildRequires: redhat-rpm-config
+%endif
+Requires: rsync
+%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
+Requires: yum-utils
+%endif
+
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
+
 Requires(preun): /sbin/service
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
-Requires: python(abi) = %{pyver}
-%endif
-%if 0%{?suse_version} < 0
-BuildRequires: redhat-rpm-config
+Requires: python(abi) >= %{pyver}
 %endif
-BuildRequires: python-devel
+
+BuildRequires: PyYAML
 BuildRequires: python-cheetah
-%if 0%{?fedora} >= 8
-BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Url: http://cobbler.et.redhat.com
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler
 
 %description
 
@@ -63,18 +71,19 @@ Cobbler is a network install server.  Co
 supports PXE, virtualized installs, and 
 reinstalling existing Linux machines.  The last two 
 modes use a helper tool, 'koan', that 
-integrates with cobbler.  Cobbler's advanced features 
+integrates with cobbler.  There is also a web interface
+'cobbler-web'.  Cobbler's advanced features 
 include importing distributions from DVDs and rsync 
 mirrors, kickstart templating, integrated yum 
-mirroring, and built-in DHCP/DNS/power Management.  Cobbler has 
+mirroring, and built-in DHCP/DNS Management.  Cobbler has 
 a Python and XMLRPC API for integration with other  
-applications.  There is also a web interface.
+applications.
 
 %prep
 %setup -q
 
 %build
-%{__python} setup.py build
+%{__python} setup.py build 
 
 %install
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
@@ -84,39 +93,46 @@ PREFIX="--prefix=/usr"
 %{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX
 
 %post
-
-# backup config
-if [ -e /var/lib/cobbler/distros ]; then
-    cp /var/lib/cobbler/distros*  /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
-    cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
+if [ "$1" = "1" ];
+then
+    # This happens upon initial install. Upgrades will follow the next else
+    /sbin/chkconfig --add cobblerd
+elif [ "$1" -ge "2" ];
+then
+    # backup config
+    if [ -e /var/lib/cobbler/distros ]; then
+        cp /var/lib/cobbler/distros*  /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/systems*  /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/repos*    /var/lib/cobbler/backup 2>/dev/null
+        cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
+    fi
+    if [ -e /var/lib/cobbler/config ]; then
+        cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
+    fi
+    # upgrade older installs
+    # move power and pxe-templates from /etc/cobbler, backup new templates to *.rpmnew
+    for n in power pxe; do
+      rm -f /etc/cobbler/$n*.rpmnew
+      find /etc/cobbler -maxdepth 1 -name "$n*" -type f | while read f; do
+        newf=/etc/cobbler/$n/`basename $f`
+        [ -e $newf ] &&  mv $newf $newf.rpmnew
+        mv $f $newf
+      done
+    done
+    # upgrade older installs
+    # copy kickstarts from /etc/cobbler to /var/lib/cobbler/kickstarts
+    rm -f /etc/cobbler/*.ks.rpmnew
+    find /etc/cobbler -maxdepth 1 -name "*.ks" -type f | while read f; do
+      newf=/var/lib/cobbler/kickstarts/`basename $f`
+      [ -e $newf ] &&  mv $newf $newf.rpmnew
+      cp $f $newf
+    done
+    # reserialize and restart
+    # FIXIT: ?????
+    #/usr/bin/cobbler reserialize
+    /sbin/service cobblerd condrestart
 fi
-if [ -e /var/lib/cobbler/config ]; then
-    cp -a /var/lib/cobbler/config    /var/lib/cobbler/backup 2>/dev/null
-fi
-# upgrade older installs
-# move power and pxe-templates from /etc/cobbler, backup new templates to *.rpmnew
-for n in power pxe; do
-  rm -f /etc/cobbler/$n*.rpmnew
-  find /etc/cobbler -maxdepth 1 -name "$n*" -type f | while read f; do
-    newf=/etc/cobbler/$n/`basename $f`
-    [ -e $newf ] &&  mv $newf $newf.rpmnew
-    mv $f $newf
-  done
-done
-# upgrade older installs
-# copy kickstarts from /etc/cobbler to /var/lib/cobbler/kickstarts
-rm -f /etc/cobbler/*.ks.rpmnew
-find /etc/cobbler -maxdepth 1 -name "*.ks" -type f | while read f; do
-  newf=/var/lib/cobbler/kickstarts/`basename $f`
-  [ -e $newf ] &&  mv $newf $newf.rpmnew
-  cp $f $newf
-done
-# reserialize and restart
-/usr/bin/cobbler reserialize
-/sbin/chkconfig --add cobblerd
-/sbin/service cobblerd condrestart
 
 %preun
 if [ $1 = 0 ]; then
@@ -137,8 +153,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %files
 
 %defattr(755,apache,apache)
+%dir /var/www/cobbler/pub/
 %dir /var/www/cobbler/web/
-/var/www/cobbler/web/*.py*
+/var/www/cobbler/web/index.html
 %dir /var/www/cobbler/svc/
 /var/www/cobbler/svc/*.py*
 
@@ -148,15 +165,15 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 /usr/share/cobbler/installer_templates/*.template
 %defattr(744,root,root)
 /usr/share/cobbler/installer_templates/defaults
-%defattr(755,apache,apache)
-%dir /usr/share/cobbler/webui_templates
-%defattr(444,apache,apache)
-/usr/share/cobbler/webui_templates/*.tmpl
+#%defattr(755,apache,apache)               (MOVED to cobbler-web)
+#%dir /usr/share/cobbler/webui_templates   (MOVED to cobbler-web)
+#%defattr(444,apache,apache)               (MOVED to cobbler-web)
+#/usr/share/cobbler/webui_templates/*.tmpl (MOVED to cobbler-web)
 
 %defattr(755,apache,apache)
 %dir /var/log/cobbler
+%dir /var/log/cobbler/tasks
 %dir /var/log/cobbler/kicklog
-%dir /var/log/cobbler/anamon
 %dir /var/www/cobbler/
 %dir /var/www/cobbler/localmirror
 %dir /var/www/cobbler/repo_mirror
@@ -165,10 +182,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %dir /var/www/cobbler/images
 %dir /var/www/cobbler/links
 %defattr(755,apache,apache)
-%dir /var/www/cobbler/webui
+#%dir /var/www/cobbler/webui (MOVED to cobbler-web)
 %dir /var/www/cobbler/aux
 %defattr(444,apache,apache)
-/var/www/cobbler/webui/*
+#/var/www/cobbler/webui/*    (MOVED TO cobbler-web)
 /var/www/cobbler/aux/anamon
 /var/www/cobbler/aux/anamon.init
 
@@ -178,7 +195,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %{_bindir}/cobblerd
 
 %defattr(-,root,root)
-%dir /usr/share/cobbler
 %dir /etc/cobbler
 %dir /etc/cobbler/pxe
 %dir /etc/cobbler/reporting
@@ -193,24 +209,21 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
 %config(noreplace) /etc/cobbler/modules.conf
 %config(noreplace) /etc/cobbler/users.conf
-%config(noreplace) /etc/cobbler/acls.conf
 %config(noreplace) /etc/cobbler/cheetah_macros
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/modules
-%dir %{python_sitelib}/cobbler/webui
 %{python_sitelib}/cobbler/*.py*
+#%{python_sitelib}/cobbler/server/*.py*
 %{python_sitelib}/cobbler/modules/*.py*
-%{python_sitelib}/cobbler/webui/*.py*
 %{_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_svc.conf
 %else
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
-%config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -261,29 +274,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %defattr(664,root,root)
 %config(noreplace) /etc/cobbler/settings
 /var/lib/cobbler/version
-%config(noreplace) /var/lib/cobbler/snippets/partition_select
-%config(noreplace) /var/lib/cobbler/snippets/pre_partition_select
-%config(noreplace) /var/lib/cobbler/snippets/main_partition_select
-%config(noreplace) /var/lib/cobbler/snippets/post_install_kernel_options
-%config(noreplace) /var/lib/cobbler/snippets/network_config
-%config(noreplace) /var/lib/cobbler/snippets/pre_install_network_config
-%config(noreplace) /var/lib/cobbler/snippets/post_install_network_config
-%config(noreplace) /var/lib/cobbler/snippets/func_install_if_enabled
-%config(noreplace) /var/lib/cobbler/snippets/func_register_if_enabled
-%config(noreplace) /var/lib/cobbler/snippets/download_config_files
-%config(noreplace) /var/lib/cobbler/snippets/koan_environment
-%config(noreplace) /var/lib/cobbler/snippets/pre_anamon
-%config(noreplace) /var/lib/cobbler/snippets/post_anamon
-%config(noreplace) /var/lib/cobbler/snippets/post_s390_reboot
-%config(noreplace) /var/lib/cobbler/snippets/redhat_register
-%config(noreplace) /var/lib/cobbler/snippets/cobbler_register
-%config(noreplace) /var/lib/cobbler/snippets/keep_ssh_host_keys
-%config(noreplace) /var/lib/cobbler/snippets/log_ks_pre
-%config(noreplace) /var/lib/cobbler/snippets/log_ks_post
-/var/lib/cobbler/elilo-3.8-ia64.efi
-/var/lib/cobbler/menu.c32
-/var/lib/cobbler/yaboot-1.3.14
-/var/lib/cobbler/zpxe.rexx
+%config(noreplace) /var/lib/cobbler/snippets/*
+%dir /var/lib/cobbler/loaders/
+/var/lib/cobbler/loaders/zpxe.rexx
 %defattr(660,root,root)
 %config(noreplace) /etc/cobbler/users.digest 
 
@@ -296,65 +289,95 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
 %endif
 %doc AUTHORS CHANGELOG README COPYING
 
+%package -n koan
 
-%changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-
-* Thu May 28 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.6-1
-- Placeholder for future release
-
-* Thu May 28 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.5-1
-- Upstream changes (see CHANGELOG)
-
-* Fri May 8 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.4-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Apr 17 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.3-1
-- Upstream changes (see CHANGELOG)
-
-* Mon Mar 30 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.2-1
-- Upstream changes (see CHANGELOG)
-
-* Fri Mar 27 2009 Michael DeHaan <mdehaan at redhat.com> - 1.6.1-1
-- Upstream changes (see CHANGELOG)
+Summary: Helper tool that performs cobbler orders on remote machines.
+Version: 2.0.0
+Release: 1%{?dist}
+Group: Applications/System
+Requires: mkinitrd
+Requires: python >= 1.5
+BuildRequires: python-devel
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+Requires: python(abi) >= %{pyver}
+%endif
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%endif
+%if 0%{?rhel} >= 4
+BuildRequires: python-setuptools
+%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler/
 
-* Fri Mar 06 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.3-4
-- Upstream changes (see CHANGELOG)
-- Now requires PyYAML
 
-* Thu Feb 12 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.2-1
-- Upstream changes (see CHANGELOG)
-- Adding build_report.trigger
+%description -n koan
 
-* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
-- Upstream changes (see CHANGELOG)
+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
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
-- Fix for rawhide python requirement.
+%files -n koan
+%defattr(-,root,root)
+# FIXME: need to generate in setup.py
+#%if 0%{?fedora} > 8
+#%{python_sitelib}/koan*.egg-info
+#%endif
+%dir /var/spool/koan
+%{_bindir}/koan
+%{_bindir}/cobbler-register
+%dir %{python_sitelib}/koan
+%{python_sitelib}/koan/*.py*
+%{_mandir}/man1/koan.1.gz
+%{_mandir}/man1/cobbler-register.1.gz
+%dir /var/log/koan
+%doc AUTHORS COPYING CHANGELOG README
+
+
+%package -n cobbler-web
+
+Summary: Web interface for Cobbler
+Version: 2.0.0
+Release: 1%{?dist}
+Group: Applications/System
+Requires: cobbler
+Requires: Django
+BuildRequires: python-devel
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+Requires: python(abi) >= %{pyver}
+%endif
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler/
 
-* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
-- Upstream changes (see CHANGELOG)
+%description -n cobbler-web
 
-* Wed Dec 10 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.4-1
-- Updated test release (see CHANGELOG)
+Web interface for Cobbler that allows visiting http://server/cobbler_web to configure the install server.
 
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
-* Mon Dec 08 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.3-1
-- Upstream changes (see CHANGELOG)
-- Added specfile changes for python 2.6
+%files -n cobbler-web
+%defattr(-,apache,apache)
+%dir /usr/share/cobbler/web
+/usr/share/cobbler/web/*
+%dir /usr/share/cobbler/web/cobbler_web
+/usr/share/cobbler/web/cobbler_web/*
+#%dir /usr/share/cobbler/web/cobbler_web/templates
+#/usr/share/cobbler/web/cobbler_web/templates/*
+/etc/httpd/conf.d/cobbler_web.conf
+%dir /usr/share/cobbler/web/sessions
+%dir /var/www/cobbler_webui_content
+/var/www/cobbler_webui_content/*
+%doc AUTHORS COPYING CHANGELOG README
 
-* Tue Nov 18 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.2-1
-- Upstream changes (see CHANGELOG)
-- placeholder for future test release
-- packaged /var/lib/cobbler/version
+%changelog
 
-* Fri Nov 14 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.1-1
-- Upstream changes (see CHANGELOG)
+* Tue Sep 15 2009 Michael DeHaan <mdehaan at redhat.com> - 2.0.0-1
+- First release with unified spec files
 
-* Fri Sep 26 2008 Michael DeHaan <mdehaan at redhat.com> - 1.3.0-1
-- Upstream changes (see CHANGELOG)
-- added sample.seed file
-- added /usr/bin/cobbler-ext-nodes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	10 Jul 2009 19:33:35 -0000	1.73
+++ sources	17 Sep 2009 16:54:10 -0000	1.74
@@ -1 +1,2 @@
 2b7d2b92c1cfbf534b8e83b2a51cf739  cobbler-1.6.6.tar.gz
+5e7ac645a1a8fca384959966aed807c8  cobbler-2.0.0.tar.gz




More information about the fedora-extras-commits mailing list