RPM: Change log for 4.6.1 and remove ant-nodeps dependency for Fedora >=19 compatibility

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2347 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2015-02-18 00:43:38 +00:00
parent 6aaa145e7c
commit d88a946e47
1 changed files with 204 additions and 201 deletions

View File

@ -1,201 +1,204 @@
# 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.6.1} %{?!davrel: %define davrel 4.6.1}
%{?!davsvn: %define davsvn 2343} %{?!davsvn: %define davsvn 2343}
%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-antlr, desktop-file-utils
%if 0%{?fedora} == 18 %if 0%{?fedora} == 18
# missing ant dep on original Fedora 18 # missing ant dep on original Fedora 18
BuildRequires: xml-commons-apis BuildRequires: xml-commons-apis
%endif %endif
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}
jcompiler=`readlink -f $(which javac)` jcompiler=`readlink -f $(which javac)`
bin=`dirname ${jcompiler}` # level up bin=`dirname ${jcompiler}` # level up
java_home=`dirname ${bin}` # level up java_home=`dirname ${bin}` # level up
export JAVA_HOME=${java_home} export JAVA_HOME=${java_home}
# /scratch/rpmbuild/davmail-src-4.2.0-2066/build.xml:41: Please force UTF-8 encoding to build debian package with set ANT_OPTS=-Dfile.encoding=UTF-8 # /scratch/rpmbuild/davmail-src-4.2.0-2066/build.xml:41: Please force UTF-8 encoding to build debian package with set ANT_OPTS=-Dfile.encoding=UTF-8
export ANT_OPTS="-Dfile.encoding=UTF-8" export ANT_OPTS="-Dfile.encoding=UTF-8"
# we have java 1.6 # we have java 1.6
ant -Dant.java.version=1.6 ant -Dant.java.version=1.6
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/davmail/lib mkdir -p $RPM_BUILD_ROOT/%{_datadir}/davmail/lib
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/davmail mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/davmail
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log
# Init scripts, icons, configurations # Init scripts, icons, configurations
install -m 0775 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/davmail install -m 0775 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/davmail
install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/davmail install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/davmail
install -m 0775 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/davmail install -m 0775 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/davmail
install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir} install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}
# https://fedoraproject.org/wiki/TomCallaway/DesktopFileVendor # https://fedoraproject.org/wiki/TomCallaway/DesktopFileVendor
desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{SOURCE5} --vendor="" desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{SOURCE5} --vendor=""
install -m 0775 %{SOURCE6} $RPM_BUILD_ROOT/%{_localstatedir}/lib/davmail/davmail install -m 0775 %{SOURCE6} $RPM_BUILD_ROOT/%{_localstatedir}/lib/davmail/davmail
# Actual DavMail files # Actual DavMail files
install -m 0644 src/java/tray32.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/davmail.png install -m 0644 src/java/tray32.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/davmail.png
rm -f dist/lib/*win32*.jar rm -f dist/lib/*win32*.jar
install -m 0664 dist/lib/*-%{davarch}.jar $RPM_BUILD_ROOT/%{_datadir}/davmail/lib/ install -m 0664 dist/lib/*-%{davarch}.jar $RPM_BUILD_ROOT/%{_datadir}/davmail/lib/
rm -f dist/lib/*x86*.jar rm -f dist/lib/*x86*.jar
rm -f dist/lib/*growl*.jar rm -f dist/lib/*growl*.jar
install -m 0664 dist/lib/* $RPM_BUILD_ROOT/%{_datadir}/davmail/lib/ install -m 0664 dist/lib/* $RPM_BUILD_ROOT/%{_datadir}/davmail/lib/
install -m 0664 dist/*.jar $RPM_BUILD_ROOT/%{_datadir}/davmail/ install -m 0664 dist/*.jar $RPM_BUILD_ROOT/%{_datadir}/davmail/
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%pre %pre
# 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
#/usr/sbin/groupadd -g %{davmail_gid} -f -r davmail > /dev/null 2>&1 || : #/usr/sbin/groupadd -g %{davmail_gid} -f -r davmail > /dev/null 2>&1 || :
#/usr/sbin/useradd -u %{davmail_uid} -r -s /sbin/nologin -d /var/lib/davmail -M \ #/usr/sbin/useradd -u %{davmail_uid} -r -s /sbin/nologin -d /var/lib/davmail -M \
# -g davmail davmail > /dev/null 2>&1 || : # -g davmail davmail > /dev/null 2>&1 || :
/usr/sbin/groupadd -f -r davmail > /dev/null 2>&1 || : /usr/sbin/groupadd -f -r davmail > /dev/null 2>&1 || :
/usr/sbin/useradd -r -s /sbin/nologin -d /var/lib/davmail -M \ /usr/sbin/useradd -r -s /sbin/nologin -d /var/lib/davmail -M \
-g davmail davmail > /dev/null 2>&1 || : -g davmail davmail > /dev/null 2>&1 || :
%post %post
file=/var/log/davmail.log file=/var/log/davmail.log
if [ ! -f ${file} ] if [ ! -f ${file} ]
then then
/bin/touch ${file} /bin/touch ${file}
fi fi
/bin/chown davmail:davmail ${file} /bin/chown davmail:davmail ${file}
/bin/chmod 0640 ${file} /bin/chmod 0640 ${file}
# proper service handling http://en.opensuse.org/openSUSE:Cron_rename # proper service handling http://en.opensuse.org/openSUSE:Cron_rename
%{?fillup_and_insserv: %{?fillup_and_insserv:
%{fillup_and_insserv -y davmail} %{fillup_and_insserv -y davmail}
} }
%{!?fillup_and_insserv: %{!?fillup_and_insserv:
# undefined # undefined
/sbin/chkconfig --add davmail /sbin/chkconfig --add davmail
#/sbin/chkconfig davmail on #/sbin/chkconfig davmail on
} }
%preun %preun
if [ "$1" = "0" ]; then if [ "$1" = "0" ]; then
/sbin/service davmail stop > /dev/null 2>&1 || : /sbin/service davmail stop > /dev/null 2>&1 || :
/bin/rm -f /var/lib/davmail/pid > /dev/null 2>&1 || : /bin/rm -f /var/lib/davmail/pid > /dev/null 2>&1 || :
%{?stop_on_removal: %{?stop_on_removal:
%{stop_on_removal davmail} %{stop_on_removal davmail}
} }
%{!?stop_on_removal: %{!?stop_on_removal:
# undefined # undefined
/sbin/chkconfig davmail off /sbin/chkconfig davmail off
/sbin/chkconfig --del davmail /sbin/chkconfig --del davmail
} }
/usr/sbin/userdel davmail /usr/sbin/userdel davmail
if [ ! `grep davmail /etc/group` = "" ]; then if [ ! `grep davmail /etc/group` = "" ]; then
/usr/sbin/groupdel davmail /usr/sbin/groupdel davmail
fi fi
fi fi
%postun %postun
if [ $1 -ge 1 ]; then if [ $1 -ge 1 ]; then
%{?restart_on_update: %{?restart_on_update:
%{restart_on_update davmail} %{restart_on_update davmail}
%insserv_cleanup %insserv_cleanup
} }
%{!?restart_on_update: %{!?restart_on_update:
# undefined # undefined
/sbin/service davmail condrestart > /dev/null 2>&1 || : /sbin/service davmail condrestart > /dev/null 2>&1 || :
} }
fi fi
%files %files
%defattr (-,root,root,-) %defattr (-,root,root,-)
%{_bindir}/* %{_bindir}/*
%{_sysconfdir}/init.d/davmail %{_sysconfdir}/init.d/davmail
%{_sysconfdir}/logrotate.d/davmail %{_sysconfdir}/logrotate.d/davmail
%config(noreplace) %{_sysconfdir}/%{davmaildotproperties} %config(noreplace) %{_sysconfdir}/%{davmaildotproperties}
%{_datadir}/applications/* %{_datadir}/applications/*
%{_datadir}/pixmaps/* %{_datadir}/pixmaps/*
%{_datadir}/davmail/ %{_datadir}/davmail/
%attr(0775,davmail,davmail) %{_localstatedir}/lib/davmail %attr(0775,davmail,davmail) %{_localstatedir}/lib/davmail
%changelog %changelog
* Sun Feb 15 2015 Mickael Guessant <mguessan@free.fr> * Tue Feb 17 2015 Mickael Guessant <mguessan@free.fr>
- Fix JAVA HOME detection for openSUSE_13.2 - Adapted spec for davmail 4.6.1
* Sun Feb 01 2015 Achim Herwig <achim.herwig@wodca.de> * Sun Feb 15 2015 Mickael Guessant <mguessan@free.fr>
- Adapted spec for davmail-src-4.6.0-2331.tgz - Fix JAVA HOME detection for openSUSE_13.2
* Tue Oct 28 2014 Dmitri Bachtin <d.bachtin@gmail.com> * Sun Feb 01 2015 Achim Herwig <achim.herwig@wodca.de>
- Adapted spec for davmail-src-4.5.1-2303.tgz - Adapted spec for davmail-src-4.6.0-2331.tgz
* Fri Dec 09 2011 Marcin Dulak <Marcin.Dulak@gmail.com> * Tue Oct 28 2014 Dmitri Bachtin <d.bachtin@gmail.com>
- use /var/run/davmail.lock instead of /var/lock/subsys/davmail - Adapted spec for davmail-src-4.5.1-2303.tgz
http://en.opensuse.org/openSUSE:Packaging_checks#subsys-unsupported
* Fri Dec 09 2011 Marcin Dulak <Marcin.Dulak@gmail.com>
* Fri Dec 09 2011 Marcin Dulak <Marcin.Dulak@gmail.com> - use /var/run/davmail.lock instead of /var/lock/subsys/davmail
- fixed https://bugzilla.novell.com/show_bug.cgi?id=734592 http://en.opensuse.org/openSUSE:Packaging_checks#subsys-unsupported
* Wed Apr 20 2011 Marcin Dulak <Marcin.Dulak@gmail.com> * Fri Dec 09 2011 Marcin Dulak <Marcin.Dulak@gmail.com>
- proper service handling on openSUSE http://en.opensuse.org/openSUSE:Cron_rename - fixed https://bugzilla.novell.com/show_bug.cgi?id=734592
* Thu Mar 24 2011 Marcin Dulak <Marcin.Dulak@gmail.com> * Wed Apr 20 2011 Marcin Dulak <Marcin.Dulak@gmail.com>
- do not hard-code gid/uid: https://sourceforge.net/mailarchive/message.php?msg_id=27249602 - proper service handling on openSUSE http://en.opensuse.org/openSUSE:Cron_rename
* Fri Mar 18 2011 Marcin Dulak <Marcin.Dulak@gmail.com> * Thu Mar 24 2011 Marcin Dulak <Marcin.Dulak@gmail.com>
- fixed incorrect JAVA_HOME - do not hard-code gid/uid: https://sourceforge.net/mailarchive/message.php?msg_id=27249602
- added i386 i586 arch
- uses {davmail_gid} and {davmail_uid} of default 213 * Fri Mar 18 2011 Marcin Dulak <Marcin.Dulak@gmail.com>
- uses /etc/init.d for compatibility with other dists - fixed incorrect JAVA_HOME
- BuildRequires and Requires compatible with openSUSE 11.4 - added i386 i586 arch
- removed runlevels 2 4 from davmail-init: https://bugzilla.novell.com/show_bug.cgi?id=675870 - uses {davmail_gid} and {davmail_uid} of default 213
- uses /etc/init.d for compatibility with other dists
* Mon Oct 18 2010 Marko Myllynen <myllynen@redhat.com> - BuildRequires and Requires compatible with openSUSE 11.4
- Initial version - 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