From 7fecd3984e2c559a58565d7e23a12178355a3bc2 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 7 Sep 2007 18:23:45 +0000 Subject: [PATCH 01/10] Initialize branch F-7 for alpine --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From c770eeba93b3fab97baecd25554a8cf38cb5306f Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Wed, 24 Oct 2007 17:24:14 +0000 Subject: [PATCH 02/10] building alpine for updates-testing --- alpine.spec | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 alpine.spec diff --git a/alpine.spec b/alpine.spec new file mode 100644 index 0000000..75a3094 --- /dev/null +++ b/alpine.spec @@ -0,0 +1,106 @@ +# Fedora review: http://bugzilla.redhat.com/249365 + +Summary: UW Alpine mail user agent +Name: alpine +Version: 0.9999 +Release: 2%{?dist} + +License: Apache Software License +Group: Applications/Internet +URL: http://www.washington.edu/alpine +#Source0: ftp://ftp.cac.washington.edu/alpine/%{name}-%{version}.tar.bz2 +# removed cc5.sol problem file, see BZ for details +Source0: %{name}-%{version}.tar.bz2 + +Requires: /usr/sbin/sendmail aspell mailcap +# Using "Conflicts" instead of Obsoletes because while alpine is substantially +# compatible with pine the change to Unicode breaks important user +# functionality such as non-ASCII encoded saved passwords. Additionally, there +# are also many patches to pine floating around that for political/technical +# reasons will not be integrated into alpine. (I'd like to stay out of it... +# just search "Mark Crispin maildir" for the gory details.) Since licensing +# prevents a Fedora pine package, I cannot predict what patches users might +# have and so want to warn them instead of automatically replacing their pine +# install with an alpine that could break their configuration. +# I understand this to be a special case of the "Optional Functionality" +# description at http://fedoraproject.org/wiki/Packaging/Conflicts +Conflicts: pine +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +BuildRequires: /usr/sbin/sendmail +BuildRequires: gettext inews krb5-devel ncurses-devel +BuildRequires: openldap-devel openssl-devel pam-devel passwd sendmail + +%description +Alpine -- an Alternatively Licensed Program for Internet +News & Email -- is a tool for reading, sending, and managing +electronic messages. Alpine is the successor to Pine and was +developed by Computing & Communications at the University of +Washington. + Though originally designed for inexperienced email users, +Alpine supports many advanced features, and an ever-growing number of +configuration and personal-preference options. +Changes and enhancements over pine: + * Released under the Apache Software License, Version 2.0. + * Internationalization built around new internal Unicode support. + * Ground-up reorganization of source code around new "pith/" core +routine library. + * Ground-up reorganization of build and install procedure based on +GNU Build System's autotools. + +%prep +%setup -q +chmod -x alpine/arg.c pico/main.c + +%build +touch imap/ip6 +# --without-tcl disables the TCL-based CGI "Web Alpine" +%configure \ + --without-tcl \ + --with-c-client-target=lfd \ + --with-passfile=.alpine.passfile \ + --with-spellcheck-prog=aspell +make %{?_smp_mflags} EXTRACFLAGS="$RPM_OPT_FLAGS" + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc README LICENSE doc/tech-notes.txt +%{_bindir}/alpine +%{_bindir}/pico +%{_bindir}/pilot +%{_bindir}/rpload +%{_bindir}/rpdump +%{_mandir}/man1/alpine.1* +%{_mandir}/man1/pico.1* +%{_mandir}/man1/pilot.1* +%{_mandir}/man1/rpload.1* +%{_mandir}/man1/rpdump.1* + +%changelog +* Fri Sep 07 2007 Joshua Daniel Franklin 0.9999-2 +- update to latest + +* Fri Aug 24 2007 Rex Dieter 0.999-3 +- EXTRACFLAGS=$RPM_OPT_FLAGS +- --with-c-client-target=lfd +- --with-passfile=.alpine.passfile +- Requires: mailcap + +* Mon Jul 24 2007 Joshua Daniel Franklin 0.999-2.2 +- remove problem cc5.sol file +- integrate changes from Patrick "Jima" Laughton + +* Mon Jul 24 2007 Joshua Daniel Franklin 0.999-2.1 +- correct spec syntax, explain Conflicts tag + +* Mon Jul 23 2007 Joshua Daniel Franklin 0.999-2.0 +- initial alpine spec +- Apache Software License 2.0 + From f79b2e2b3fffaa5f28771b9a64d099cdb6a0ea61 Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Wed, 24 Oct 2007 17:32:01 +0000 Subject: [PATCH 03/10] oops :-) --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index e69de29..8e3c35b 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +61ce134e24185727e6a0736738767630 alpine-0.9999.tar.bz2 From b65ffca3845bb57ea6da0fd3aeadb380789b000c Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Wed, 14 Nov 2007 19:42:57 +0000 Subject: [PATCH 04/10] BZ#383061 --- .cvsignore | 1 + alpine.spec | 23 +++++++++++++++++++---- sources | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index e69de29..419e120 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +alpine-0.99999.tar.bz2 diff --git a/alpine.spec b/alpine.spec index 75a3094..0f50d90 100644 --- a/alpine.spec +++ b/alpine.spec @@ -2,14 +2,14 @@ Summary: UW Alpine mail user agent Name: alpine -Version: 0.9999 +Version: 0.99999 Release: 2%{?dist} License: Apache Software License Group: Applications/Internet URL: http://www.washington.edu/alpine -#Source0: ftp://ftp.cac.washington.edu/alpine/%{name}-%{version}.tar.bz2 -# removed cc5.sol problem file, see BZ for details +# FTP: ftp://ftp.cac.washington.edu/alpine/ +# SVN: https://svn.cac.washington.edu/public/alpine/snapshots/ Source0: %{name}-%{version}.tar.bz2 Requires: /usr/sbin/sendmail aspell mailcap @@ -50,7 +50,6 @@ GNU Build System's autotools. %prep %setup -q -chmod -x alpine/arg.c pico/main.c %build touch imap/ip6 @@ -66,12 +65,19 @@ make %{?_smp_mflags} EXTRACFLAGS="$RPM_OPT_FLAGS" rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +# create/touch %ghost'd files +mkdir -p $RPM_BUILD_ROOT/etc +touch $RPM_BUILD_ROOT/etc/pine.conf +touch $RPM_BUILD_ROOT/etc/pine.conf.fixed + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README LICENSE doc/tech-notes.txt +%ghost %config(noreplace) /etc/pine.conf +%ghost %config(noreplace) /etc/pine.conf.fixed %{_bindir}/alpine %{_bindir}/pico %{_bindir}/pilot @@ -84,6 +90,15 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/rpdump.1* %changelog +* Thu Nov 09 2007 Joshua Daniel Franklin 0.99999-2 +- update to latest + +* Thu Oct 25 2007 Rex Dieter 0.9999-3 +- include stock pine.conf, pine.conf.fixed + * Fri Sep 07 2007 Joshua Daniel Franklin 0.9999-2 - update to latest diff --git a/sources b/sources index 8e3c35b..bcedde7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -61ce134e24185727e6a0736738767630 alpine-0.9999.tar.bz2 +5ffbfc0000998595755f1b08ad800c9d alpine-0.99999.tar.bz2 From 00fcbbd88ff6801cc05f6c4529b1824af40cf323 Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Fri, 16 Nov 2007 00:13:18 +0000 Subject: [PATCH 05/10] BuildRequires aspell to make configure happy --- alpine.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/alpine.spec b/alpine.spec index 0f50d90..6413200 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: UW Alpine mail user agent Name: alpine Version: 0.99999 -Release: 2%{?dist} +Release: 3%{?dist} License: Apache Software License Group: Applications/Internet @@ -27,7 +27,7 @@ Requires: /usr/sbin/sendmail aspell mailcap Conflicts: pine BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: /usr/sbin/sendmail +BuildRequires: /usr/sbin/sendmail aspell BuildRequires: gettext inews krb5-devel ncurses-devel BuildRequires: openldap-devel openssl-devel pam-devel passwd sendmail @@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/rpdump.1* %changelog +* Thu Nov 15 2007 Joshua Daniel Franklin 0.99999-3 +- BuildRequires aspell to make configure happy + * Thu Nov 09 2007 Joshua Daniel Franklin 0.99999-2 - update to latest From aa0aa0f1eb75d9e0268a42f8c115d827aaac220a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 21 Dec 2007 15:02:35 +0000 Subject: [PATCH 06/10] - alpine-1.00 --- .cvsignore | 2 +- alpine.spec | 18 +++++++++++++++--- sources | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 419e120..83980dd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -alpine-0.99999.tar.bz2 +alpine-1.00.tar.bz2 diff --git a/alpine.spec b/alpine.spec index 6413200..8155719 100644 --- a/alpine.spec +++ b/alpine.spec @@ -2,15 +2,15 @@ Summary: UW Alpine mail user agent Name: alpine -Version: 0.99999 -Release: 3%{?dist} +Version: 1.00 +Release: 1%{?dist} License: Apache Software License Group: Applications/Internet URL: http://www.washington.edu/alpine # FTP: ftp://ftp.cac.washington.edu/alpine/ # SVN: https://svn.cac.washington.edu/public/alpine/snapshots/ -Source0: %{name}-%{version}.tar.bz2 +Source0: ftp://ftp.cac.washington.edu/alpine/alpine-%{version}.tar.bz2 Requires: /usr/sbin/sendmail aspell mailcap # Using "Conflicts" instead of Obsoletes because while alpine is substantially @@ -48,9 +48,11 @@ routine library. * Ground-up reorganization of build and install procedure based on GNU Build System's autotools. + %prep %setup -q + %build touch imap/ip6 # --without-tcl disables the TCL-based CGI "Web Alpine" @@ -61,6 +63,7 @@ touch imap/ip6 --with-spellcheck-prog=aspell make %{?_smp_mflags} EXTRACFLAGS="$RPM_OPT_FLAGS" + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -70,9 +73,11 @@ mkdir -p $RPM_BUILD_ROOT/etc touch $RPM_BUILD_ROOT/etc/pine.conf touch $RPM_BUILD_ROOT/etc/pine.conf.fixed + %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root,-) %doc README LICENSE doc/tech-notes.txt @@ -89,7 +94,14 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/rpload.1* %{_mandir}/man1/rpdump.1* + %changelog +* Fri Dec 21 2007 Rex Dieter 1.00-1 +- alpine-1.00 + +* Tue Dec 04 2007 Patrick "Jima" Laughton 0.99999-4 +- Bump-n-build for openldap/openssl soname changes + * Thu Nov 15 2007 Joshua Daniel Franklin 0.99999-3 - BuildRequires aspell to make configure happy diff --git a/sources b/sources index bcedde7..390ffbe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ffbfc0000998595755f1b08ad800c9d alpine-0.99999.tar.bz2 +c5dad25d8f848cad0e3077edd3038c43 alpine-1.00.tar.bz2 From 46b72c7c2c869d0cb4652eaa362d05072e39dc1b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 21 Dec 2007 17:23:11 +0000 Subject: [PATCH 07/10] - --with-system-pinerc=%_sysconfdir/pine.conf --with-system-fixed-pinerc=%_sysconfdir/pine.conf.fixed (#426512) --- alpine.spec | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/alpine.spec b/alpine.spec index 8155719..bcdc5e6 100644 --- a/alpine.spec +++ b/alpine.spec @@ -3,7 +3,7 @@ Summary: UW Alpine mail user agent Name: alpine Version: 1.00 -Release: 1%{?dist} +Release: 2%{?dist} License: Apache Software License Group: Applications/Internet @@ -60,7 +60,10 @@ touch imap/ip6 --without-tcl \ --with-c-client-target=lfd \ --with-passfile=.alpine.passfile \ - --with-spellcheck-prog=aspell + --with-spellcheck-prog=aspell \ + --with-system-pinerc=%{_sysconfdir}/pine.conf \ + --with-system-fixed-pinerc=%{_sysconfdir}/pine.conf.fixed + make %{?_smp_mflags} EXTRACFLAGS="$RPM_OPT_FLAGS" @@ -69,9 +72,9 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # create/touch %ghost'd files -mkdir -p $RPM_BUILD_ROOT/etc -touch $RPM_BUILD_ROOT/etc/pine.conf -touch $RPM_BUILD_ROOT/etc/pine.conf.fixed +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} +touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf +touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed %clean @@ -81,8 +84,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README LICENSE doc/tech-notes.txt -%ghost %config(noreplace) /etc/pine.conf -%ghost %config(noreplace) /etc/pine.conf.fixed +%ghost %config(noreplace) %{_sysconfdir}/pine.conf +%ghost %config(noreplace) %{_sysconfdir}/pine.conf.fixed %{_bindir}/alpine %{_bindir}/pico %{_bindir}/pilot @@ -96,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 22 2007 Rex Dieter 1.00-2 +- --with-system-pinerc=%%_sysconfdir/pine.conf + --with-system-fixed-pinerc=%%_sysconfdir/pine.conf.fixed (#426512) + * Fri Dec 21 2007 Rex Dieter 1.00-1 - alpine-1.00 From 263a59d69ed3efd91da923178b0bee1966cae45d Mon Sep 17 00:00:00 2001 From: Joshua Daniel Franklin Date: Mon, 24 Mar 2008 18:16:56 +0000 Subject: [PATCH 08/10] Update to alpine 1.10 --- .cvsignore | 2 +- alpine.spec | 43 ++++++++++++++++++++++++++++++++++++------- sources | 2 +- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 83980dd..23c640b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -alpine-1.00.tar.bz2 +alpine-1.10.tar.bz2 diff --git a/alpine.spec b/alpine.spec index bcdc5e6..206798c 100644 --- a/alpine.spec +++ b/alpine.spec @@ -2,17 +2,16 @@ Summary: UW Alpine mail user agent Name: alpine -Version: 1.00 -Release: 2%{?dist} +Version: 1.10 +Release: 4%{?dist} -License: Apache Software License +License: ASL 2.0 Group: Applications/Internet URL: http://www.washington.edu/alpine # FTP: ftp://ftp.cac.washington.edu/alpine/ # SVN: https://svn.cac.washington.edu/public/alpine/snapshots/ Source0: ftp://ftp.cac.washington.edu/alpine/alpine-%{version}.tar.bz2 -Requires: /usr/sbin/sendmail aspell mailcap # Using "Conflicts" instead of Obsoletes because while alpine is substantially # compatible with pine the change to Unicode breaks important user # functionality such as non-ASCII encoded saved passwords. Additionally, there @@ -27,9 +26,21 @@ Requires: /usr/sbin/sendmail aspell mailcap Conflicts: pine BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: /usr/sbin/sendmail aspell -BuildRequires: gettext inews krb5-devel ncurses-devel -BuildRequires: openldap-devel openssl-devel pam-devel passwd sendmail +BuildRequires: aspell +BuildRequires: gettext +BuildRequires: inews +BuildRequires: krb5-devel +BuildRequires: ncurses-devel +BuildRequires: openldap-devel +BuildRequires: openssl-devel +BuildRequires: pam-devel +BuildRequires: passwd +BuildRequires: sendmail /usr/sbin/sendmail + +Requires: aspell +Requires: mailcap +Requires: /usr/sbin/sendmail + %description Alpine -- an Alternatively Licensed Program for Internet @@ -57,6 +68,7 @@ GNU Build System's autotools. touch imap/ip6 # --without-tcl disables the TCL-based CGI "Web Alpine" %configure \ + --enable-debug=no \ --without-tcl \ --with-c-client-target=lfd \ --with-passfile=.alpine.passfile \ @@ -99,6 +111,23 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 24 2008 Joshua Daniel Franklin 1.10-4 +- No changes; Bump for tag system + +* Mon Mar 24 2008 Joshua Daniel Franklin 1.10-3 +- No changes; Bump for tag system + +* Mon Mar 24 2008 Joshua Daniel Franklin 1.10-2 +- Change License string to "ASL 2.0" instead of "Apache Software License" +- Disable debug files with "--enable-debug=no" (BZ #427013) + +* Mon Mar 24 2008 Rex Dieter - 1.10-1 +- alpine-1.10 +- cosmetic (Build)Req cleanup + +* Tue Feb 19 2008 Fedora Release Engineering - 1.00-3 +- Autorebuild for GCC 4.3 + * Fri Dec 22 2007 Rex Dieter 1.00-2 - --with-system-pinerc=%%_sysconfdir/pine.conf --with-system-fixed-pinerc=%%_sysconfdir/pine.conf.fixed (#426512) diff --git a/sources b/sources index 390ffbe..c895ed8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5dad25d8f848cad0e3077edd3038c43 alpine-1.00.tar.bz2 +c507684620766ed091186785a0dccbca alpine-1.10.tar.bz2 From 1452d76027bf9a8fa4d85ee318525ad9aa17d879 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:39 +0000 Subject: [PATCH 09/10] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 19cd451..865abce 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := alpine SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 62b86ac6504e212577ca971c9a6a79b08a23bf6d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:44:14 +0000 Subject: [PATCH 10/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 865abce..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alpine -# $Id$ -NAME := alpine -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7