Kolab Groupware OBS

Changes of Revision 41

cyrus-imapd.spec Changed

@@ -60,6 +60,7 @@
 Patch0001:          cyrus-imapd-2.5-autoconf-2.63.patch
 Patch0002:          cyrus-imapd-2.5-lt-prereq.patch
 Patch0003:          cyrus-imapd-2.5-with-dav-ifdefs.patch
+Patch0004:          cyrus-imapd-2.5-return-0-to-make-function-nonvoid.patch
 
 BuildRoot:          %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -234,6 +235,7 @@
 #%patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
 
 # only to update config.* files
 aclocal -I cmulocal
@@ -329,7 +331,7 @@
   %{buildroot}%{_var}/spool/imap \
   %{buildroot}%{_var}/lib/imap/{user,quota,proc,log,msg,socket,db,sieve,sync,md5,rpm,backup,meta} \
   %{buildroot}%{_var}/lib/imap/ptclient \
-  %{buildroot}%{_datadir}/%{_name}/rpm \
+  %{buildroot}%{_var}/lib/imap/rpm \
   %{buildroot}%{_sysconfdir}/pki/%{_name} \
   doc/contrib
 
@@ -337,7 +339,7 @@
 %{__install} -p -m 644 master/conf/prefork.conf %{buildroot}%{_sysconfdir}/cyrus.conf
 %{__install} -p -m 644 %{SOURCE1}    %{buildroot}%{_sysconfdir}/imapd.conf
 %{__install} -p -m 755 %{SOURCE2}   %{buildroot}%{_cyrexecdir}/cvt_cyrusdb_all
-%{__install} -p -m 644 %{SOURCE3}   %{buildroot}%{_datadir}/%{_name}/rpm/magic
+%{__install} -p -m 644 %{SOURCE3}   %{buildroot}%{_var}/lib/imap/rpm/magic
 %{__install} -p -m 644 %{SOURCE11}    %{buildroot}%{_sysconfdir}/logrotate.d/%{_name}
 %{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/pop
 %{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/imap
@@ -385,7 +387,7 @@
 # Generate db config file
 ( grep '^{' lib/imapoptions | grep _db | cut -d'"' -f 2,4 | \
   sed -e 's/^ *//' -e 's/-nosync//' -e 's/ *$//' -e 's/"/=/'
-  echo sieve_version=2.2.3 ) | sort > %{buildroot}%{_datadir}/%{_name}/rpm/db.cfg
+  echo sieve_version=2.2.3 ) | sort > %{buildroot}%{_var}/lib/imap/rpm/db.cfg
 
 # create the ghost pem file
 touch %{buildroot}%{ssl_pem_file}
@@ -648,7 +650,9 @@
 %attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/user
 %attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/spool/imap
 %{_libdir}/*.so.*
-%{_datadir}/%{_name}/rpm/*
+%dir %{_var}/lib/imap/
+%dir %{_var}/lib/imap/rpm/
+%{_var}/lib/imap/rpm/*
 %doc perl/imap/README
 %doc perl/imap/Changes
 %doc perl/imap/examples
@@ -660,6 +664,7 @@
 %{perl_vendorarch}/Cyrus/IMAP.pm
 %dir %{perl_vendorarch}/Cyrus/SIEVE
 %{perl_vendorarch}/Cyrus/SIEVE/managesieve.pm
+%dir %{perl_vendorlib}/Cyrus/
 %dir %{perl_vendorlib}/Cyrus/Annotator
 %{perl_vendorlib}/Cyrus/Annotator/Daemon.pm
 %{perl_vendorlib}/Cyrus/Annotator/Message.pm

cyrus-imapd-2.5-return-0-to-make-function-nonvoid.patch Added