From 4c2c416b1e23217d89614f69a1f1286a1ea2375c Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Mon, 30 Dec 2002 14:44:04 +0000 Subject: [PATCH] switch to %option(s) --- al/al.spec | 13 +++++-------- bison/bison.spec | 13 +++++-------- cvs/cvs.spec | 20 +++++++------------- emacs/emacs.spec | 27 +++++++++++++-------------- flex/flex.spec | 13 +++++-------- fsl/fsl.spec | 13 +++++-------- 6 files changed, 40 insertions(+), 59 deletions(-) diff --git a/al/al.spec b/al/al.spec index 0f9816ecb9..a23df22f17 100644 --- a/al/al.spec +++ b/al/al.spec @@ -23,9 +23,7 @@ ## # package options -%ifndef with_ex -%define with_ex no -%endif +%option with_ex no # package information Name: al @@ -37,7 +35,7 @@ Distribution: OpenPKG [PLUS] Group: System License: MIT/X11-style Version: 0.9.1 -Release: 20021216 +Release: 20021230 # list of sources Source0: ftp://ftp.ossp.org/pkg/lib/al/al-%{version}.tar.gz @@ -45,8 +43,8 @@ Source0: ftp://ftp.ossp.org/pkg/lib/al/al-%{version}.tar.gz # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020206 -PreReq: OpenPKG, openpkg >= 20020206 +BuildPreReq: OpenPKG, openpkg >= 20021230 +PreReq: OpenPKG, openpkg >= 20021230 %if "%{with_ex}" == "yes" BuildPreReq: ex PreReq: ex @@ -63,8 +61,7 @@ AutoReqProv: no has convenient chunk traversal methods and optional OSSP ex based exception handling. - Options: - --define 'with_ex %{with_ex}' + %options %prep %setup -q diff --git a/bison/bison.spec b/bison/bison.spec index d483df510a..e95b1a7c57 100644 --- a/bison/bison.spec +++ b/bison/bison.spec @@ -24,9 +24,7 @@ ## # package options -%ifndef with_beta -%define with_beta yes -%endif +%option with_beta yes # package versions %define V_release 1.35 @@ -42,7 +40,7 @@ Distribution: OpenPKG [CORE] Group: Language License: GPL Version: %{V_release} -Release: 20021015 +Release: 20021230 # list of sources Source0: ftp://ftp.gnu.org/gnu/bison/bison-%{V_release}.tar.gz @@ -52,8 +50,8 @@ Patch0: bison.patch # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020206, make, m4 -PreReq: OpenPKG, openpkg >= 20020206, m4 +BuildPreReq: OpenPKG, openpkg >= 20021230, make, m4 +PreReq: OpenPKG, openpkg >= 20021230, m4 AutoReq: no AutoReqProv: no @@ -67,8 +65,7 @@ AutoReqProv: no with no change. Anyone familiar with yacc should be able to use bison with little trouble. - Options: - --define 'with_beta %{with_beta}' + %options %prep %setup0 -q -c -n bison-%{V_release} diff --git a/cvs/cvs.spec b/cvs/cvs.spec index 76bfbabf4f..3fd0aeb213 100644 --- a/cvs/cvs.spec +++ b/cvs/cvs.spec @@ -28,12 +28,8 @@ %define V_cvslock 0.2 # optional support for applying the RSE patches -%ifndef with_rse_patches -%define with_rse_patches no -%endif -%ifndef with_rse_patch_cvsuser_caller -%define with_rse_patch_cvsuser_caller cvs -%endif +%option with_rse_patches no +%option with_rse_patch_cvsuser_caller cvs # package information Name: cvs @@ -45,7 +41,7 @@ Distribution: OpenPKG [BASE] Group: SCM License: GPL Version: %{V_cvs} -Release: 20021229 +Release: 20021230 # list of sources Source0: http://www.cvshome.org/files/19/10/cvs-%{V_cvs}.tar.gz @@ -58,8 +54,8 @@ Source5: rc.cvs # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020714, perl, patch -PreReq: OpenPKG, openpkg >= 20020714, perl, patch +BuildPreReq: OpenPKG, openpkg >= 20021230, perl, patch +PreReq: OpenPKG, openpkg >= 20021230, perl, patch AutoReq: no AutoReqProv: no @@ -81,16 +77,14 @@ AutoReqProv: no and cvslock (an administration tool for manually locking a CVS repository area). - Options: - --define 'with_rse_patches %{with_rse_patches}' - --define 'with_rse_patch_cvsuser_caller %{with_rse_patch_cvsuser_caller}' - %if "%{with_rse_patches}" == "yes" This version of CVS has the large set of patches applied from Ralf S. Engelschall (-DRSE_PATCHES). This means that (still undocumented) extra functionality is available. %endif + %options -p30 + %prep %setup0 -q -c %setup1 -q -T -D -a 1 diff --git a/emacs/emacs.spec b/emacs/emacs.spec index 921fc0156d..1e3274d05f 100644 --- a/emacs/emacs.spec +++ b/emacs/emacs.spec @@ -23,12 +23,15 @@ ## SUCH DAMAGE. ## -# the additionally used features -# (jpeg and png options depend on with_x11) -%ifndef with_x11 -%define with_x11 no -%define with_jpeg no -%define with_png no +# package options +%option with_x11 no +%option with_jpeg no +%option with_png no + +# package option dependencies +%if "%{with_jpeg}" == "yes" || "%{with_png}" == "yes" +%undefine with_x11 +%define with_x11 yes %endif # package information @@ -41,7 +44,7 @@ Distribution: OpenPKG [BASE] Group: Editor License: GPL Version: 21.2 -Release: 20020819 +Release: 20021230 # list of sources Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.gz @@ -49,8 +52,8 @@ Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.gz # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020206, make, texinfo -PreReq: OpenPKG, openpkg >= 20020206 +BuildPreReq: OpenPKG, openpkg >= 20021230, make, texinfo +PreReq: OpenPKG, openpkg >= 20021230 %if "%{with_x11}" == "yes" BuildPreReq: X11 PreReq: X11 @@ -67,11 +70,7 @@ AutoReqProv: no %description The popular GNU EMACS text editor. - Options: - --define 'with_fsl %{with_fsl}' - --define 'with_x11 %{with_x11}' - --define 'with_jpeg %{with_jpeg}' - --define 'with_png %{with_png}' + %options -p10 %prep %setup -q diff --git a/flex/flex.spec b/flex/flex.spec index a90fd6d06b..1d488e1b0e 100644 --- a/flex/flex.spec +++ b/flex/flex.spec @@ -24,9 +24,7 @@ ## # package options -%ifndef with_beta -%define with_beta yes -%endif +%option with_beta yes # package versions %define V_release 2.5.4a @@ -43,7 +41,7 @@ Distribution: OpenPKG [CORE] Group: Language License: BSD Version: %{V_release} -Release: 20021203 +Release: 20021230 # list of sources Source0: ftp://ftp.gnu.org/non-gnu/flex/flex-%{V_release}.tar.gz @@ -52,8 +50,8 @@ Source1: ftp://ftp.uncg.edu/people/wlestes/flex-%{V_beta}.tar.gz # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020206, bison, make -PreReq: OpenPKG, openpkg >= 20020206 +BuildPreReq: OpenPKG, openpkg >= 20021230, bison, make +PreReq: OpenPKG, openpkg >= 20021230 AutoReq: no AutoReqProv: no @@ -67,8 +65,7 @@ AutoReqProv: no is run, it analyzes its input for occurrences of the regular expressions. Whenever it finds one, it executes the corresponding C code. - Options: - --define 'with_beta %{with_beta}' + %options %prep %setup0 -q -c -n flex-%{version} diff --git a/fsl/fsl.spec b/fsl/fsl.spec index a29d578c17..7e1632a0b1 100644 --- a/fsl/fsl.spec +++ b/fsl/fsl.spec @@ -24,9 +24,7 @@ ## # package options -%ifndef with_fsl_debug -%define with_fsl_debug no -%endif +%option with_fsl_debug no # package information Name: fsl @@ -38,7 +36,7 @@ Distribution: OpenPKG [PLUS] Group: System License: MIT-style Version: 1.0.6 -Release: 20021109 +Release: 20021230 # list of sources Source0: ftp://ftp.ossp.org/pkg/lib/fsl/fsl-%{version}.tar.gz @@ -47,8 +45,8 @@ Source1: fsl.default # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20020206, gcc -PreReq: OpenPKG, openpkg >= 20020206 +BuildPreReq: OpenPKG, openpkg >= 20021230, gcc +PreReq: OpenPKG, openpkg >= 20021230 AutoReq: no AutoReqProv: no @@ -62,8 +60,7 @@ AutoReqProv: no third-party programs without the requirement to change the source code of the program. - Options: - --define 'with_fsl_debug %{with_fsl_debug}' + %options %prep %setup -q