From 4486627ab2d3654817bbeb64fe20c575bb9f324a Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mar 21 2011 15:29:59 +0000 Subject: Upgrade to 6.40.6 --- diff --git a/.gitignore b/.gitignore index bcbeea0..0f7389c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -zcp-source-6.40.5-24860.tgz +zcp-6.40.6.tar.gz diff --git a/sources b/sources index 4e08e6f..1406b1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -421a59954e94f787b2048b7e846e3ef0 zcp-source-6.40.5-24860.tgz +34eb188e7fe5a7ca19f2de3580855b10 zcp-6.40.6.tar.gz diff --git a/zarafa-6.40.5-svn25200.patch b/zarafa-6.40.5-svn25200.patch deleted file mode 100644 index c998b13..0000000 --- a/zarafa-6.40.5-svn25200.patch +++ /dev/null @@ -1,38 +0,0 @@ -Patch by Robert Scheck for zarafa < 6.40.6, which backports the -optional installation of zarafa-archiver and adds the missing pre-processor directive. SVN -upstream revision 25200 (6.40.6 beta1). - ---- zarafa-6.40.5/installer/linux/Makefile.am 2011-01-24 12:03:45.000000000 +0100 -+++ zarafa-6.40.6/installer/linux/Makefile.am 2011-02-08 09:33:50.000000000 +0100 -@@ -108,5 +108,7 @@ - fi - install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config - mv ${DESTDIR}/${data_configdir}/indexer.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config -- install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config -- mv ${DESTDIR}/${data_configdir}/archiver.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config -+ if [ -f ${DESTDIR}/${data_configdir}/archiver.cfg ]; then \ -+ install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config; \ -+ mv ${DESTDIR}/${data_configdir}/archiver.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config; \ -+ fi ---- zarafa-6.40.5/installer/linux/Makefile.in 2011-01-24 13:06:15.000000000 +0100 -+++ zarafa-6.40.6/installer/linux/Makefile.in 2011-02-08 09:35:20.000000000 +0100 -@@ -693,8 +693,10 @@ - fi - install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config - mv ${DESTDIR}/${data_configdir}/indexer.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config -- install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config -- mv ${DESTDIR}/${data_configdir}/archiver.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config -+ if [ -f ${DESTDIR}/${data_configdir}/archiver.cfg ]; then \ -+ install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config; \ -+ mv ${DESTDIR}/${data_configdir}/archiver.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config; \ -+ fi - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: ---- zarafa-6.40.5/provider/libserver/ECIndexer.h 2011-01-24 16:55:05.000000000 +0100 -+++ zarafa-6.40.6/provider/libserver/ECIndexer.h 2011-02-08 13:06:22.000000000 +0100 -@@ -60,3 +60,4 @@ - - ECRESULT GetIndexerResults(ECConfig *lpConfig, ECLogger *lpLogger, ECCacheManager *lpCacheManager, GUID *guidServer, unsigned int ulStoreId, ECListInt &lstFolders, struct restrictTable *lpRestrict, ECSearchResultArray **lppIndexerResults); - -+#endif diff --git a/zarafa.spec b/zarafa.spec index c3c69a7..a9ab0be 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -12,8 +12,12 @@ # 3. Set the SVN revision to the current SVN revision; # - This ensures a future SVN revision is always *more* recent in # rpm-compver -# - You may recover the exact SVN revision used from the resulting -# SRPM and RPMs because it ends up in the RPM release tag. +# - Lacking a unique zarafa-.svn.tar.gz source +# tarball, setting the correct SVN revision in the .spec is +# critical in order to be able to determine exactly what was in +# the tarball at the time of this build. You may recover the exact +# SVN revision used from the resulting SRPM and RPMs because it ends +# up in the RPM release tag. # 4. Update %%changelog, considering the following; # - Possibly change only the release tag for the most recent changelog # %%changelog entry, if appropriate @@ -67,9 +71,13 @@ # the previous stable release, +1 in case have already released # this SVN revision as a stable product. # 3. Set the SVN revision to the current SVN revision; -# - You may recover the exact SVN revision used from the resulting -# SRPM, as the .spec in that SRPM contains the SVN revision number -# (but not the resulting RPM just for the sake of appearance). +# - Lacking a unique zarafa-.svn.tar.gz source +# tarball, setting the correct SVN revision in the .spec is +# critical in order to be able to determine exactly what was in +# the tarball at the time of this build. You may recover the exact +# SVN revision used from the resulting SRPM, as the .spec in that +# SRPM contains the SVN revision number (but not the resulting RPMs +# just for the sake of appearance). # 4. Update %%changelog, considering the following; # - Remove all %%changelog stamps that have a beta_or_rc type of versioning, # again just for appearances sake, possibly preserving the important @@ -111,10 +119,11 @@ %global beta_or_rc 0 %global actual_release 1 -%global svnrevision 24860 +%global svnrevision 25584 %global with_clucene 1 %global with_ldap 1 %global with_xmlto 1 +%global no_multiupload 1 %global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") @@ -128,7 +137,7 @@ Summary: Open Source Edition of the Zarafa Collaboration Platform Name: zarafa -Version: 6.40.5 +Version: 6.40.6 %if %{beta_or_rc} Release: 0.%{actual_release}.svn%{svnrevision}%{?dist} %else @@ -145,14 +154,13 @@ URL: http://www.zarafa.com/ %if %{beta_or_rc} Source0: http://download.zarafa.com/community/beta/6.40/%{version}-%{svnrevision}/sourcecode/zcp-%{version}.tar.gz %else -Source0: http://download.zarafa.com/community/final/6.40/%{version}-%{svnrevision}/zcp-source-%{version}-%{svnrevision}.tgz +Source0: http://download.zarafa.com/community/final/6.40/%{version}-%{svnrevision}/sourcecode/zcp-%{version}.tar.gz %endif Source1: %{name}.ini Source2: %{name}.logrotate Source3: %{name}-webaccess.conf Patch0: zarafa-6.40.5-rpath.patch -Patch1: zarafa-6.40.5-svn25200.patch BuildRequires: bison BuildRequires: gcc-c++ @@ -168,6 +176,11 @@ BuildRequires: pam-devel BuildRequires: php-devel >= 4.3 BuildRequires: %{_includedir}/uuid/uuid.h BuildRequires: %{_includedir}/curl/curl.h +%if 0%{?rhel}%{?fedora} > 5 +BuildRequires: boost-devel >= 1.35.0 +%else +BuildRequires: boost141-devel +%endif BuildRequires: swig %if 0 BuildRequires: %{_bindir}/xsubpp @@ -462,7 +475,7 @@ Group: Development/Languages # Bug: Without mod_ssl, reloading httpd causes core dump Requires: mod_ssl %if 0%{?rhel}%{?fedora} > 4 -%if 0%{?php_zend_api} +%if 0%{?php_zend_api:1} Requires: php(zend-abi) = %{php_zend_api}, php(api) = %{php_core_api} %else Requires: php-api = %{php_apiver} @@ -495,13 +508,17 @@ to interact with Zarafa. %endif %prep -%setup -q -n zcp-source-%{version}-%{svnrevision}/src/ +%setup -q %patch0 -p1 -b .rpath touch -c -r aclocal.m4.rpath aclocal.m4 -%patch1 -p1 -b .svn25200 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -ggdb" +%if 0%{?rhel}%{?fedora} < 6 +export CPPFLAGS="$CPPFLAGS -I%{_includedir}/boost141" +export LDFLAGS="$LDFLAGS -L%{_libdir}/boost141" +%endif + %configure \ --with-userscript-prefix=%{_sysconfdir}/%{name}/userscripts \ --with-quotatemplate-prefix=%{_sysconfdir}/%{name}/quotamail \ @@ -536,7 +553,8 @@ make \ # Nuke all overlefts from licensed, managed or other proprietary items rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{license,licensed.cfg,report-ca} -rm -f $RPM_BUILD_ROOT%{_mandir}/man?/zarafa-{backup,restore,report,ldapms.cfg,licensed{,.cfg},archiver{,.cfg}}.* +rm -f $RPM_BUILD_ROOT%{_mandir}/man?/zarafa-{backup,restore,report,msr,ldapms.cfg,licensed{,.cfg},archiver{,.cfg}}.* +rm -f $RPM_BUILD_ROOT%{_bindir}/%{name}-msr # Move all the initscripts to their appropriate place and # ensure that all services are off by default at boot time @@ -634,11 +652,13 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}-webaccess/client/widgets/fckeditor/edit rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}-webaccess/{.htaccess,%{name}-webaccess.conf} # Remove flash-based multi-attachment upload (missing source) +%if %{no_multiupload} sed '119,126d' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/webaccess/config.php > \ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/webaccess/config.php.new touch -c -r $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/webaccess/config.php{,.new} mv -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/webaccess/config.php{.new,} rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-webaccess/client/widgets/swfupload/ +%endif %find_lang %{name} @@ -805,6 +825,7 @@ fi %files devel %defattr(-,root,root,-) %doc installer/licenseagreement/AGPL-3 +%{_libdir}/libarchiver.so %{_libdir}/libicalmapi.so %{_libdir}/libinetmapi.so %{_libdir}/libmapi.so @@ -956,6 +977,7 @@ fi %files -n libmapi %defattr(-,root,root,-) %doc installer/licenseagreement/AGPL-3 +%{_libdir}/libarchiver.so.* %{_libdir}/libicalmapi.so.* %{_libdir}/libinetmapi.so.* %{_libdir}/libmapi.so.* @@ -987,6 +1009,9 @@ fi %endif %changelog +* Mon Mar 21 2011 Robert Scheck 6.40.6-1 +- Upgrade to 6.40.6 + * Sun Feb 27 2011 Robert Scheck 6.40.5-1 - Upgrade to 6.40.5