diff --git a/.gitignore b/.gitignore index 6220128..44582ab 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /jcomellas-getopt-v0.4.4-0-geb4a5be.tar.gz /jcomellas-getopt-v0.5.2-0-g266caf4.tar.gz /getopt-0.6.0.tar.gz +/jcomellas-getopt-v0.7.0-0-g346c766.tar.gz diff --git a/erlang-getopt-0001-No-such-type-boolean-in-R12B.patch b/erlang-getopt-0001-No-such-type-boolean-in-R12B.patch deleted file mode 100644 index dd56cd3..0000000 --- a/erlang-getopt-0001-No-such-type-boolean-in-R12B.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 9fcd941d5471955c51b1b725c541a3b52fd0094f Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Tue, 15 May 2012 22:42:30 +0400 -Subject: [PATCH 1/3] No such type - boolean() in R12B - -Signed-off-by: Peter Lemenkov ---- - src/getopt.erl | 19 +++++++++---------- - 1 file changed, 9 insertions(+), 10 deletions(-) - -diff --git a/src/getopt.erl b/src/getopt.erl -index 0e4f86a..fac5fb6 100644 ---- a/src/getopt.erl -+++ b/src/getopt.erl -@@ -30,7 +30,7 @@ - %% Atom indicating the data type that an argument can be converted to. - -type arg_type() :: 'atom' | 'binary' | 'boolean' | 'float' | 'integer' | 'string'. - %% Data type that an argument can be converted to. ---type arg_value() :: atom() | binary() | boolean() | float() | integer() | string(). -+-type arg_value() :: atom() | binary() | bool() | float() | integer() | string(). - %% Argument specification. - -type arg_spec() :: arg_type() | {arg_type(), arg_value()} | undefined. - %% Option type and optional default argument. -@@ -392,15 +392,14 @@ to_type(_Type, Arg) -> - Arg. - - ---spec is_arg_true(string()) -> boolean(). -+-spec is_arg_true(string()) -> bool(). - is_arg_true(Arg) -> - (Arg =:= "true") orelse (Arg =:= "t") orelse - (Arg =:= "yes") orelse (Arg =:= "y") orelse - (Arg =:= "on") orelse (Arg =:= "enabled") orelse - (Arg =:= "1"). - -- ---spec is_arg_false(string()) -> boolean(). -+-spec is_arg_false(string()) -> bool(). - is_arg_false(Arg) -> - (Arg =:= "false") orelse (Arg =:= "f") orelse - (Arg =:= "no") orelse (Arg =:= "n") orelse -@@ -408,7 +407,7 @@ is_arg_false(Arg) -> - (Arg =:= "0"). - - ---spec is_valid_arg(arg_spec(), nonempty_string()) -> boolean(). -+-spec is_valid_arg(arg_spec(), nonempty_string()) -> bool(). - is_valid_arg({Type, _DefaultArg}, Arg) -> - is_valid_arg(Type, Arg); - is_valid_arg(boolean, Arg) -> -@@ -421,7 +420,7 @@ is_valid_arg(_Type, _Arg) -> - true. - - ---spec is_implicit_arg(arg_spec(), nonempty_string()) -> boolean(). -+-spec is_implicit_arg(arg_spec(), nonempty_string()) -> bool(). - is_implicit_arg({Type, _DefaultArg}, Arg) -> - is_implicit_arg(Type, Arg); - is_implicit_arg(boolean, Arg) -> -@@ -432,20 +431,20 @@ is_implicit_arg(_Type, _Arg) -> - false. - - ---spec is_boolean_arg(string()) -> boolean(). -+-spec is_boolean_arg(string()) -> bool(). - is_boolean_arg(Arg) -> - LowerArg = string:to_lower(Arg), - is_arg_true(LowerArg) orelse is_arg_false(LowerArg). - - ---spec is_integer_arg(string()) -> boolean(). -+-spec is_integer_arg(string()) -> bool(). - is_integer_arg("-" ++ Tail) -> - is_non_neg_integer_arg(Tail); - is_integer_arg(Arg) -> - is_non_neg_integer_arg(Arg). - - ---spec is_non_neg_integer_arg(string()) -> boolean(). -+-spec is_non_neg_integer_arg(string()) -> bool(). - is_non_neg_integer_arg([Head | Tail]) when Head >= $0, Head =< $9 -> - is_non_neg_integer_arg(Tail); - is_non_neg_integer_arg([_Head | _Tail]) -> -@@ -454,7 +453,7 @@ is_non_neg_integer_arg([]) -> - true. - - ---spec is_non_neg_float_arg(string()) -> boolean(). -+-spec is_non_neg_float_arg(string()) -> bool(). - is_non_neg_float_arg([Head | Tail]) when (Head >= $0 andalso Head =< $9) orelse Head =:= $. -> - is_non_neg_float_arg(Tail); - is_non_neg_float_arg([_Head | _Tail]) -> --- -1.8.0.1 - diff --git a/erlang-getopt-0002-No-such-function-lists-keyfind-3-in-R12B5.patch b/erlang-getopt-0002-No-such-function-lists-keyfind-3-in-R12B5.patch deleted file mode 100644 index 5d3865c..0000000 --- a/erlang-getopt-0002-No-such-function-lists-keyfind-3-in-R12B5.patch +++ /dev/null @@ -1,60 +0,0 @@ -From f711f7fe1e88c867ad695610dd300fc966996b14 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Fri, 1 Jun 2012 10:26:25 +0400 -Subject: [PATCH 2/3] No such function lists:keyfind/3 in R12B5 - -Instead of using this function we must use lists:keysearch/3. - -Signed-off-by: Peter Lemenkov ---- - src/getopt.erl | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/getopt.erl b/src/getopt.erl -index fac5fb6..1fcca79 100644 ---- a/src/getopt.erl -+++ b/src/getopt.erl -@@ -116,11 +116,11 @@ parse_long_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, OptArg) -> - parse_long_option_assigned_arg(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, Long, Arg); - - Long -> -- case lists:keyfind(Long, ?OPT_LONG, OptSpecList) of -- {Name, _Short, Long, undefined, _Help} -> -+ case lists:keysearch(Long, ?OPT_LONG, OptSpecList) of -+ {value, {Name, _Short, Long, undefined, _Help}}-> - parse(OptSpecList, [Name | OptAcc], ArgAcc, ArgPos, Args); - -- {_Name, _Short, Long, _ArgSpec, _Help} = OptSpec -> -+ {value, {_Name, _Short, Long, _ArgSpec, _Help} = OptSpec} -> - %% The option argument string is empty, but the option requires - %% an argument, so we look into the next string in the list. - %% e.g ["--port", "1000"] -@@ -138,8 +138,8 @@ parse_long_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, OptArg) -> - [string()], string(), string(), string()) -> - {ok, {[option()], [string()]}}. - parse_long_option_assigned_arg(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, Long, Arg) -> -- case lists:keyfind(Long, ?OPT_LONG, OptSpecList) of -- {_Name, _Short, Long, ArgSpec, _Help} = OptSpec -> -+ case lists:keysearch(Long, ?OPT_LONG, OptSpecList) of -+ {value, {_Name, _Short, Long, ArgSpec, _Help} = OptSpec} -> - case ArgSpec of - undefined -> - throw({error, {invalid_option_arg, OptStr}}); -@@ -199,11 +199,11 @@ parse_short_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, OptArg) -> - parse_short_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, first, OptArg). - - parse_short_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, OptPos, [Short | Arg]) -> -- case lists:keyfind(Short, ?OPT_SHORT, OptSpecList) of -- {Name, Short, _Long, undefined, _Help} -> -+ case lists:keysearch(Short, ?OPT_SHORT, OptSpecList) of -+ {value, {Name, Short, _Long, undefined, _Help}} -> - parse_short_option(OptSpecList, [Name | OptAcc], ArgAcc, ArgPos, Args, OptStr, first, Arg); - -- {_Name, Short, _Long, ArgSpec, _Help} = OptSpec -> -+ {value, {_Name, Short, _Long, ArgSpec, _Help} = OptSpec} -> - %% The option has a specification, so it requires an argument. - case Arg of - [] -> --- -1.8.0.1 - diff --git a/erlang-getopt-0003-No-erlang-max-A-B-in-R12B-5-and-below.patch b/erlang-getopt-0003-No-erlang-max-A-B-in-R12B-5-and-below.patch deleted file mode 100644 index ee2e801..0000000 --- a/erlang-getopt-0003-No-erlang-max-A-B-in-R12B-5-and-below.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cf31e80aab268785f876aee774fca1550570c46e Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Fri, 21 Dec 2012 16:34:28 +0400 -Subject: [PATCH 3/3] No erlang:max(A,B) in R12B-5 and below - -Signed-off-by: Peter Lemenkov ---- - src/getopt.erl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/getopt.erl b/src/getopt.erl -index 1fcca79..b7e353c 100644 ---- a/src/getopt.erl -+++ b/src/getopt.erl -@@ -637,7 +637,7 @@ usage_help_text({_Name, _Short, _Long, _ArgSpec, Help}) -> - {MaxOptionLength :: non_neg_integer(), usage_line_with_length()}. - get_max_option_length({OptionText, HelpText}, PrevMaxOptionLength) -> - OptionLength = length(OptionText), -- {erlang:max(OptionLength, PrevMaxOptionLength), {OptionLength, OptionText, HelpText}}. -+ {case (OptionLength > PrevMaxOptionLength) of true -> OptionLength; _ -> PrevMaxOptionLength end, {OptionLength, OptionText, HelpText}}. - - - %% @doc Format the usage line that is shown for the options' usage. Each usage --- -1.8.0.1 - diff --git a/erlang-getopt.spec b/erlang-getopt.spec index 867bc55..938ad59 100644 --- a/erlang-getopt.spec +++ b/erlang-getopt.spec @@ -1,23 +1,22 @@ %global realname getopt +%global upstream jcomellas %global debug_package %{nil} +%global git_tag 346c766 +%global patchnumber 0 Name: erlang-%{realname} -Version: 0.6.0 -Release: 2%{?dist} +Version: 0.7.0 +Release: 1%{?dist} Summary: Erlang module to parse command line arguments using the GNU getopt syntax Group: Development/Libraries License: BSD URL: http://github.com/jcomellas/getopt -# wget --content-disposition https://github.com/jcomellas/getopt/archive/v0.6.0.tar.gz -Source0: %{realname}-%{version}.tar.gz -Patch1: erlang-getopt-0001-No-such-type-boolean-in-R12B.patch -Patch2: erlang-getopt-0002-No-such-function-lists-keyfind-3-in-R12B5.patch -Patch3: erlang-getopt-0003-No-erlang-max-A-B-in-R12B-5-and-below.patch -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +# wget --content-disposition https://github.com/jcomellas/getopt/tarball/v0.7.0 +Source0: %{upstream}-%{realname}-v%{version}-%{patchnumber}-g%{git_tag}.tar.gz BuildRequires: erlang-rebar -Requires: erlang-erts%{?_isa} >= R12B -Requires: erlang-stdlib%{?_isa} >= R12B +Requires: erlang-erts%{?_isa} >= R13B +Requires: erlang-stdlib%{?_isa} >= R13B %description @@ -25,12 +24,7 @@ Command-line parsing module that uses a syntax similar to that of GNU getopt. %prep -%setup -q -n %{realname}-%{version} -%if 0%{?el5} -%patch1 -p1 -b .unknown_type_boolean -%patch2 -p1 -b .no_keyfind -%patch3 -p1 -b .no_erlang_max -%endif +%setup -q -n %{upstream}-%{realname}-%{git_tag} chmod 0644 examples/*.escript @@ -45,15 +39,10 @@ rebar eunit -v %install -rm -rf %{buildroot} install -D -m 644 ebin/%{realname}.app %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.app install -D -m 644 ebin/%{realname}.beam %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.beam -%clean -rm -rf %{buildroot} - - %files %doc LICENSE.txt README.md examples/ %dir %{_libdir}/erlang/lib/%{realname}-%{version} @@ -63,6 +52,10 @@ rm -rf %{buildroot} %changelog +* Sat Mar 02 2013 Peter Lemenkov - 0.7.0-1 +- Ver. 0.7.0 +- Removed EL5-related stuff + * Wed Feb 13 2013 Fedora Release Engineering - 0.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 39519ad..bbb32b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -24afe433f46fc0f42f49692f5610fec4 getopt-0.6.0.tar.gz +f58819f4af5e828861d6d3d3e2500fb2 jcomellas-getopt-v0.7.0-0-g346c766.tar.gz