pool/alpine
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 728163 from server:mail

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/728163
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alpine?expand=0&rev=45
This commit is contained in:
Dominique Leuenberger 2019-09-05 10:42:53 +00:00 committed by Git OBS Bridge
commit d800c42b85
3 changed files with 59 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
alpine.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Aug 26 08:33:31 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Add return-values.diff to unbreak build.
- Use more macros for standard dirs in the build recipe.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 2 14:22:58 UTC 2019 - Reinhard Max <max@suse.com> Thu May 2 14:22:58 UTC 2019 - Reinhard Max <max@suse.com>
@ -140,7 +146,7 @@ Mon Sep 2 14:07:32 UTC 2013 - jengelh@inai.de
* New option preserve-original-fields that adds the ability to * New option preserve-original-fields that adds the ability to
preserve To: and Cc: fields when replying to a message, as preserve To: and Cc: fields when replying to a message, as
specified by original sender. specified by original sender.
* Added Quota subcommands for printing, forwarding, saving, etc. * Added Quota subcommands for printing, forwarding, saving, etc.
- Refresh from homepage (and save as unified): chappa-*.patch - Refresh from homepage (and save as unified): chappa-*.patch
- Refresh for -p1: operation-may-be-undefined-warning.diff, - Refresh for -p1: operation-may-be-undefined-warning.diff,
fix-implicit.patch, alpine-gcc44.diff fix-implicit.patch, alpine-gcc44.diff
@ -181,7 +187,7 @@ Fri Jul 27 08:43:05 UTC 2012 - aj@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 8 11:36:12 UTC 2012 - puzel@suse.com Wed Feb 8 11:36:12 UTC 2012 - puzel@suse.com
- clean up spec file - clean up spec file
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 17 08:45:32 UTC 2011 - max@suse.com Mon Oct 17 08:45:32 UTC 2011 - max@suse.com
@ -217,7 +223,7 @@ Sat Sep 17 10:55:07 UTC 2011 - jengelh@medozas.de
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Sep 3 18:53:17 UTC 2011 - crrodriguez@opensuse.org Sat Sep 3 18:53:17 UTC 2011 - crrodriguez@opensuse.org
- Fix build with no-add-needed - Fix build with no-add-needed
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 3 19:09:05 UTC 2009 - coolo@novell.com Tue Nov 3 19:09:05 UTC 2009 - coolo@novell.com
@ -294,7 +300,7 @@ Fri Apr 25 14:40:15 CEST 2008 - bk@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 11 17:04:18 CET 2008 - bk@suse.de Fri Jan 11 17:04:18 CET 2008 - bk@suse.de
- Update to alpine-1.00 and apply fixes suggested for this version - Update to alpine-1.00 and apply fixes suggested for this version
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 25 13:05:20 CEST 2007 - bk@suse.de Tue Sep 25 13:05:20 CEST 2007 - bk@suse.de
@ -305,7 +311,7 @@ Tue Sep 25 13:05:20 CEST 2007 - bk@suse.de
Wed Sep 19 14:32:24 CEST 2007 - bk@suse.de Wed Sep 19 14:32:24 CEST 2007 - bk@suse.de
- Remove files with unclear license from packaged sources (#308533) - Remove files with unclear license from packaged sources (#308533)
- Add small bug fix: Postponed messages which were labelled as UTF-8 - Add small bug fix: Postponed messages which were labelled as UTF-8
- Spec file cleanup: Comments improved, obsoleted some warning flags - Spec file cleanup: Comments improved, obsoleted some warning flags
------------------------------------------------------------------- -------------------------------------------------------------------
@ -321,5 +327,4 @@ Thu Aug 9 12:42:41 CEST 2007 - bk@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 2 18:14:38 CEST 2007 - bk@suse.de Thu Aug 2 18:14:38 CEST 2007 - bk@suse.de
- initial version 0.999 + assorted feature patches and some fixes - initial version 0.999 + assorted feature patches and some fixes

40
alpine.spec
View File

@ -24,7 +24,7 @@ License: Apache-2.0
Group: Productivity/Networking/Email/Clients Group: Productivity/Networking/Email/Clients
Version: 2.21 Version: 2.21
Release: 0 Release: 0
Url: http://alpine.x10host.com/alpine/ URL: http://alpine.x10host.com/alpine/
# direct download does not work for openSUSE:Factory # direct download does not work for openSUSE:Factory
# Source: http://patches.freeiz.com/alpine/release/src/%name-%version.tar.xz # Source: http://patches.freeiz.com/alpine/release/src/%name-%version.tar.xz
@ -40,6 +40,7 @@ Patch7: alpine-pinepw.patch
Patch10: pico-fix-spurious-undef-warnings.diff Patch10: pico-fix-spurious-undef-warnings.diff
Patch20: pine-expression-warnings.diff Patch20: pine-expression-warnings.diff
Patch60: signal-and-panic-improvements.diff Patch60: signal-and-panic-improvements.diff
Patch61: return-values.diff
# #
# Eduardo Chappa's patches. # Eduardo Chappa's patches.
# http://patches.freeiz.com/alpine/ # http://patches.freeiz.com/alpine/
@ -52,7 +53,6 @@ Patch605: chappa-WrtAcc.patch
Patch614: chappa-fillpara.patch Patch614: chappa-fillpara.patch
Patch615: chappa-fromheader.patch Patch615: chappa-fromheader.patch
Patch616: chappa-rules.patch Patch616: chappa-rules.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf >= 2.69 BuildRequires: autoconf >= 2.69
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: libtool BuildRequires: libtool
@ -111,7 +111,7 @@ if [ ! -s %{_sourcedir}/compile-warnings-%{suse_version}-%{_arch}.log ]; then
echo "that build to the rpm build process so that it's found here". echo "that build to the rpm build process so that it's found here".
else else
sed 's/:[0-9]*//' %{_sourcedir}/compile-warnings-%{suse_version}-%{_arch}.log \ sed 's/:[0-9]*//' %{_sourcedir}/compile-warnings-%{suse_version}-%{_arch}.log \
>compile-warnings-allowed.log >compile-warnings-allowed.log
fi fi
# #
# "Chappa" patches # "Chappa" patches
@ -136,6 +136,7 @@ fi
%patch10 -p1 %patch10 -p1
%patch20 -p1 %patch20 -p1
%patch60 -p1 %patch60 -p1
%patch61 -p1
%endif # End of "if !{build_vanilla}" %endif # End of "if !{build_vanilla}"
%build %build
@ -155,7 +156,7 @@ export CFLAGS="${RPM_OPT_FLAGS/-O2/-Os} \
# they are always true and can be safely removed from the expression, # they are always true and can be safely removed from the expression,
# but the code is safe nontheless. # but the code is safe nontheless.
# #
# -Waddress generates >100 warnings in alpine and we disabled them to # -Waddress generates >100 warnings in alpine and we disabled them to
# concentrate on the really important warnings which could be real bugs better. # concentrate on the really important warnings which could be real bugs better.
# #
: :
@ -166,10 +167,10 @@ export LDFLAGS="-rdynamic" # -rdynamic is used for backtrace_symbols:
: :
autoreconf -fiv autoreconf -fiv
%configure \ %configure \
--with-ssl-dir=/usr \ --with-ssl-dir="%{_prefix}" \
--with-smtp-msa=/usr/sbin/sendmail \ --with-smtp-msa="%{_sbindir}/sendmail" \
--with-password-prog=/usr/bin/passwd \ --with-password-prog="%{_bindir}/passwd" \
--with-npa=/usr/bin/inews \ --with-npa="%{_bindir}/inews" \
--with-spellcheck-prog="please set Speller to eg. 'aspell -c' in SETUP/Configuration"\ --with-spellcheck-prog="please set Speller to eg. 'aspell -c' in SETUP/Configuration"\
--with-system-pinerc=%_sysconfdir/pine.conf \ --with-system-pinerc=%_sysconfdir/pine.conf \
--with-system-fixed-pinerc=%_sysconfdir/pine.conf.fixed \ --with-system-fixed-pinerc=%_sysconfdir/pine.conf.fixed \
@ -199,17 +200,17 @@ make install DESTDIR=%buildroot
# #
# When called as alpinef, alpine uses function keys instead of Control keys: # When called as alpinef, alpine uses function keys instead of Control keys:
# #
ln $RPM_BUILD_ROOT%{_bindir}/alpine $RPM_BUILD_ROOT%{_bindir}/alpinef ln %{buildroot}/%{_bindir}/alpine %{buildroot}/%{_bindir}/alpinef
install -m755 imap/mailutil/mailutil $RPM_BUILD_ROOT%{_bindir} install -m755 imap/mailutil/mailutil %{buildroot}/%{_bindir}
install -m644 imap/src/mailutil/mailutil.1 $RPM_BUILD_ROOT%{_mandir}/man1/ install -m644 imap/src/mailutil/mailutil.1 %{buildroot}/%{_mandir}/man1/
install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/pixmaps/%name.png install -D -m644 %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/%name.png
install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/applications/%name.desktop install -D -m644 %{SOURCE2} %{buildroot}/%{_datadir}/applications/%name.desktop
%suse_update_desktop_file %name %suse_update_desktop_file %name
: :
ln -sf alpine $RPM_BUILD_ROOT%{_bindir}/pine ln -sf alpine %{buildroot}/%{_bindir}/pine
: :
install -m755 pico/{pico,pilot} $RPM_BUILD_ROOT%{_bindir} install -m755 pico/{pico,pilot} %{buildroot}/%{_bindir}
install -m644 doc/man1/{pico.1,pilot.1} $RPM_BUILD_ROOT%{_mandir}/man1/ install -m644 doc/man1/{pico.1,pilot.1} %{buildroot}/%{_mandir}/man1/
%check %check
#since where are no logs in the package at the moment, there are no checks, #since where are no logs in the package at the moment, there are no checks,
@ -265,7 +266,6 @@ if [ -s %{_sourcedir}/compile-warnings-%{suse_version}-%{_arch}.log ]; then
fi fi
%files %files
%defattr(-, root, root)
%doc %{_mandir}/man1/alpine.* %doc %{_mandir}/man1/alpine.*
%doc %{_mandir}/man1/rpdump.* %doc %{_mandir}/man1/rpdump.*
%doc %{_mandir}/man1/rpload.* %doc %{_mandir}/man1/rpload.*
@ -276,16 +276,14 @@ fi
%{_bindir}/alpinef %{_bindir}/alpinef
%{_bindir}/rp* %{_bindir}/rp*
%{_bindir}/mailutil %{_bindir}/mailutil
/usr/share/applications/%name.desktop %{_datadir}/applications/%name.desktop
/usr/share/pixmaps/%name.png %{_datadir}/pixmaps/%name.png
%files -n pico %files -n pico
%defattr(-, root, root)
%{_bindir}/pico %{_bindir}/pico
%doc %{_mandir}/man1/pico.* %doc %{_mandir}/man1/pico.*
%files -n pilot %files -n pilot
%defattr(-, root, root)
%{_bindir}/pilot %{_bindir}/pilot
%doc %{_mandir}/man1/pilot.* %doc %{_mandir}/man1/pilot.*

28
return-values.diff Normal file
View File

@ -0,0 +1,28 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2019-08-26 10:33:27.198383143 +0200
openSUSE uses -Werror=return-type since a while... :-/
Returning a value in a void function has no practical issues, unlike returning
no value in an int function. But gcc does not differentiate between the two
cases.
[ 139s] send.c:4200:12: error: 'return' with a value, in function returning void [-Werror=return-type]
[ 139s] 4200 | return 0;
---
pith/send.c | 1 -
1 file changed, 1 deletion(-)
Index: alpine-2.21/pith/send.c
===================================================================
--- alpine-2.21.orig/pith/send.c
+++ alpine-2.21/pith/send.c
@@ -4197,7 +4197,6 @@ set_parameter(PARAMETER **param, char *p
pm->value = cpystr(new_value);
}
}
- return 0;
}