rpms/zarafa/F-11 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 zarafa.spec, 1.4, 1.5 zarafa-6.30.10-fortify.patch, 1.1, NONE zarafa-6.30.10-long-ulong.patch, 1.1, NONE

[Robert Scheck]

Author: robert

Update of /cvs/pkgs/rpms/zarafa/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7899/F-11

Modified Files:
	.cvsignore sources zarafa.spec 
Removed Files:
	zarafa-6.30.10-fortify.patch zarafa-6.30.10-long-ulong.patch 
Log Message:
- Upgrade to 6.30.13
- Moved zarafa.schema file from %doc to %{_datadir}/%{name}



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zarafa/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Mar 2010 11:54:39 -0000	1.4
+++ .cvsignore	25 Apr 2010 17:06:14 -0000	1.5
@@ -1 +1 @@
-zarafa-6.30.12.tar.gz
+zarafa-6.30.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zarafa/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Mar 2010 11:54:39 -0000	1.4
+++ sources	25 Apr 2010 17:06:15 -0000	1.5
@@ -1 +1 @@
-959801e02912fbc6b74dd2b3ac3a599d  zarafa-6.30.12.tar.gz
+50b4399ace1499bc9175fcaa26571c7b  zarafa-6.30.13.tar.gz


Index: zarafa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zarafa/F-11/zarafa.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- zarafa.spec	20 Mar 2010 11:54:39 -0000	1.4
+++ zarafa.spec	25 Apr 2010 17:06:16 -0000	1.5
@@ -117,13 +117,13 @@
 
 %define beta_or_rc      0
 %define actual_release  1
-%define svnrevision     19435
+%define svnrevision     19788
 %define with_ldap       1
 %define with_xmlto      1
 
 Summary:            Zarafa Outlook Sharing and Open Source Collaboration
 Name:               zarafa
-Version:            6.30.12
+Version:            6.30.13
 %if %{beta_or_rc}
 Release:            0.%{actual_release}.svn%{svnrevision}%{?dist}
 %else
@@ -146,9 +146,6 @@ Patch0:             zarafa-6.30.4-packag
 Patch1:             zarafa-6.30.4-perl.patch
 Patch2:             zarafa-6.30.10-undefined-symbol.patch
 Patch3:             zarafa-6.30.10-chmod.patch
-# Patch 4 and 5 are backports from upstream
-Patch4:             zarafa-6.30.10-fortify.patch
-Patch5:             zarafa-6.30.10-long-ulong.patch
 # http://www.brodowski.org/zarafa/php-mapi/6.30.10.18495/18495_patch.diff
 Patch10:            zarafa-6.30.4-brodowski.patch
 
@@ -445,8 +442,6 @@ PHP MAPI extension by Zarafa to enable M
 %patch1 -p1 -b .perl
 %patch2 -p1 -b .symbol
 %patch3 -p1 -b .chmod
-%patch4 -p1 -b .fortify
-%patch5 -p1 -b .long-ulong
 #%%patch10 -p5 -b .brodowski
 
 # Needed to get rid of rpath
@@ -533,6 +528,7 @@ done
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/
 install -p -m 755 installer/linux/db-{calc-storesize,convert-attachments-to-files} $RPM_BUILD_ROOT%{_datadir}/%{name}/
 install -p -m 755 installer/linux/ssl-certificates.sh $RPM_BUILD_ROOT%{_datadir}/%{name}/
+install -p -m 644 installer/ldap/%{name}.schema $RPM_BUILD_ROOT%{_datadir}/%{name}/
 
 # Create the default log and lib directory for packaging
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{log,lib}/%{name}/
@@ -768,7 +764,7 @@ fi
 %{_mandir}/man5/%{name}-server.cfg.5*
 %{_mandir}/man5/%{name}-unix.cfg.5*
 %if %{with_ldap}
-%doc installer/ldap/%{name}.schema
+%{_datadir}/%{name}/%{name}.schema
 %config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/ldap.active-directory.cfg
 %config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/ldap.openldap.cfg
 %{_libdir}/%{name}/ldapplugin.so
@@ -823,6 +819,10 @@ fi
 %endif
 
 %changelog
+* Sun Apr 25 2010 Robert Scheck <robert at fedoraproject.org> 6.30.13-1
+- Upgrade to 6.30.13
+- Moved zarafa.schema file from %%doc to %%{_datadir}/%%{name}
+
 * Sat Mar 20 2010 Robert Scheck <robert at fedoraproject.org> 6.30.12-1
 - Upgrade to 6.30.12
 


--- zarafa-6.30.10-fortify.patch DELETED ---


--- zarafa-6.30.10-long-ulong.patch DELETED ---