[zarafa] Upgrade to 7.0.7
Robert Scheck
robert at fedoraproject.org
Tue May 8 22:33:10 UTC 2012
commit 43789b1eaa369d54228251b838df9dfaa8be394a
Author: Robert Scheck <robert at fedoraproject.org>
Date: Wed May 9 00:33:01 2012 +0200
Upgrade to 7.0.7
.gitignore | 2 +-
sources | 2 +-
zarafa-7.0.4-fd_setsize.patch | 36 ------------------------------------
zarafa.spec | 12 +++++++-----
4 files changed, 9 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 56f9780..205edf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/zcp-?.?.?.tar.gz
+zcp-7.?.?.tar.gz
diff --git a/sources b/sources
index 6c03f3e..1da7020 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9cd644262663cf2cce7bfc963cfbaef2 zcp-7.0.6.tar.gz
+87d6c9ce1cd71b4a09fe72685e29d206 zcp-7.0.7.tar.gz
diff --git a/zarafa.spec b/zarafa.spec
index 11cf048..1cec247 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -1,6 +1,6 @@
%global beta_or_rc 0
%global actual_release 1
-%global svnrevision 32752
+%global svnrevision 34256
%global with_clucene 1
%global with_ldap 1
%global with_xmlto 1
@@ -19,7 +19,7 @@
Summary: Open Source Edition of the Zarafa Collaboration Platform
Name: zarafa
-Version: 7.0.6
+Version: 7.0.7
%if %{beta_or_rc}
Release: 0.%{actual_release}.svn%{svnrevision}%{?dist}
%else
@@ -43,7 +43,6 @@ Source2: %{name}.logrotate
Source3: %{name}-webaccess.conf
Patch0: zarafa-6.40.5-rpath.patch
-Patch1: zarafa-7.0.4-fd_setsize.patch
BuildRequires: bison
BuildRequires: gcc-c++
@@ -371,7 +370,6 @@ to interact with Zarafa.
%setup -q
%patch0 -p1 -b .rpath
touch -c -r aclocal.m4.rpath aclocal.m4
-%patch1 -p1 -b .fd_setsize
%build
%if 0%{?rhel}%{?fedora} < 6
@@ -467,7 +465,7 @@ install -p -m 644 installer/linux/db-{calc-storesize,convert-attachments-to-file
install -p -m 644 installer/linux/{ssl-certificates.sh,audit-parse.pl,zarafa7-upgrade} $RPM_BUILD_ROOT%{_datadir}/%{name}/
%if %{with_ldap}
install -p -m 644 installer/linux/{db-upgrade-objectsid-to-objectguid,ldap-switch-sendas}.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/
-install -p -m 644 installer/ldap/%{name}.schema $RPM_BUILD_ROOT%{_datadir}/%{name}/
+install -p -m 644 installer/{ldap/%{name}.schema,%{name}.ldif} $RPM_BUILD_ROOT%{_datadir}/%{name}/
%else
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ldap.{active-directory,openldap,propmap}.cfg
rm -f $RPM_BUILD_ROOT%{_mandir}/man5/%{name}-ldap.cfg.5*
@@ -806,6 +804,7 @@ fi
%{_mandir}/man5/%{name}-unix.cfg.5*
%if %{with_ldap}
%{_datadir}/%{name}/%{name}.schema
+%{_datadir}/%{name}/%{name}.ldif
%{_datadir}/%{name}/db-upgrade-objectsid-to-objectguid.pl
%{_datadir}/%{name}/ldap-switch-sendas.pl
%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/ldap.active-directory.cfg
@@ -875,6 +874,9 @@ fi
%{python_sitearch}/*
%changelog
+* Wed May 09 2012 Robert Scheck <robert at fedoraproject.org> 7.0.7-1
+- Upgrade to 7.0.7
+
* Sun Apr 22 2012 Robert Scheck <robert at fedoraproject.org> 7.0.6-1
- Upgrade to 7.0.6
More information about the scm-commits
mailing list