rpms/cobbler/devel .cvsignore, 1.38, 1.39 cobbler.spec, 1.52, 1.53 sources, 1.47, 1.48

[Michael DeHaan]

Author: mdehaan

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

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
This is 1.2.1, which fixes merge issues with 1.2.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	29 Aug 2008 20:28:51 -0000	1.38
+++ .cvsignore	2 Sep 2008 14:39:20 -0000	1.39
@@ -35,3 +35,4 @@
 cobbler-1.0.2.tar.gz
 cobbler-1.0.3.tar.gz
 cobbler-1.2.0.tar.gz
+cobbler-1.2.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/cobbler.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- cobbler.spec	2 Sep 2008 11:50:17 -0000	1.52
+++ cobbler.spec	2 Sep 2008 14:39:20 -0000	1.53
@@ -2,8 +2,8 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.2.0
-Release: 2%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -92,7 +92,6 @@
 /var/www/cobbler/svc/*.py*
 
 %defattr(755,apache,apache)
-%dir /usr/share/cobbler/
 %dir /usr/share/cobbler/webui_templates
 %defattr(444,apache,apache)
 /usr/share/cobbler/webui_templates/*.tmpl
@@ -134,7 +133,6 @@
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
 %dir %{python_sitelib}/cobbler/modules
-%dir %{python_sitelib}/cobbler/server
 %dir %{python_sitelib}/cobbler/webui
 %{python_sitelib}/cobbler/*.py*
 %{python_sitelib}/cobbler/yaml/*.py*
@@ -157,37 +155,36 @@
 %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/add/
-%dir /var/lib/cobbler/triggers/add/distro/
+%dir /var/lib/cobbler/triggers/add/distro
+%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
 %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
 %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
 %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
+%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
 %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
 %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
 %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
 %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
 %dir /var/lib/cobbler/triggers/install/pre
 %dir /var/lib/cobbler/triggers/install/post
 %dir /var/lib/cobbler/snippets/
@@ -220,8 +217,10 @@
 
 
 %changelog
-* Tue Sep  2 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.2.0-2
-- Include lots of unowned directories.
+
+* Tue Sep 02 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.1-1
+- Upstream changes (see CHANGELOG)
+- Package unowned directories
 
 * Fri Aug 29 2008 Michael DeHaan <mdehaan at redhat.com> - 1.2.0-1
 - Upstream changes (see CHANGELOG)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	29 Aug 2008 20:28:51 -0000	1.47
+++ sources	2 Sep 2008 14:39:21 -0000	1.48
@@ -2,3 +2,4 @@
 a5ab7e39d616e3a13269b6fe088aec4c  cobbler-1.0.2.tar.gz
 95a1dbfc2c4b7e21adb41524c68c9456  cobbler-1.0.3.tar.gz
 7a68d84001d62eb1afeee16994f48746  cobbler-1.2.0.tar.gz
+2ea22363ad70c656f73b6b1496948cd9  cobbler-1.2.1.tar.gz