Hello community, here is the log from the commit of package classpathx-mail for openSUSE:Factory checked in at 2014-08-01 19:26:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/classpathx-mail (Old) and /work/SRC/openSUSE:Factory/.classpathx-mail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "classpathx-mail" Changes: -------- --- /work/SRC/openSUSE:Factory/classpathx-mail/classpathx-mail.changes 2013-09-11 13:39:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.classpathx-mail.new/classpathx-mail.changes 2014-08-01 19:26:48.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 21 08:00:40 UTC 2014 - [email protected] + +- Cleanup with spec-cleaner. Fix update-alternatives code. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ classpathx-mail.spec ++++++ --- /var/tmp/diff_new_pack.vxSpRZ/_old 2014-08-01 19:26:49.000000000 +0200 +++ /var/tmp/diff_new_pack.vxSpRZ/_new 2014-08-01 19:26:49.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package classpathx-mail # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,6 @@ %define jmailver 1.3.1 %define inetlibver 1.1.1 - Name: classpathx-mail Version: 1.1.1 Release: 0 @@ -34,28 +33,24 @@ Patch3: %{name}-remove-inetlib.patch # see bz157685 Patch4: classpath-inetlib-docbuild.patch -PreReq: coreutils -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch BuildRequires: ant BuildRequires: jaf >= 1.0 +BuildRequires: java-devel +BuildRequires: java-sasl BuildRequires: javapackages-tools BuildRequires: jce BuildRequires: perl -# gnu-crypto is required for pre-1.5 JVMs only -#BuildRequires: gnu-crypto -%if %defined suse_version -BuildRequires: java-devel -%endif -BuildRequires: java-sasl Requires: jaf >= 1.0 Requires: java-sasl Requires: jce -Requires(preun): /usr/sbin/update-alternatives -Requires(post): /usr/sbin/update-alternatives +Requires(post): %{_sbindir}/update-alternatives +Requires(preun): %{_sbindir}/update-alternatives Provides: gnu-javamail = 1.0 Provides: javamail = %{jmailver} -Obsoletes: gnu-javamail <= 1.0 +Obsoletes: gnu-javamail < 1.0 +Obsoletes: javamail < %{jmailver} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description GNU JavaMail is a free implementation of the JavaMail API @@ -74,33 +69,25 @@ Maildir format All these providers are feature-complete, and provide cryptographically secure access where relevant. - - %package javadoc Summary: GNU JavaMail(tm) Group: Development/Languages/Java Provides: javamail-javadoc = 0:%{jmailver} -PreReq: coreutils -#BuildRequires: java-javadoc -# there's no classpathx-jaf in SUSE -#BuildRequires: jaf-javadoc %description javadoc GNU JavaMail(tm) is a free implementation of the JavaMail API. - - %{summary}. %prep %setup -q -n mail-%{version} -%patch1 -p0 -%patch2 -p0 -%patch3 -p0 +%patch1 +%patch2 +%patch3 rm -f libmail.so bunzip2 -dc %{SOURCE1} | tar -xf - pushd inetlib-%{inetlibver} -%patch4 -p0 +%patch4 mkdir -p source/org/jpackage/mail mv source/gnu/inet source/org/jpackage/mail popd @@ -132,59 +119,34 @@ rm -Rf monolithic %install -rm -rf $RPM_BUILD_ROOT -install -dm 755 $RPM_BUILD_ROOT%{_javadir}/classpathx-mail +install -dm 755 %{buildroot}%{_javadir}/classpathx-mail # API -install -pm 644 gnumail.jar \ - $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/mail-%{jmailver}-api-%{version}.jar -ln -s mail-%{jmailver}-api-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/mail-%{jmailver}-api.jar -ln -s mail-%{jmailver}-api.jar \ - $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/mailapi.jar +install -pm 644 gnumail.jar %{buildroot}%{_javadir}/classpathx-mail/mail-%{jmailver}-api-%{version}.jar +ln -s mail-%{jmailver}-api-%{version}.jar %{buildroot}%{_javadir}/classpathx-mail/mail-%{jmailver}-api.jar +ln -s mail-%{jmailver}-api.jar %{buildroot}%{_javadir}/classpathx-mail/mailapi.jar # Providers -install -pm 644 gnumail-providers.jar \ - $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/mail-%{jmailver}-providers-%{version}.jar -ln -s mail-%{jmailver}-providers-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/mail-%{jmailver}-providers.jar -ln -s mail-%{jmailver}-providers.jar \ - $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/providers.jar +install -pm 644 gnumail-providers.jar %{buildroot}%{_javadir}/classpathx-mail/mail-%{jmailver}-providers-%{version}.jar +ln -s mail-%{jmailver}-providers-%{version}.jar %{buildroot}%{_javadir}/classpathx-mail/mail-%{jmailver}-providers.jar +ln -s mail-%{jmailver}-providers.jar %{buildroot}%{_javadir}/classpathx-mail/providers.jar for prov in imap nntp pop3 smtp ; do - ln -s mail-%{jmailver}-providers.jar \ - $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/$prov-%{jmailver}.jar - ln -s providers.jar $RPM_BUILD_ROOT%{_javadir}/classpathx-mail/$prov.jar + ln -s mail-%{jmailver}-providers.jar %{buildroot}%{_javadir}/classpathx-mail/$prov-%{jmailver}.jar + ln -s providers.jar %{buildroot}%{_javadir}/classpathx-mail/$prov.jar done -install -pm 644 monolithic.jar \ - $RPM_BUILD_ROOT%{_javadir}/classpathx-mail-%{jmailver}-monolithic-%{version}.jar -ln -s classpathx-mail-%{jmailver}-monolithic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/classpathx-mail-%{jmailver}-monolithic.jar -touch $RPM_BUILD_ROOT%{_javadir}/javamail.jar # for %ghost -install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{jmailver} -cp -pR docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{jmailver} -ln -s %{name}-%{jmailver} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink - -%clean -rm -rf $RPM_BUILD_ROOT - -%triggerpostun -- classpathx-mail-monolithic <= 0:1.1.1-1jpp -# Remove file from old monolithic subpackage -rm -f %{_javadir}/javamail.jar -# Recreate the link as update-alternatives could not do it -ln -s %{_sysconfdir}/alternatives/javamail %{_javadir}/javamail.jar +install -pm 644 monolithic.jar %{buildroot}%{_javadir}/classpathx-mail-%{jmailver}-monolithic-%{version}.jar +ln -s classpathx-mail-%{jmailver}-monolithic-%{version}.jar %{buildroot}%{_javadir}/classpathx-mail-%{jmailver}-monolithic.jar +install -dm 755 %{buildroot}%{_javadocdir}/%{name} +cp -pR docs/* %{buildroot}%{_javadocdir}/%{name} + +# javamail alternatives +mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ +ln -sf %{_sysconfdir}/alternatives/javamail.jar %{buildroot}%{_javadir}/javamail.jar %post -/usr/sbin/update-alternatives --install %{_javadir}/javamail.jar javamail %{_javadir}/classpathx-mail-1.3.1-monolithic.jar 010301 +%{_sbindir}/update-alternatives --install %{_javadir}/javamail.jar javamail %{_javadir}/classpathx-mail-%{jmailver}-monolithic.jar 010301 %preun if [ "$1" = "0" ]; then - /usr/sbin/update-alternatives --remove javamail %{_javadir}/classpathx-mail-1.3.1-monolithic.jar -fi - -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{jmailver} %{_javadocdir}/%{name} - -%postun javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name} + %{_sbindir}/update-alternatives --remove javamail %{_javadir}/classpathx-mail-%{jmailver}-monolithic.jar fi %files @@ -208,11 +170,11 @@ # Monolithic jar %{_javadir}/classpathx-mail-%{jmailver}-monolithic-%{version}.jar %{_javadir}/classpathx-mail-%{jmailver}-monolithic.jar -%ghost %{_javadir}/javamail.jar +%{_javadir}/javamail.jar +%ghost %{_sysconfdir}/alternatives/javamail.jar %files javadoc %defattr(644,root,root,755) -%doc %{_javadocdir}/%{name}-%{jmailver} -%ghost %{_javadocdir}/%{name} +%doc %{_javadocdir}/%{name} %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
