[cobbler/el5] New release that includes systemd files
Scott Henson
shenson at fedoraproject.org
Thu Oct 6 02:14:56 UTC 2011
commit 8e535ea3a1a6c9119d7b89ff152dc116a4f16d41
Author: Scott Henson <shenson at redhat.com>
Date: Wed Oct 5 22:13:11 2011 -0400
New release that includes systemd files
.gitignore | 1 +
cobbler.spec | 329 ++++++++++++++++------------------------------------------
sources | 2 +-
3 files changed, 90 insertions(+), 242 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 89905e4..f3d1c5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ cobbler-2.0.5.tar.gz
/cobbler-2.0.10.tar.gz
/cobbler-2.0.11.tar.gz
/cobbler-2.2.0.tar.gz
+/cobbler-2.2.1.tar.gz
diff --git a/cobbler.spec b/cobbler.spec
index 157ff9d..bf68a88 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -1,4 +1,5 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
%define _binaries_in_noarch_packages_terminate_build 0
%global debug_package %{nil}
@@ -6,52 +7,42 @@ Summary: Boot server configurator
Name: cobbler
License: GPLv2+
AutoReq: no
-Version: 2.2.0
+Version: 2.2.1
Release: 1%{?dist}
-Source0: cobbler-%{version}.tar.gz
-Source1: cobblerd.service
+Source0: http://shenson.fedorapeople.org/cobbler/cobbler-%{version}.tar.gz
Group: Applications/System
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch: noarch
+Url: http://fedorahosted.org/cobbler
+
+BuildRequires: redhat-rpm-config
+BuildRequires: git
+BuildRequires: PyYAML
+BuildRequires: python-cheetah
+
Requires: python >= 2.3
-%if 0%{?suse_version} >= 1000
-Requires: apache2
-Requires: apache2-mod_python
-Requires: tftp
-%else
Requires: httpd
Requires: tftp-server
-%endif
-
-%if 0%{?rhel} >= 6
Requires: mod_wsgi
-%else
-Requires: mod_python
-%endif
-
Requires: createrepo
-%if 0%{?fedora} >= 11
-Requires: fence-agents
-%endif
+Requires: python-cheetah
+Requires: python-netaddr
+Requires: python-simplejson
+Requires: python-urlgrabber
+Requires: PyYAML
+Requires: rsync
+
%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+Requires: python(abi) >= %{pyver}
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
@@ -67,48 +58,44 @@ Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
%endif
-%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
-
-BuildRequires: PyYAML
-BuildRequires: python-cheetah
-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
-modes use a helper tool, 'koan', that
-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 Management. Cobbler has
-a XMLRPC API for integration with other applications.
+Cobbler is a network install server. Cobbler supports PXE,
+virtualized installs, and re-installing existing Linux machines. The
+last two modes use a helper tool, 'koan', that 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 Management. Cobbler has a XMLRPC API for integration with
+other 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
-%if 0%{?suse_version} >= 1000
-PREFIX="--prefix=/usr"
-%endif
%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX
-mkdir $RPM_BUILD_ROOT/var/www/cobbler/rendered/
+mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d
+install -p -m 644 config/cobbler.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/
+install -p -m 644 config/cobbler_web.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/
+
+mkdir -p $RPM_BUILD_ROOT/var/spool/koan
+
+%if 0%{?fedora} >= 9 || 0%{?rhel} > 5
+mkdir -p $RPM_BUILD_ROOT/var/lib/tftpboot/images
+%else
+mkdir -p $RPM_BUILD_ROOT/tftpboot/images
+%endif
+
+rm -f $RPM_BUILD_ROOT/etc/cobbler/cobblerd
%if 0%{?fedora} >= 16
rm -rf $RPM_BUILD_ROOT/etc/init.d
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}
+install -m0644 config/cobblerd.service $RPM_BUILD_ROOT%{_unitdir}
%post
if [ $1 -eq 1 ] ; then
@@ -234,205 +221,73 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%files
-%defattr(755,apache,apache)
-%dir /var/www/cobbler/pub/
-%dir /var/www/cobbler/web/
-/var/www/cobbler/web/index.html
-%dir /var/www/cobbler/svc/
-%dir /var/www/cobbler/rendered/
-/var/www/cobbler/svc/*.py*
-/var/www/cobbler/svc/*.wsgi*
-
-%defattr(755,root,root)
-%dir /usr/share/cobbler/installer_templates
-%defattr(744,root,root)
-/usr/share/cobbler/installer_templates/*.template
-%defattr(744,root,root)
-/usr/share/cobbler/installer_templates/defaults
-#%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/www/cobbler/
-%dir /var/www/cobbler/localmirror
-%dir /var/www/cobbler/repo_mirror
-%dir /var/www/cobbler/ks_mirror
-%dir /var/www/cobbler/ks_mirror/config
-%dir /var/www/cobbler/images
-%dir /var/www/cobbler/links
-%defattr(755,apache,apache)
-#%dir /var/www/cobbler/webui (MOVED to cobbler-web)
-%dir /var/www/cobbler/aux
-%defattr(444,apache,apache)
-#/var/www/cobbler/webui/* (MOVED TO cobbler-web)
-/var/www/cobbler/aux/anamon
-/var/www/cobbler/aux/anamon.init
-
-%defattr(755,root,root)
+%defattr(-,root,root,-)
+
%{_bindir}/cobbler
%{_bindir}/cobbler-ext-nodes
%{_bindir}/cobblerd
+%{_sbindir}/tftpd.py*
-%defattr(-,root,root)
-%dir /etc/cobbler
-%dir /etc/cobbler/pxe
-%dir /etc/cobbler/reporting
-%dir /etc/cobbler/power
-%config(noreplace) /var/lib/cobbler/kickstarts/*.ks
-%config(noreplace) /var/lib/cobbler/kickstarts/*.seed
-%config(noreplace) /etc/cobbler/*.template
-%config(noreplace) /etc/cobbler/pxe/*.template
-%config(noreplace) /etc/cobbler/reporting/*.template
-%config(noreplace) /etc/cobbler/power/*.template
-%config(noreplace) /etc/cobbler/rsync.exclude
-%config(noreplace) /etc/logrotate.d/cobblerd_rotate
-%config(noreplace) /etc/cobbler/modules.conf
-%config(noreplace) /etc/cobbler/users.conf
-%config(noreplace) /etc/cobbler/cheetah_macros
-%dir %{python_sitelib}/cobbler
-%dir %{python_sitelib}/cobbler/modules
-%{python_sitelib}/cobbler/*.py*
-#%{python_sitelib}/cobbler/server/*.py*
-%{python_sitelib}/cobbler/modules/*.py*
-%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
-%exclude %{python_sitelib}/cobbler/sub_process.py*
-%endif
-%{_mandir}/man1/cobbler.1.gz
+%config(noreplace) %{_sysconfdir}/cobbler
%if 0%{?fedora} >= 16
%{_unitdir}/cobblerd.service
%else
/etc/init.d/cobblerd
%endif
-%if 0%{?suse_version} >= 1000
-%config(noreplace) /etc/apache2/conf.d/cobbler.conf
-%else
-%if 0%{?rhel} >= 6
-%config(noreplace) /etc/httpd/conf.d/cobbler_wsgi.conf
-%exclude /etc/httpd/conf.d/cobbler.conf
-%else
+%{python_sitelib}/cobbler
+
+%config(noreplace) /var/lib/cobbler
+
+/var/log/cobbler
+/var/www/cobbler
+
+%{_mandir}/man1/cobbler.1.gz
+
%config(noreplace) /etc/httpd/conf.d/cobbler.conf
-%exclude /etc/httpd/conf.d/cobbler_wsgi.conf
-%endif
-%endif
-%dir /var/log/cobbler/syslog
-%dir /var/log/cobbler/anamon
-
-%defattr(755,root,root)
-%dir /var/lib/cobbler
-%dir /var/lib/cobbler/config/
-%dir /var/lib/cobbler/config/distros.d/
-%dir /var/lib/cobbler/config/profiles.d/
-%dir /var/lib/cobbler/config/systems.d/
-%dir /var/lib/cobbler/config/repos.d/
-%dir /var/lib/cobbler/config/images.d/
-%dir /var/lib/cobbler/kickstarts/
-%dir /var/lib/cobbler/backup/
-%dir /var/lib/cobbler/triggers
-%dir /var/lib/cobbler/triggers/change
-%dir /var/lib/cobbler/triggers/add
-%dir /var/lib/cobbler/triggers/add/distro
-%dir /var/lib/cobbler/triggers/add/distro/pre
-%dir /var/lib/cobbler/triggers/add/distro/post
-%dir /var/lib/cobbler/triggers/add/profile
-%dir /var/lib/cobbler/triggers/add/profile/pre
-%dir /var/lib/cobbler/triggers/add/profile/post
-%dir /var/lib/cobbler/triggers/add/system
-%dir /var/lib/cobbler/triggers/add/system/pre
-%dir /var/lib/cobbler/triggers/add/system/post
-%dir /var/lib/cobbler/triggers/add/repo
-%dir /var/lib/cobbler/triggers/add/repo/pre
-%dir /var/lib/cobbler/triggers/add/repo/post
-%dir /var/lib/cobbler/triggers/delete
-%dir /var/lib/cobbler/triggers/delete/distro
-%dir /var/lib/cobbler/triggers/delete/distro/pre
-%dir /var/lib/cobbler/triggers/delete/distro/post
-%dir /var/lib/cobbler/triggers/delete/profile
-%dir /var/lib/cobbler/triggers/delete/profile/pre
-%dir /var/lib/cobbler/triggers/delete/profile/post
-%dir /var/lib/cobbler/triggers/delete/system
-%dir /var/lib/cobbler/triggers/delete/system/pre
-%dir /var/lib/cobbler/triggers/delete/system/post
-%dir /var/lib/cobbler/triggers/delete/repo
-%dir /var/lib/cobbler/triggers/delete/repo/pre
-%dir /var/lib/cobbler/triggers/delete/repo/post
-%dir /var/lib/cobbler/triggers/sync
-%dir /var/lib/cobbler/triggers/sync/pre
-%dir /var/lib/cobbler/triggers/sync/post
-%dir /var/lib/cobbler/triggers/install
-%dir /var/lib/cobbler/triggers/install/pre
-%dir /var/lib/cobbler/triggers/install/post
-%dir /var/lib/cobbler/snippets/
-%dir /var/cache/cobbler
-%dir /var/cache/cobbler/buildiso
-
-%defattr(664,root,root)
-%config(noreplace) /etc/cobbler/settings
-/var/lib/cobbler/version
-%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
-
-%defattr(664,root,root)
-%config(noreplace) /var/lib/cobbler/cobbler_hosts
-
-%defattr(-,root,root)
-%if 0%{?fedora} > 8 || 0%{?rhel} >= 6
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
+%exclude %{python_sitelib}/cobbler/sub_process.py*
+%endif
+%if 0%{?fedora} >= 9 || 0%{?rhel} > 5
%{python_sitelib}/cobbler*.egg-info
+/var/lib/tftpboot/images
+%else
+/tftpboot/images
%endif
+
%doc AUTHORS CHANGELOG README COPYING
%package -n koan
-Summary: Helper tool that performs cobbler orders on remote machines.
+Summary: Helper tool that performs cobbler orders on remote machines
Group: Applications/System
-Requires: python >= 1.5
-BuildRequires: python-devel
+Requires: python >= 2.0
%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/
%description -n koan
Koan stands for kickstart-over-a-network and allows for both
-network installation of new virtualized guests and reinstallation
+network installation of new virtualized guests and reinstallation
of an existing system. For use with a boot-server configured with Cobbler
%files -n koan
-%defattr(-,root,root)
-# FIXME: need to generate in setup.py
-#%if 0%{?fedora} > 8
-#%{python_sitelib}/koan*.egg-info
-#%endif
+%defattr(-,root,root,-)
%dir /var/spool/koan
+%dir /var/lib/koan/config
%{_bindir}/koan
%{_bindir}/cobbler-register
-%dir %{python_sitelib}/koan
-%{python_sitelib}/koan/*.py*
+%{python_sitelib}/koan
+
%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
%exclude %{python_sitelib}/koan/sub_process.py*
%exclude %{python_sitelib}/koan/opt_parse.py*
%exclude %{python_sitelib}/koan/text_wrap.py*
%endif
+
%{_mandir}/man1/koan.1.gz
%{_mandir}/man1/cobbler-register.1.gz
%dir /var/log/koan
@@ -445,41 +300,28 @@ Summary: Web interface for Cobbler
Group: Applications/System
Requires: cobbler
Requires: Django
-%if 0%{?suse_version} >= 1000
-Requires: apache2-mod_python
-%else
-Requires: mod_python
-%endif
%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/
%description -n cobbler-web
-Web interface for Cobbler that allows visiting http://server/cobbler_web to configure the install server.
+Web interface for Cobbler that allows visiting
+http://server/cobbler_web to configure the install server.
%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/*
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING CHANGELOG README
%config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
+%defattr(-,apache,apache,-)
+/usr/share/cobbler/web
%dir /var/lib/cobbler/webui_sessions
-%dir /var/www/cobbler_webui_content
-/var/www/cobbler_webui_content/*
-%doc AUTHORS COPYING CHANGELOG README
+/var/www/cobbler_webui_content/
%changelog
+* Wed Oct 05 2011 Scott Henson <shenson at redhat.com> 2.2.1-1
+- Import changes for systemd from the fedora spec file (shenson at redhat.com)
+
* Wed Oct 05 2011 Scott Henson <shenson at redhat.com> 2.2.0-1
- Remove the version (shenson at redhat.com)
- New upstream 2.2.0 release (shenson at redhat.com)
@@ -1453,6 +1295,9 @@ Web interface for Cobbler that allows visiting http://server/cobbler_web to conf
- Merge branch 'master' into wsgi (dgoodwin at rm-rf.ca)
- wsgi: First cut of port to mod_wsgi. (dgoodwin at rm-rf.ca)
+* Thu Jun 17 2010 Scott Henson <shenson at redhat.com> - 2.1.0-1
+- Bump upstream release
+
* Fri Sep 9 2011 Tom Callaway <spot at fedoraproject.org> - 2.0.11-3
- convert to systemd (f16+)
@@ -1480,6 +1325,9 @@ Web interface for Cobbler that allows visiting http://server/cobbler_web to conf
* Tue Apr 27 2010 Scott Henson <shenson at redhat.com> - 2.0.4-1
- Bug fix release, see Changelog for details
+* Thu Apr 15 2010 Devan Goodwin <dgoodwin at rm-rf.ca> 2.0.3.2-1
+- Tagging for new build tools.
+
* Mon Mar 1 2010 Scott Henson <shenson at redhat.com> - 2.0.3.1-3
- Bump release because I forgot cobbler-web
@@ -1497,4 +1345,3 @@ Web interface for Cobbler that allows visiting http://server/cobbler_web to conf
* Tue Sep 15 2009 Michael DeHaan <mdehaan at redhat.com> - 2.0.0-1
- First release with unified spec files
-
diff --git a/sources b/sources
index e354624..84f2cb5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ef03c6dc9b9d68d84c77de7ef857ce58 cobbler-2.2.0.tar.gz
+4ad959a92daeb922d264033d0cfa448d cobbler-2.2.1.tar.gz
More information about the scm-commits
mailing list