From 361b7745557a4d3f9c10ba4cd377ddd0275d50c079d8c1cc459187064ad08a02 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 5 Sep 2019 10:42:53 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/alpine revision 45.0 OBS-URL: https://build.opensuse.org/package/show/server:mail/alpine?expand=0&rev=07628cb9dba2bd4246e8f61cac3ec591 --- alpine.changes | 19 ++++++++++++------- alpine.spec | 40 +++++++++++++++++++--------------------- return-values.diff | 28 ++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 28 deletions(-) create mode 100644 return-values.diff diff --git a/alpine.changes b/alpine.changes index 126ce63..912b26b 100644 --- a/alpine.changes +++ b/alpine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 26 08:33:31 UTC 2019 - Jan Engelhardt + +- 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 @@ -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 preserve To: and Cc: fields when replying to a message, as 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 for -p1: operation-may-be-undefined-warning.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 -- clean up spec file +- clean up spec file ------------------------------------------------------------------- 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 -- Fix build with no-add-needed +- Fix build with no-add-needed ------------------------------------------------------------------- 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 -- 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 @@ -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 - 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 ------------------------------------------------------------------- @@ -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 -- initial version 0.999 + assorted feature patches and some fixes - +- initial version 0.999 + assorted feature patches and some fixes diff --git a/alpine.spec b/alpine.spec index aa054b3..bb859f7 100644 --- a/alpine.spec +++ b/alpine.spec @@ -24,7 +24,7 @@ License: Apache-2.0 Group: Productivity/Networking/Email/Clients Version: 2.21 Release: 0 -Url: http://alpine.x10host.com/alpine/ +URL: http://alpine.x10host.com/alpine/ # direct download does not work for openSUSE:Factory # 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 Patch20: pine-expression-warnings.diff Patch60: signal-and-panic-improvements.diff +Patch61: return-values.diff # # Eduardo Chappa's patches. # http://patches.freeiz.com/alpine/ @@ -52,7 +53,6 @@ Patch605: chappa-WrtAcc.patch Patch614: chappa-fillpara.patch Patch615: chappa-fromheader.patch Patch616: chappa-rules.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.69 BuildRequires: krb5-devel 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". else sed 's/:[0-9]*//' %{_sourcedir}/compile-warnings-%{suse_version}-%{_arch}.log \ - >compile-warnings-allowed.log + >compile-warnings-allowed.log fi # # "Chappa" patches @@ -136,6 +136,7 @@ fi %patch10 -p1 %patch20 -p1 %patch60 -p1 +%patch61 -p1 %endif # End of "if !{build_vanilla}" %build @@ -155,7 +156,7 @@ export CFLAGS="${RPM_OPT_FLAGS/-O2/-Os} \ # they are always true and can be safely removed from the expression, # 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. # : @@ -166,10 +167,10 @@ export LDFLAGS="-rdynamic" # -rdynamic is used for backtrace_symbols: : autoreconf -fiv %configure \ - --with-ssl-dir=/usr \ - --with-smtp-msa=/usr/sbin/sendmail \ - --with-password-prog=/usr/bin/passwd \ - --with-npa=/usr/bin/inews \ + --with-ssl-dir="%{_prefix}" \ + --with-smtp-msa="%{_sbindir}/sendmail" \ + --with-password-prog="%{_bindir}/passwd" \ + --with-npa="%{_bindir}/inews" \ --with-spellcheck-prog="please set Speller to eg. 'aspell -c' in SETUP/Configuration"\ --with-system-pinerc=%_sysconfdir/pine.conf \ --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: # -ln $RPM_BUILD_ROOT%{_bindir}/alpine $RPM_BUILD_ROOT%{_bindir}/alpinef -install -m755 imap/mailutil/mailutil $RPM_BUILD_ROOT%{_bindir} -install -m644 imap/src/mailutil/mailutil.1 $RPM_BUILD_ROOT%{_mandir}/man1/ -install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/pixmaps/%name.png -install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/applications/%name.desktop +ln %{buildroot}/%{_bindir}/alpine %{buildroot}/%{_bindir}/alpinef +install -m755 imap/mailutil/mailutil %{buildroot}/%{_bindir} +install -m644 imap/src/mailutil/mailutil.1 %{buildroot}/%{_mandir}/man1/ +install -D -m644 %{SOURCE1} %{buildroot}/%{_datadir}/pixmaps/%name.png +install -D -m644 %{SOURCE2} %{buildroot}/%{_datadir}/applications/%name.desktop %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 -m644 doc/man1/{pico.1,pilot.1} $RPM_BUILD_ROOT%{_mandir}/man1/ +install -m755 pico/{pico,pilot} %{buildroot}/%{_bindir} +install -m644 doc/man1/{pico.1,pilot.1} %{buildroot}/%{_mandir}/man1/ %check #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 %files -%defattr(-, root, root) %doc %{_mandir}/man1/alpine.* %doc %{_mandir}/man1/rpdump.* %doc %{_mandir}/man1/rpload.* @@ -276,16 +276,14 @@ fi %{_bindir}/alpinef %{_bindir}/rp* %{_bindir}/mailutil -/usr/share/applications/%name.desktop -/usr/share/pixmaps/%name.png +%{_datadir}/applications/%name.desktop +%{_datadir}/pixmaps/%name.png %files -n pico -%defattr(-, root, root) %{_bindir}/pico %doc %{_mandir}/man1/pico.* %files -n pilot -%defattr(-, root, root) %{_bindir}/pilot %doc %{_mandir}/man1/pilot.* diff --git a/return-values.diff b/return-values.diff new file mode 100644 index 0000000..35532e6 --- /dev/null +++ b/return-values.diff @@ -0,0 +1,28 @@ +From: Jan Engelhardt +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; + } + +