SPECS: pine.spec - removed unused terminit patch, renumbered patch...

hawk hawk at pld-linux.org
Wed Jun 22 23:13:54 CEST 2005 

Author: hawk                         Date: Wed Jun 22 21:13:54 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed unused terminit patch, renumbered patches
- adjusted all.patch, unix, css and iconv patches for 4.63
- renamed L_on_version patch to N_on_version patch as requested in license
- added license allowing PLD to resdistribute binary pine and pico packages
  (it must be included in all binary and source packages)
- added bcond "distributable" to build package "distributable for PLD",
  its enabled by default
- few spaces -> tabs
- builds and seems to work but release 0.2, it needs testing + we are
  waiting for updated license file

---- Files affected:
SPECS:
   pine.spec (1.123 -> 1.124) 

---- Diffs:

================================================================
Index: SPECS/pine.spec
diff -u SPECS/pine.spec:1.123 SPECS/pine.spec:1.124
--- SPECS/pine.spec:1.123	Wed Jun 22 12:40:01 2005
+++ SPECS/pine.spec	Wed Jun 22 23:13:49 2005
@@ -1,8 +1,9 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without utf8		# build without utf-8 support
-%bcond_without home_etc		# build without home-etc support
+%bcond_without	distributable	# build distributable package with license included
+%bcond_without	utf8		# build without utf-8 support
+%bcond_without	home_etc	# build without home-etc support
 
 Summary:	MIME compliant mail reader w/ news support as well
 Summary(de):	MIME-konformer Mail-Reader mit News-Support
@@ -15,9 +16,13 @@
 Summary(uk):	óŐÍŚÓÎÉĘ Ú MIME ĐĎŢÔĎ×ÉĘ ŇĹÄÁËÔĎŇ Ú ĐŚÄÔŇÉÍËĎŔ ÔĹĚĹËĎÎĆĹŇĹÎĂŚĘ
 Name:		pine
 %define		realversion	4.63
-Version:	%{realversion}L
-Release:	0.1
-License:	not distributable
+Version:	%{realversion}N
+Release:	0.2
+%if %{with distributable}
+License:	Distributable for PLD
+%else
+License:	Not distributable
+%endif
 Group:		Applications/Mail
 Source0:	ftp://ftp.cac.washington.edu/pine/%{name}%{realversion}.tar.bz2
 # Source0-md5:	e881f439f38039b310d22554ab08feb4
@@ -26,6 +31,7 @@
 Source3:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source3-md5:	7bd233708a9621f3dfd173acb20ec0bb
 Source4:	pico.desktop
+Source5:	%{name}-PLD-LICENSE
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-doc.patch
 Patch2:		%{name}-makefile.patch
@@ -37,23 +43,22 @@
 Patch8:		%{name}-segfix.patch
 Patch9:		%{name}-libc-client.patch
 Patch10:	%{name}-fixhome.patch
-#Patch11:	%{name}-terminit.patch
-Patch12:	%{name}-ssl.patch
-Patch13:	%{name}-non_english_man_path_fix.patch
-Patch14:	%{name}-no_1777_warning.patch
-Patch15:	%{name}-L_on_version.patch
-Patch16:	%{name}-overflow.patch
+Patch11:	%{name}-ssl.patch
+Patch12:	%{name}-non_english_man_path_fix.patch
+Patch13:	%{name}-no_1777_warning.patch
+Patch14:	%{name}-N_on_version.patch
+Patch15:	%{name}-overflow.patch
 # http://www.math.washington.edu/~chappa/pine/
-Patch17:	http://www.math.washington.edu/~chappa/pine/patches/%{name}%{realversion}/all.patch.gz
+Patch16:	http://www.math.washington.edu/~chappa/pine/patches/%{name}%{realversion}/all.patch.gz
 # Original from: http://www.signet.pl/instrukcje/pine/pine-smime-211101-fixed.diff
-Patch18:	%{name}-smime.patch
-Patch19:	%{name}-css.patch
+Patch17:	%{name}-smime.patch
+Patch18:	%{name}-css.patch
 # from http://www.suse.de/~bk/pine/iconv/
-Patch20:	%{name}-iconv-9d.patch
-Patch21:	%{name}-home_etc.patch
-Patch22:	%{name}-pwd.patch
+Patch19:	%{name}-iconv-9d.patch
+Patch20:	%{name}-home_etc.patch
+Patch21:	%{name}-pwd.patch
 URL:		http://www.washington.edu/pine/
-# icov form glibc - utf-8 support
+# iconv form glibc - utf-8 support
 %{?with_utf8:BuildRequires:	glibc-devel >= 2.3.2}
 %{?with_home_etc:BuildRequires:	home-etc-devel >= 1.0.8}
 BuildRequires:	ncurses-devel >= 5.0
@@ -195,24 +200,26 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%{!?with_distributable:%patch5 -p1}
+%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-# breaks keys on some terminals
-##%patch11 -p1
+%patch11 -p1
 %patch12 -p1
-%patch13 -p1
+%{!?with_distributable:%patch13 -p1}
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1
 # breaks pine
-##%patch18 -p1
-%patch19 -p1
-%{?with_utf8:%patch20 -p1}
-%{?with_home_etc:%patch21 -p1}
-%patch22 -p1
+#%{!?with_distributable:%patch17 -p1}
+%patch18 -p1
+%if ! %{with distributable}
+%{?with_utf8:%patch19 -p1}
+%endif
+%{?with_home_etc:%patch20 -p1}
+%patch21 -p1
 
 %build
 ./build slx \
@@ -247,6 +254,7 @@
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+%{?with_distributable:cp %{SOURCE5} .}
 
 $RPM_BUILD_ROOT%{_bindir}/pine -conf > $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf
 cat <<EOF > $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed
@@ -268,6 +276,7 @@
 %files
 %defattr(644,root,root,755)
 %doc CPYRIGHT README doc/*.txt doc/mailcap.unx doc/tech-notes/*.html
+%{?with_distributable:%doc %{name}-PLD-LICENSE}
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pine.conf
 %attr(755,root,root) %{_bindir}/pine
 %{_desktopdir}/pine.desktop
@@ -281,6 +290,7 @@
 
 %files -n pico
 %defattr(644,root,root,755)
+%{?with_distributable:%doc %{name}-PLD-LICENSE}
 %attr(755,root,root) %{_bindir}/pico
 %{_desktopdir}/pico.desktop
 %{_mandir}/man1/pico*
@@ -291,6 +301,7 @@
 
 %files -n pilot
 %defattr(644,root,root,755)
+%{?with_distributable:%doc %{name}-PLD-LICENSE}
 %attr(755,root,root) %{_bindir}/pilot
 %{_mandir}/man1/pilot*
 %lang(es) %{_mandir}/es/man1/pilot*
@@ -301,6 +312,18 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.124  2005/06/22 21:13:49  hawk
+- removed unused terminit patch, renumbered patches
+- adjusted all.patch, unix, css and iconv patches for 4.63
+- renamed L_on_version patch to N_on_version patch as requested in license
+- added license allowing PLD to resdistribute binary pine and pico packages
+  (it must be included in all binary and source packages)
+- added bcond "distributable" to build package "distributable for PLD",
+  its enabled by default
+- few spaces -> tabs
+- builds and seems to work but release 0.2, it needs testing + we are
+  waiting for updated license file
+
 Revision 1.123  2005/06/22 10:40:01  hawk
 - started update to 4.63
 - release 0.1, NFY, please do not touch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pine.spec?r1=1.123&r2=1.124&f=u

More information about the pld-cvs-commit mailing list