[openstack-glance] Update to diablo4 milestone Add logrotate config (#732691)

[Mark McLoughlin]

commit dcc9acbb30f9e57c21370004d1be1fc4e5b254e8
Author: Mark McLoughlin <markmc at redhat.com>
Date:   Fri Aug 26 09:34:47 2011 +0100

    Update to diablo4 milestone
    Add logrotate config (#732691)

 .gitignore                 |    3 +--
 openstack-glance.logrotate |    7 +++++++
 openstack-glance.spec      |   16 ++++++++++++----
 sources                    |    2 +-
 4 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 57eb061..6460cde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/glance-2011.3~d4~20110815.987.tar.gz
-/glance-2011.3~rc~20110823.992.tar.gz
+/glance-2011.3~d4.tar.gz
diff --git a/openstack-glance.logrotate b/openstack-glance.logrotate
new file mode 100644
index 0000000..5daaad4
--- /dev/null
+++ b/openstack-glance.logrotate
@@ -0,0 +1,7 @@
+/var/log/glance/*.log {
+    weekly
+    rotate 4
+    missingok
+    compress
+    minsize 100k
+}
diff --git a/openstack-glance.spec b/openstack-glance.spec
index b414482..8a19e5a 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,17 +1,17 @@
-%define bzrtag 992
-%define snaptag ~rc~20110823.%{bzrtag}
+%global milestone d4
 
 Name:             openstack-glance
 Version:          2011.3
-Release:          0.4.%{bzrtag}bzr%{?dist}
+Release:          0.5.%{milestone}%{dist}
 Summary:          OpenStack Image Service
 
 Group:            Applications/System
 License:          ASL 2.0
 URL:              http://glance.openstack.org
-Source0:          http://glance.openstack.org/tarballs/glance-%{version}%{snaptag}.tar.gz
+Source0:          http://launchpad.net/glance/diablo/diablo-4/+download/glance-%{version}~%{milestone}.tar.gz
 Source1:          openstack-glance-api.init
 Source2:          openstack-glance-registry.init
+Source3:          openstack-glance.logrotate
 
 BuildArch:        noarch
 BuildRequires:    python2-devel
@@ -118,6 +118,9 @@ install -p -D -m 644 etc/glance-registry.conf %{buildroot}%{_sysconfdir}/glance/
 install -p -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/openstack-glance-api
 install -p -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/openstack-glance-registry
 
+# Logrotate config
+install -p -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-glance
+
 # Install pid directory
 install -d -m 755 %{buildroot}%{_localstatedir}/run/glance
 
@@ -160,6 +163,7 @@ fi
 %dir %{_sysconfdir}/glance
 %config(noreplace) %{_sysconfdir}/glance/glance-api.conf
 %config(noreplace) %{_sysconfdir}/glance/glance-registry.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-glance
 %dir %attr(0755, glance, nobody) %{_sharedstatedir}/glance
 %dir %attr(0755, glance, nobody) %{_localstatedir}/log/glance
 %dir %attr(0755, glance, nobody) %{_localstatedir}/run/glance
@@ -173,6 +177,10 @@ fi
 %doc doc/build/html
 
 %changelog
+* Fri Aug 26 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.5.d4
+- Update to diablo4 milestone
+- Add logrotate config (#732691)
+
 * Wed Aug 24 2011 Mark McLoughlin <markmc at redhat.com> - 2011.3-0.4.992bzr
 - Update to latest upstream
 - Use statically assigned uid:gid 161:161 (#732687)
diff --git a/sources b/sources
index 2415efd..99c843a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4602da2d3e731639c64468491fb5afe  glance-2011.3~rc~20110823.992.tar.gz
+7f80df667688920d9ecf0e382b85c5e3  glance-2011.3~d4.tar.gz