[holland] Latest sources from upstream. Full change log available at: http://hollandbackup.org/releases/sta

derks derks at fedoraproject.org
Wed Jan 12 23:28:20 UTC 2011 

commit 098a0fe77b25491d13f73ff83da435917fa82c77
Author: BJ Dierkes <wdierkes at 5dollarwhitebox.org>
Date:   Wed Jan 12 17:28:06 2011 -0600

    Latest sources from upstream.  Full change log available at:
      http://hollandbackup.org/releases/stable/1.0/CHANGES.txt
    - ChangeLog became CHANGES.txt
    - Add pgdump and xtrabackup by default
    - No longer package -random by default (shouldn't have been in
      anyway).  Main package Obsoletes: holland-random < 1.0.6

 .gitignore   |    1 +
 holland.spec |   80 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 sources      |    2 +-
 3 files changed, 66 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7f06ff..805b9e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /holland-1.0.4.tar.gz
+/holland-1.0.6.tar.gz
diff --git a/holland.spec b/holland.spec
index 4412451..fc68e44 100644
--- a/holland.spec
+++ b/holland.spec
@@ -3,31 +3,39 @@
 # el4 also... which doesn't support it
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
-%{!?holland_version: %global holland_version 1.0.4}
+%{!?holland_version: %global holland_version 1.0.6}
 
 # default %%rhel to make things easier to build
 %{!?rhel: %global rhel %%(%{__sed} 's/^[^0-9]*\\([0-9]\\+\\).*/\\1/' /etc/redhat-release)}
 
-%if 0%{?rhel} == 4
-# macros used in rpm 4.4, not available in previous versions
-%global bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%global bcond_without() %{expand:%%{!?_without_%{1}:%%global without_%{1} 1}}
-%global with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%global without()       %{expand:%%{?without_%{1}:0}%%{!?without_%{1}:1}}
+# added here for el4 with/without/bcond_with/bcond_without support
+%if %{!?with:1}0
+%global with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
+%endif
+%if %{!?without:1}0
+%global without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
+%endif
+%if %{!?bcond_with:1}0
+%global bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
+%endif
+%if %{!?bcond_without:1}0
+%global bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
 %endif
 
+# this is reverse logic.  those listed by bcond_with are disabled by default
 %bcond_with     tests
 %bcond_with     example 
 %bcond_with     sphinxdocs
 %bcond_with     mysqlhotcopy
 %bcond_with     maatkit
-%bcond_with     pgdump
+%bcond_with     random
 %bcond_with     sqlite
-%bcond_with     xtrabackup
+%bcond_without  pgdump
+%bcond_without  xtrabackup
 
 Name:           holland
 Version:        %{holland_version}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Pluggable Backup Framework
 Group:          Applications/Archiving
 License:        BSD 
@@ -42,6 +50,11 @@ BuildRequires:  python-sphinx
 %endif
 Requires:       python-setuptools
 
+# FIXME: Should be removed after a release or two.  Was added here because the 
+# -random package was initially added to the repo but no longer by default.
+# Remove if the -random subpackage is re-enabled.
+Obsoletes:      %{name}-random < 1.0.6
+
 %description
 A pluggable backup framework which focuses on, but is not limited to, highly
 configurable database backups.
@@ -65,6 +78,7 @@ Requires: %{name} = %{version}-%{release}
 Example Backup Plugin for Holland
 %endif
 
+%if %{with random}
 %package random
 Summary: Random Backup Provider Plugin for Holland
 Group: Development/Libraries
@@ -72,6 +86,7 @@ Requires: %{name} = %{version}-%{release}
 
 %description random
 Random Backup Provider Plugin for Holland
+%endif
 
 %if %{with maatkit}
 %package maatkit
@@ -123,10 +138,15 @@ and to generate a tar archive of the raw data directory.
 
 %if %{with pgdump}
 %package    pgdump
-Summary:    Postgres Backup plugin for Holland
-Group:      Applications/Archiving
-Requires:   %{name} = %{version}-%{release}
-Requires:   python-psycopg2 pg_dump
+Summary: Holland LVM snapshot backup plugin for MySQL 
+License: GPLv2
+Group: Development/Libraries
+Provides: %{name}-pgdump = %{version}-%{release}
+Requires:   %{name} = %{version}-%{release} %{name}-common = %{version}-%{release}
+Requires:   python-psycopg2
+
+%description pgdump
+This plugin allows holland to backup Postgres databases via the pg_dump command.
 %endif
 
 %if %{with sqlite}
@@ -147,6 +167,7 @@ License: GPLv2
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-common = %{version}-%{release}
+Requires: xtrabackup >= 1.2
 
 %description xtrabackup
 This package provides a Holland plugin for the Percona Xtrabackup 
@@ -225,10 +246,12 @@ cd plugins/holland.backup.pgdump
 cd -
 %endif
 
+%if %{with random}
 # plugin : holland.backup.random
 cd plugins/holland.backup.random
 %{__python} setup.py build
 cd -
+%endif
 
 %if %{with sqlite}
 # plugin : holland.backup.sqlite
@@ -320,11 +343,13 @@ cd -
 install -m 0640 config/providers/pgdump.conf %{buildroot}%{_sysconfdir}/holland/providers/
 %endif
 
+%if %{with random}
 # plugin : holland.backup.random
 cd plugins/holland.backup.random
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 cd -
 install -m 0640 config/providers/random.conf %{buildroot}%{_sysconfdir}/holland/providers/
+%endif
 
 %if %{with sqlite}
 # plugin : holland.backup.sqlite
@@ -361,7 +386,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog README README.plugins README.providers 
+%doc CHANGES.txt README README.plugins README.providers 
 %doc INSTALL LICENSE config/backupsets/examples/ 
 %if %{with sphinxdocs}
 %doc docs/build/html/
@@ -410,6 +435,7 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/holland/providers/example.conf
 %endif
 
+%if %{with random}
 %files random
 %defattr(-,root,root,-)
 %doc plugins/holland.backup.random/{README,LICENSE}
@@ -417,6 +443,7 @@ rm -rf %{buildroot}
 %{python_sitelib}/holland.backup.random-%{version}-*-nspkg.pth
 %{python_sitelib}/holland.backup.random-%{version}-*.egg-info
 %config(noreplace) %{_sysconfdir}/holland/providers/random.conf
+%endif
 
 %if %{with maatkit}
 %files maatkit
@@ -458,6 +485,16 @@ rm -rf %{buildroot}
 %{_mandir}/man5/holland-mysqlhotcopy.5*
 %endif
 
+%if %{with pgdump}
+%files pgdump
+%defattr(-,root,root,-)
+%doc plugins/holland.backup.pgdump/{README,LICENSE}
+%{python_sitelib}/holland.backup.pgdump-%{version}-*-nspkg.pth
+%{python_sitelib}/holland.backup.pgdump-%{version}-*.egg-info
+%{python_sitelib}/holland/backup/pgdump/
+%config(noreplace) %{_sysconfdir}/holland/providers/pgdump.conf
+%endif
+
 %if %{with sqlite}
 %files sqlite 
 %defattr(-,root,root,-)
@@ -479,9 +516,20 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Wed Jan 12 2011 BJ Dierkes <wdierkes at rackspace.com> - 1.0.6-1
+- Latest sources from upstream.  Full change log available at:
+  http://hollandbackup.org/releases/stable/1.0/CHANGES.txt
+- ChangeLog became CHANGES.txt
+- Add pgdump and xtrabackup by default
+- No longer package -random by default (shouldn't have been in
+  anyway).  Main package Obsoletes: holland-random < 1.0.6
+
+* Tue Dec 14 2010 BJ Dierkes <wdierkes at rackspace.com> - 1.0.5-1
+- Development version
+
 * Tue Dec 14 2010 BJ Dierkes <wdierkes at rackspace.com> - 1.0.4-3
 - Remove condition check around setting python_site{lib,arch} as
-  it is not supported in el4
+  it is not supported in el4.
 - No longer set python_sitearch as we aren't using it
 
 * Tue Nov 02 2010 BJ Dierkes <wdierkes at rackspace.com> - 1.0.4-2
diff --git a/sources b/sources
index 56e3afd..8151370 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0add8912071af2f06fd4bb2e654145f7  holland-1.0.4.tar.gz
+f6ccb87ef566b50e2533c63bfee4f1af  holland-1.0.6.tar.gz

More information about the scm-commits mailing list