- alpine 2.21, update URL, .spec cosmetics

drop patch, no longer needed
Merge branch 'master' into el6
2017-08-15 09:50:25 -04:00 · 2015-10-10 05:17:31 -05:00 · 2015-10-09 13:03:33 -05:00 · 2015-10-09 13:03:28 -05:00 · 2015-10-09 13:03:27 -05:00 · 2015-10-09 13:03:26 -05:00
3 changed files with 10 additions and 13 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,3 +4,4 @@ alpine-2.00.tar.bz2
 /alpine-2.10.clean.tar.lzma
 /alpine-2.11.tar.xz
 /alpine-2.20.tar.xz
+/alpine-2.21.tar.xz
--- a/alpine.spec
+++ b/alpine.spec
@ -2,16 +2,17 @@

 Summary: powerful, easy to use console email client
 Name: alpine
-Version: 2.20
-Release: 2%{?dist}
+Version: 2.21
+Release: 1%{?dist}

 License: ASL 2.0
 Group: Applications/Internet
 # Upstream change - see https://groups.google.com/forum/#!msg/comp.mail.pine/4w_f1ro6GRA/faiu1Egw_ywJ
 #URL: http://re-alpine.sourceforge.net/ 
 #Source0:  http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2
-URL: http://patches.freeiz.com/alpine/info/alpine.html
-Source0: http://patches.freeiz.com/alpine/patches/alpine-%{version}/alpine-%{version}.tar.xz
+URL:     http://alpine.freeiz.com/
+Source0: http://alpine.freeiz.com/alpine/release/src/alpine-%{version}.tar.xz
+
 Source1: README.fedora

 # Using "Conflicts" instead of Obsoletes because while alpine is substantially
@ -72,8 +73,6 @@ GNU Build System's autotools.

 install -m644 -p %{SOURCE1} .

-#autoreconf -f -i
-

 %build
 touch imap/ip6
@ -94,7 +93,6 @@ make %{?_smp_mflags} EXTRACFLAGS="$RPM_OPT_FLAGS"


 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT

 # create/touch %ghost'd files
@ -103,12 +101,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed


-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc README LICENSE
 %doc README.fedora
 %ghost %config(noreplace) %{_sysconfdir}/pine.conf
@ -126,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT


 %changelog
+* Tue Aug 15 2017 Paul Wouters <pwouters@redhat.com> - 2.21-1
+- alpine 2.21, update URL, .spec cosmetics
+
 * Fri Oct 09 2015 Rex Dieter <rdieter@fedoraproject.org> 2.20-2
 - use patched alpine sources (#1270331,#1270183)

--- a/2
+++ b/2
@ -1 +1 @@
-2d63c923f7995890c0eecfc0c3d1c936  alpine-2.20.tar.xz
+SHA512 (alpine-2.21.tar.xz) = a2a36a033c8af79810816a7da7185c269808ba6d84d013691fd8b3764c63f5fb2284e6844ec5a5e99d168514ae636debf59fae962533a2916679e4e9109c6264
Author	SHA1	Message	Date
Paul Wouters	c4badb5996	- alpine 2.21, update URL, .spec cosmetics	2017-08-15 09:50:25 -04:00
Rex Dieter	9bf74954ce	drop patch, no longer needed	2015-10-10 05:17:31 -05:00
Rex Dieter	9f44c40c2f	Merge branch 'master' into el6	2015-10-09 13:03:33 -05:00
Rex Dieter	3f5cdae6f1	Revert "Update to upstream alpine-2.20.tar.xz" This reverts commit `c9aaf6f371`.	2015-10-09 13:03:28 -05:00
Rex Dieter	540aef0f1c	Revert "Update to upstream alpine-2.20.tar.xz" This reverts commit `3f4df0fc4c`.	2015-10-09 13:03:27 -05:00
Rex Dieter	d0042ab94c	Revert "Update to upstream alpine-2.20.tar.xz" This reverts commit `119a82759d`.	2015-10-09 13:03:26 -05:00
Rex Dieter	614b281005	Revert "Update to upstream alpine-2.20.tar.xz" This reverts commit `4b5cba18d3`.	2015-10-09 13:03:25 -05:00
Rex Dieter	c6786f2453	Revert "Update to upstream alpine-2.20.tar.xz" This reverts commit `8da96b550f`.	2015-10-09 13:03:23 -05:00
Joshua Daniel Franklin	8da96b550f	Update to upstream alpine-2.20.tar.xz	2015-07-07 03:01:06 +00:00
Joshua Daniel Franklin	4b5cba18d3	Update to upstream alpine-2.20.tar.xz	2015-07-07 02:09:17 +00:00
Joshua Daniel Franklin	119a82759d	Update to upstream alpine-2.20.tar.xz	2015-07-07 01:59:53 +00:00
Joshua Daniel Franklin	3f4df0fc4c	Update to upstream alpine-2.20.tar.xz	2015-07-07 01:45:17 +00:00
Joshua Daniel Franklin	c9aaf6f371	Update to upstream alpine-2.20.tar.xz	2015-07-07 01:44:51 +00:00
Rex Dieter	0f2c6e2209	allow use of el6's openssl-1.0.0 too ... like alpine-2.10 did.	2013-11-08 09:45:51 -06:00