Merge latest changes from Marcin Dulak

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2101 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2013-05-10 17:21:26 +00:00
parent f69382ccc7
commit f96e874fd1
1 changed files with 187 additions and 186 deletions

View File

@ -1,187 +1,188 @@
# do not hard-code ids https://sourceforge.net/mailarchive/message.php?msg_id=27249602 # do not hard-code ids https://sourceforge.net/mailarchive/message.php?msg_id=27249602
%{?!davmail_uid: %define davmail_uid 213} %{?!davmail_uid: %define davmail_uid 213}
%{?!davmail_gid: %define davmail_gid 213} %{?!davmail_gid: %define davmail_gid 213}
%{?!davrel: %define davrel 4.2.1} %{?!davrel: %define davrel 4.2.1}
%{?!davsvn: %define davsvn 2089} %{?!davsvn: %define davsvn 2089}
%define davver %{davrel}-%{davsvn} %define davver %{davrel}-%{davsvn}
%ifarch i386 i586 i686 %ifarch i386 i586 i686
%define davarch x86 %define davarch x86
%endif %endif
%ifarch x86_64 %ifarch x86_64
%define davarch x86_64 %define davarch x86_64
%endif %endif
Summary: DavMail is a POP/IMAP/SMTP/Caldav/Carddav/LDAP gateway for Microsoft Exchange Summary: DavMail is a POP/IMAP/SMTP/Caldav/Carddav/LDAP gateway for Microsoft Exchange
Name: davmail Name: davmail
Version: %{davrel} Version: %{davrel}
Release: 1%{?dist} Release: 1%{?dist}
License: GPL License: GPL
Group: Applications/Internet Group: Applications/Internet
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: ant >= 1.7.1, ant-nodeps >= 1.7.1, ant-antlr, desktop-file-utils BuildRequires: ant >= 1.7.1, ant-nodeps >= 1.7.1, ant-antlr, desktop-file-utils
BuildRequires: java-devel >= 1.6.0 BuildRequires: java-devel >= 1.6.0
Requires: coreutils Requires: coreutils
Requires: filesystem Requires: filesystem
Requires(pre): /usr/sbin/useradd, /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd, /usr/sbin/groupadd
Requires(post): coreutils, filesystem, /sbin/chkconfig Requires(post): coreutils, filesystem, /sbin/chkconfig
Requires(preun): /sbin/service, coreutils, /sbin/chkconfig, /usr/sbin/userdel, /usr/sbin/groupdel Requires(preun): /sbin/service, coreutils, /sbin/chkconfig, /usr/sbin/userdel, /usr/sbin/groupdel
Requires(postun): /sbin/service Requires(postun): /sbin/service
Requires: /etc/init.d, logrotate, jre = 1.6.0 Requires: /etc/init.d, logrotate, jre >= 1.6.0
%define davmaildotproperties davmail.properties %define davmaildotproperties davmail.properties
Source0: %{name}-src-%{davver}.tgz Source0: %{name}-src-%{davver}.tgz
Source1: davmail.sh Source1: davmail.sh
Source2: davmail-logrotate Source2: davmail-logrotate
Source3: davmail-init Source3: davmail-init
Source4: %{davmaildotproperties} Source4: %{davmaildotproperties}
Source5: davmail.desktop Source5: davmail.desktop
Source6: davmail-wrapper Source6: davmail-wrapper
%description %description
DavMail is a POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange gateway allowing DavMail is a POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange gateway allowing
users to use any mail/calendar client with an Exchange server, even from users to use any mail/calendar client with an Exchange server, even from
the internet or behind a firewall through Outlook Web Access. DavMail the internet or behind a firewall through Outlook Web Access. DavMail
now includes an LDAP gateway to Exchange global address book and user now includes an LDAP gateway to Exchange global address book and user
personal contacts to allow recipient address completion in mail compose personal contacts to allow recipient address completion in mail compose
window and full calendar support with attendees free/busy display. window and full calendar support with attendees free/busy display.
%prep %prep
%setup -q -n %{name}-src-%{davver} %setup -q -n %{name}-src-%{davver}
%build %build
# JAVA_HOME points to the JDK root directory: ${JAVA_HOME}/{bin,lib} # JAVA_HOME points to the JDK root directory: ${JAVA_HOME}/{bin,lib}
jre=`rpm -q --whatprovides jre` jre=`rpm -q --whatprovides jre`
jexec=`rpm -ql ${jre} | grep "jexec"` jexec=`rpm -ql ${jre} | grep "jexec"`
lib=`dirname ${jexec}` # level up lib=`dirname ${jexec}` # level up
jre=`dirname ${lib}` # level up jre=`dirname ${lib}` # level up
java_home=`dirname ${jre}` # level up java_home=`dirname ${jre}` # level up
export JAVA_HOME=${java_home} export JAVA_HOME=${java_home}
# we have java 1.6 export ANT_OPTS="-Dfile.encoding=UTF-8"
ant -Dant.java.version=1.6 # we have java 1.6
ant -Dant.java.version=1.6
%install
rm -rf $RPM_BUILD_ROOT %install
mkdir -p $RPM_BUILD_ROOT/%{_bindir} rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/davmail/lib mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/davmail mkdir -p $RPM_BUILD_ROOT/%{_datadir}/davmail/lib
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/davmail
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log
# Init scripts, icons, configurations
install -m 0775 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/davmail # Init scripts, icons, configurations
install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/davmail install -m 0775 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/davmail
install -m 0775 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/davmail install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/davmail
install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir} install -m 0775 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/davmail
# https://fedoraproject.org/wiki/TomCallaway/DesktopFileVendor install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}
desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{SOURCE5} --vendor="" # https://fedoraproject.org/wiki/TomCallaway/DesktopFileVendor
install -m 0775 %{SOURCE6} $RPM_BUILD_ROOT/%{_localstatedir}/lib/davmail/davmail desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{SOURCE5} --vendor=""
install -m 0775 %{SOURCE6} $RPM_BUILD_ROOT/%{_localstatedir}/lib/davmail/davmail
# Actual DavMail files
install -m 0644 src/java/tray32.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/davmail.png # Actual DavMail files
rm -f dist/lib/*win32*.jar install -m 0644 src/java/tray32.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/davmail.png
install -m 0664 dist/lib/*-%{davarch}.jar $RPM_BUILD_ROOT/%{_datadir}/davmail/lib/ rm -f dist/lib/*win32*.jar
rm -f dist/lib/*x86*.jar install -m 0664 dist/lib/*-%{davarch}.jar $RPM_BUILD_ROOT/%{_datadir}/davmail/lib/
install -m 0664 dist/lib/* $RPM_BUILD_ROOT/%{_datadir}/davmail/lib/ rm -f dist/lib/*x86*.jar
install -m 0664 dist/*.jar $RPM_BUILD_ROOT/%{_datadir}/davmail/ install -m 0664 dist/lib/* $RPM_BUILD_ROOT/%{_datadir}/davmail/lib/
install -m 0664 dist/*.jar $RPM_BUILD_ROOT/%{_datadir}/davmail/
%clean
rm -rf $RPM_BUILD_ROOT %clean
rm -rf $RPM_BUILD_ROOT
%pre
# do not hard-code ids https://sourceforge.net/mailarchive/message.php?msg_id=27249602 %pre
#/usr/sbin/groupadd -g %{davmail_gid} -f -r davmail > /dev/null 2>&1 || : # do not hard-code ids https://sourceforge.net/mailarchive/message.php?msg_id=27249602
#/usr/sbin/useradd -u %{davmail_uid} -r -s /sbin/nologin -d /var/lib/davmail -M \ #/usr/sbin/groupadd -g %{davmail_gid} -f -r davmail > /dev/null 2>&1 || :
# -g davmail davmail > /dev/null 2>&1 || : #/usr/sbin/useradd -u %{davmail_uid} -r -s /sbin/nologin -d /var/lib/davmail -M \
/usr/sbin/groupadd -f -r davmail > /dev/null 2>&1 || : # -g davmail davmail > /dev/null 2>&1 || :
/usr/sbin/useradd -r -s /sbin/nologin -d /var/lib/davmail -M \ /usr/sbin/groupadd -f -r davmail > /dev/null 2>&1 || :
-g davmail davmail > /dev/null 2>&1 || : /usr/sbin/useradd -r -s /sbin/nologin -d /var/lib/davmail -M \
-g davmail davmail > /dev/null 2>&1 || :
%post
file=/var/log/davmail.log %post
if [ ! -f ${file} ] file=/var/log/davmail.log
then if [ ! -f ${file} ]
/bin/touch ${file} then
fi /bin/touch ${file}
/bin/chown davmail:davmail ${file} fi
/bin/chmod 0640 ${file} /bin/chown davmail:davmail ${file}
/bin/chmod 0640 ${file}
# proper service handling http://en.opensuse.org/openSUSE:Cron_rename
%{?fillup_and_insserv: # proper service handling http://en.opensuse.org/openSUSE:Cron_rename
%{fillup_and_insserv -y davmail} %{?fillup_and_insserv:
} %{fillup_and_insserv -y davmail}
%{!?fillup_and_insserv: }
# undefined %{!?fillup_and_insserv:
/sbin/chkconfig --add davmail # undefined
#/sbin/chkconfig davmail on /sbin/chkconfig --add davmail
} #/sbin/chkconfig davmail on
}
%preun
if [ "$1" = "0" ]; then %preun
/sbin/service davmail stop > /dev/null 2>&1 || : if [ "$1" = "0" ]; then
/bin/rm -f /var/lib/davmail/pid > /dev/null 2>&1 || : /sbin/service davmail stop > /dev/null 2>&1 || :
%{?stop_on_removal: /bin/rm -f /var/lib/davmail/pid > /dev/null 2>&1 || :
%{stop_on_removal davmail} %{?stop_on_removal:
} %{stop_on_removal davmail}
%{!?stop_on_removal: }
# undefined %{!?stop_on_removal:
/sbin/chkconfig davmail off # undefined
/sbin/chkconfig --del davmail /sbin/chkconfig davmail off
} /sbin/chkconfig --del davmail
/usr/sbin/userdel davmail }
if [ ! `grep davmail /etc/group` = "" ]; then /usr/sbin/userdel davmail
/usr/sbin/groupdel davmail if [ ! `grep davmail /etc/group` = "" ]; then
fi /usr/sbin/groupdel davmail
fi fi
fi
%postun
if [ $1 -ge 1 ]; then %postun
%{?restart_on_update: if [ $1 -ge 1 ]; then
%{restart_on_update davmail} %{?restart_on_update:
%insserv_cleanup %{restart_on_update davmail}
} %insserv_cleanup
%{!?restart_on_update: }
# undefined %{!?restart_on_update:
/sbin/service davmail condrestart > /dev/null 2>&1 || : # undefined
} /sbin/service davmail condrestart > /dev/null 2>&1 || :
fi }
fi
%files
%defattr (-,root,root,-) %files
%{_bindir}/* %defattr (-,root,root,-)
%{_sysconfdir}/init.d/davmail %{_bindir}/*
%{_sysconfdir}/logrotate.d/davmail %{_sysconfdir}/init.d/davmail
%config(noreplace) %{_sysconfdir}/%{davmaildotproperties} %{_sysconfdir}/logrotate.d/davmail
%{_datadir}/applications/* %config(noreplace) %{_sysconfdir}/%{davmaildotproperties}
%{_datadir}/pixmaps/* %{_datadir}/applications/*
%{_datadir}/davmail/ %{_datadir}/pixmaps/*
%attr(0775,davmail,davmail) %{_localstatedir}/lib/davmail %{_datadir}/davmail/
%attr(0775,davmail,davmail) %{_localstatedir}/lib/davmail
%changelog
* Fri Dec 09 2011 Marcin Dulak <Marcin.Dulak@gmail.com> %changelog
- use /var/run/davmail.lock instead of /var/lock/subsys/davmail * Fri Dec 09 2011 Marcin Dulak <Marcin.Dulak@gmail.com>
http://en.opensuse.org/openSUSE:Packaging_checks#subsys-unsupported - use /var/run/davmail.lock instead of /var/lock/subsys/davmail
http://en.opensuse.org/openSUSE:Packaging_checks#subsys-unsupported
* Fri Dec 09 2011 Marcin Dulak <Marcin.Dulak@gmail.com>
- fixed https://bugzilla.novell.com/show_bug.cgi?id=734592 * Fri Dec 09 2011 Marcin Dulak <Marcin.Dulak@gmail.com>
- fixed https://bugzilla.novell.com/show_bug.cgi?id=734592
* Wed Apr 20 2011 Marcin Dulak <Marcin.Dulak@gmail.com>
- proper service handling on openSUSE http://en.opensuse.org/openSUSE:Cron_rename * Wed Apr 20 2011 Marcin Dulak <Marcin.Dulak@gmail.com>
- proper service handling on openSUSE http://en.opensuse.org/openSUSE:Cron_rename
* Thu Mar 24 2011 Marcin Dulak <Marcin.Dulak@gmail.com>
- do not hard-code gid/uid: https://sourceforge.net/mailarchive/message.php?msg_id=27249602 * Thu Mar 24 2011 Marcin Dulak <Marcin.Dulak@gmail.com>
- do not hard-code gid/uid: https://sourceforge.net/mailarchive/message.php?msg_id=27249602
* Fri Mar 18 2011 Marcin Dulak <Marcin.Dulak@gmail.com>
- fixed incorrect JAVA_HOME * Fri Mar 18 2011 Marcin Dulak <Marcin.Dulak@gmail.com>
- added i386 i586 arch - fixed incorrect JAVA_HOME
- uses {davmail_gid} and {davmail_uid} of default 213 - added i386 i586 arch
- uses /etc/init.d for compatibility with other dists - uses {davmail_gid} and {davmail_uid} of default 213
- BuildRequires and Requires compatible with openSUSE 11.4 - uses /etc/init.d for compatibility with other dists
- removed runlevels 2 4 from davmail-init: https://bugzilla.novell.com/show_bug.cgi?id=675870 - BuildRequires and Requires compatible with openSUSE 11.4
- removed runlevels 2 4 from davmail-init: https://bugzilla.novell.com/show_bug.cgi?id=675870
* Mon Oct 18 2010 Marko Myllynen <myllynen@redhat.com>
- Initial version * Mon Oct 18 2010 Marko Myllynen <myllynen@redhat.com>
- Initial version