SPECS: mawk.spec - converted BOOT macro to bootdisk bcond (anyone ...

Thu Sep 7 20:51:11 CEST 2006

Author: glen                         Date: Thu Sep  7 18:51:11 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- converted BOOT macro to bootdisk bcond (anyone still needs it?)

---- Files affected:
SPECS:
   mawk.spec (1.59 -> 1.60) 

---- Diffs:

================================================================
Index: SPECS/mawk.spec
diff -u SPECS/mawk.spec:1.59 SPECS/mawk.spec:1.60

--- SPECS/mawk.spec:1.59	Tue Sep  5 17:27:13 2006
+++ SPECS/mawk.spec	Thu Sep  7 20:51:06 2006
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
-# TODO
-# - BOOT macro to bcond
+# Conditional build:
+%bcond_with	bootdisk		# build bootdisk version (linked with glibc-static)
+#
 Summary:	An interpreter for the awk programming language
 Summary(de):	Mikes neuer Posix AWK-Interpretierer
 Summary(es):	Nuevo interpretador (Posix) AWK del Mike
@@ -25,7 +26,7 @@
 Patch4:		%{name}-LDFLAGS.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{?BOOT:BuildRequires:	glibc-static}
+%{?with_bootdisk:BuildRequires:	glibc-static}
 Provides:	/bin/awk
 Provides:	awk
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -113,7 +114,7 @@
 %{__aclocal}
 %{__autoconf}
 %configure
-%if %{?BOOT:1}%{!?BOOT:0}
+%if %{with bootdisk}
 %{__make} -j1 \
 	MATHLIB=/usr/%{_lib}/libm.a \
 	LDFLAGS="%{rpmldflags}"
@@ -140,7 +141,7 @@
 
 mv -f examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-%if %{?BOOT:1}%{!?BOOT:0}
+%if %{with bootdisk}
 install -d $RPM_BUILD_ROOT%{_libdir}/bootdisk/bin
 install mawk.BOOT $RPM_BUILD_ROOT%{_libdir}/bootdisk/bin/awk
 %endif
@@ -157,7 +158,7 @@
 %lang(pl) %{_mandir}/pl/man1/*
 %{_examplesdir}/%{name}-%{version}
 
-%if %{?BOOT:1}%{!?BOOT:0}
+%if %{with bootdisk}
 %files BOOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/bootdisk/bin/awk
@@ -169,6 +170,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2006/09/07 18:51:06  glen
+- converted BOOT macro to bootdisk bcond (anyone still needs it?)
+
 Revision 1.59  2006/09/05 15:27:13  sparky
 - make -j1, does not pass tests on SMP
 
@@ -200,7 +204,7 @@
 - cosmetics
 
 Revision 1.49  2003/07/10 12:47:13  qboosh
-- removed %%doc from examples - all files in %%{_examplesdir} are docs implicitly
+- removed %doc from examples - all files in %{_examplesdir} are docs implicitly
 
 Revision 1.48  2003/05/25 11:00:55  malekith
 - massive attack, adding Source-md5
@@ -233,14 +237,14 @@
 - Rel 25
 
 Revision 1.40  2002/05/24 12:12:21  trojan
-- new %%doc packing infrastructure
-- added %%doc to examples, fixed dir with examples
+- new %doc packing infrastructure
+- added %doc to examples, fixed dir with examples
 - release 24; STBR
 
 Revision 1.39  2002/05/21 23:14:07  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.38  2002/04/24 18:15:13  kloczek
 - relase 23: merge translations from KSI.
@@ -256,14 +260,14 @@
 - %desc
 
 Revision 1.34  2002/01/18 02:13:48  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.33  2001/11/12 00:16:20  kloczek
 - merged translations stolen from CNV.
 
 Revision 1.32  2001/11/11 13:14:19  qboosh
 - ac-workaround patch for new ac (m4 hanged eating 100% CPU)
-- finished adding pl man page (fixed %%files)
+- finished adding pl man page (fixed %files)
 - made BOOT conditional
 
 Revision 1.31  2001/11/08 21:51:44  ankry
@@ -280,26 +284,26 @@
 - fixed %install (make correctly directory for BOOT files).
 
 Revision 1.27  2001/04/02 16:58:23  malekith
-moved -BOOT from am/bin to bin
+- moved -BOOT from am/bin to bin
 
 Revision 1.26  2001/04/02 16:34:29  malekith
-rel 19 with -BOOT, stbr.
+- rel 19 with -BOOT, stbr.
 
 Revision 1.25  2001/04/02 16:27:47  malekith
-added BOOT version instead of bcond smath.
+- added BOOT version instead of bcond smath.
 
 Revision 1.24  2001/01/19 21:50:19  kloczek
 - release 18.
 
 Revision 1.23  2001/01/12 09:51:27  agaran
-Typo,fixed
+- Typo,fixed
 
 Revision 1.22  2001/01/12 09:40:30  agaran
-Added bcond for statical linking libm (it is smaller than mawk+libm dynamic)
-ex for bootdisks.. ;-)
+- Added bcond for statical linking libm (it is smaller than mawk+libm dynamic)
+  ex for bootdisks.. ;-)
 
 Revision 1.21  2000/12/11 23:34:07  kloczek
-- release 17: added using %%{_examplesdir} macro.
+- release 17: added using %{_examplesdir} macro.
 
 Revision 1.20  2000/11/12 20:11:55  kloczek
 - modyfications for using neew rpm automation.
@@ -311,10 +315,10 @@
 - release 16.
 
 Revision 1.17  2000/06/09 07:54:44  kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
 
 Revision 1.16  2000/06/09 07:23:25  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.15  2000/05/31 12:46:32  kloczek
 - spec adapterized.
@@ -352,7 +356,7 @@
 - added Provides: awk
 
 Revision 1.5  1999/11/07 17:45:57  kura
-[1.3.3-13]
+- [1.3.3-13]
 - added link to /bin/awk
 - added examples
 - new pl description
@@ -366,8 +370,3 @@
 
 Revision 1.3  1999/07/12 23:06:09  kloczek
 - added using CVS keywords in %changelog (for automating them).
-
-* Wed May 26 1999 Tomasz Kłoczko <kloczek at rudy.mif.pg.gda.pl>
-  [1.2.2-12]
-- based on RH spec,
-- spec rewrited in PLD coding style.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mawk.spec?r1=1.59&r2=1.60&f=u

