Procházet zdrojové kódy

add Lua regex support

Ralf S. Engelschall před 17 roky
rodič
revize
1a55ca6663
2 změnil soubory, kde provedl 48 přidání a 18 odebrání
  1. 23 6
      perl-regex/perl-regex.patch
  2. 25 12
      perl-regex/perl-regex.spec

+ 23 - 6
perl-regex/perl-regex.patch

@@ -1,15 +1,32 @@
 Index: Regexp-Keep-0.02/Keep.xs
 --- Regexp-Keep-0.02/Keep.xs.orig	2004-05-07 19:23:36 +0200
-+++ Regexp-Keep-0.02/Keep.xs	2008-02-13 19:30:29 +0100
++++ Regexp-Keep-0.02/Keep.xs	2008-08-01 19:58:19 +0200
 @@ -11,4 +11,4 @@
  KEEP()
      PROTOTYPE:
      CODE:
 -	PL_regstartp[0] = PL_reginput - PL_bostr;
 +	PL_reg_state.re_state_regoffs[0].start = PL_reginput - PL_bostr;
+Index: re-engine-Lua-0.05/Makefile.PL
+--- re-engine-Lua-0.05/Makefile.PL.orig	2008-08-01 19:58:20 +0200
++++ re-engine-Lua-0.05/Makefile.PL	2008-08-01 19:59:12 +0200
+@@ -12,12 +12,10 @@
+ # t/
+ build_requires 'Config'     => 0;
+ build_requires 'XSLoader'   => 0;
+-build_requires 'Test::More' => 0;
+-build_requires 'Test::Warn' => 0;
+-build_requires 'Test::Exception' => 0;
+ 
+ #tests 't/*.t t/*/*.t';
+ tests 't/*.t';
+ 
+ auto_install;
+ WriteAll;
++
 Index: re-engine-PCRE-0.15/Makefile.PL
 --- re-engine-PCRE-0.15/Makefile.PL.orig	2007-12-19 00:38:26 +0100
-+++ re-engine-PCRE-0.15/Makefile.PL	2008-02-13 19:30:29 +0100
++++ re-engine-PCRE-0.15/Makefile.PL	2008-08-01 19:58:19 +0200
 @@ -7,5 +7,6 @@
      VERSION_FROM  => 'PCRE.pm',
      ABSTRACT_FROM => 'PCRE.pm',
@@ -19,11 +36,11 @@ Index: re-engine-PCRE-0.15/Makefile.PL
 +    LIBS          => [ `pcre-config --libs` ],
  );
 Index: re-engine-TRE-0.04/Makefile.PL
---- re-engine-TRE-0.04/Makefile.PL.orig	2008-02-12 02:06:56 +0100
-+++ re-engine-TRE-0.04/Makefile.PL	2008-02-13 19:39:42 +0100
-@@ -9,6 +9,6 @@
+--- re-engine-TRE-0.04/Makefile.PL.orig	2008-02-18 12:11:31 +0100
++++ re-engine-TRE-0.04/Makefile.PL	2008-08-01 19:58:19 +0200
+@@ -8,6 +8,6 @@
+     ABSTRACT_FROM => 'TRE.pm',
      LICENSE       => 'perl',
-     LIBS          => [ '-lpcre' ],
      DIR           => [ 'tre' ],
 -    INC           => '-Itre',
 -    LDDLFLAGS     => '-shared tre/*.o',

+ 25 - 12
perl-regex/perl-regex.spec

@@ -27,6 +27,7 @@
 %define       V_re_engine_posix          0.05
 %define       V_re_engine_pcre           0.15
 %define       V_re_engine_tre            0.04
+%define       V_re_engine_lua            0.05
 %define       V_regexp_bind              0.05
 %define       V_regexp_common            2.122
 %define       V_regexp_copy              0.06
@@ -50,28 +51,30 @@ Class:        BASE
 Group:        Perl
 License:      GPL/Artistic
 Version:      %{V_perl}
-Release:      20080618
+Release:      20080801
 
 #   package options
 %option       with_posix  no
 %option       with_pcre   no
 %option       with_tre    no
+%option       with_lua    no
 
 #   list of sources
 Source0:      http://www.cpan.org/authors/id/A/AV/AVAR/re-engine-POSIX-%{V_re_engine_posix}.tar.gz
 Source1:      http://www.cpan.org/authors/id/A/AV/AVAR/re-engine-PCRE-%{V_re_engine_pcre}.tar.gz
 Source2:      http://www.cpan.org/authors/id/A/AV/AVAR/re-engine-TRE-%{V_re_engine_tre}.tar.gz
-Source3:      http://www.cpan.org/modules/by-module/Regexp/Regexp-Bind-%{V_regexp_bind}.tar.gz
-Source4:      http://www.cpan.org/modules/by-module/Regexp/Regexp-Common-%{V_regexp_common}.tar.gz
-Source5:      http://www.cpan.org/modules/by-module/Regexp/Regexp-Copy-%{V_regexp_copy}.tar.gz
-Source6:      http://www.cpan.org/modules/by-module/Regexp/Regexp-Extended-%{V_regexp_extended}.tar.gz
-Source7:      http://www.cpan.org/modules/by-module/Regexp/Regexp-Keep-%{V_regexp_keep}.tar.gz
-Source8:      http://www.cpan.org/modules/by-module/Regexp/Regexp-Parser-%{V_regexp_parser}.tar.gz
-Source9:      http://www.cpan.org/modules/by-module/Regexp/Regexp-Shellish-%{V_regexp_shellish}.tar.gz
-Source10:     http://www.cpan.org/modules/by-module/Regexp/Regexp-Assemble-%{V_regexp_assemble}.tar.gz
-Source11:     http://www.cpan.org/modules/by-module/Regexp/Regexp-Wildcards-%{V_regexp_wildcards}.tar.gz
-Source12:     http://www.cpan.org/modules/by-module/Regexp/Regexp-Compare-%{V_regexp_compare}.tar.gz
-Source13:     http://www.cpan.org/modules/by-module/Regexp/Regexp-English-%{V_regexp_english}.tar.gz
+Source3:      http://www.cpan.org/authors/id/P/PE/PERRAD/re-engine-Lua-%{V_re_engine_lua}.tar.gz
+Source4:      http://www.cpan.org/modules/by-module/Regexp/Regexp-Bind-%{V_regexp_bind}.tar.gz
+Source5:      http://www.cpan.org/modules/by-module/Regexp/Regexp-Common-%{V_regexp_common}.tar.gz
+Source6:      http://www.cpan.org/modules/by-module/Regexp/Regexp-Copy-%{V_regexp_copy}.tar.gz
+Source7:      http://www.cpan.org/modules/by-module/Regexp/Regexp-Extended-%{V_regexp_extended}.tar.gz
+Source8:      http://www.cpan.org/modules/by-module/Regexp/Regexp-Keep-%{V_regexp_keep}.tar.gz
+Source9:      http://www.cpan.org/modules/by-module/Regexp/Regexp-Parser-%{V_regexp_parser}.tar.gz
+Source10:     http://www.cpan.org/modules/by-module/Regexp/Regexp-Shellish-%{V_regexp_shellish}.tar.gz
+Source11:     http://www.cpan.org/modules/by-module/Regexp/Regexp-Assemble-%{V_regexp_assemble}.tar.gz
+Source12:     http://www.cpan.org/modules/by-module/Regexp/Regexp-Wildcards-%{V_regexp_wildcards}.tar.gz
+Source13:     http://www.cpan.org/modules/by-module/Regexp/Regexp-Compare-%{V_regexp_compare}.tar.gz
+Source14:     http://www.cpan.org/modules/by-module/Regexp/Regexp-English-%{V_regexp_english}.tar.gz
 Patch0:       perl-regex.patch
 
 #   build information
@@ -97,6 +100,7 @@ AutoReqProv:  no
     - re::engine::POSIX (%{V_re_engine_posix}) [with_posix=yes]
     - re::engine::PCRE (%{V_re_engine_pcre}) [with_pcre=yes]
     - re::engine::TRE (%{V_re_engine_tre}) [with_tre=yes]
+    - re::engine::Lua (%{V_re_engine_lua}) [with_lua=yes]
     - Regexp::Bind (%{V_regexp_bind})
     - Regexp::Common (%{V_regexp_common})
     - Regexp::Copy (%{V_regexp_copy})
@@ -125,6 +129,11 @@ AutoReqProv:  no
         url       = http://www.cpan.org/authors/id/A/AV/AVAR/
         regex     = re-engine-TRE-(__VER__)\.tar\.gz
     }
+    prog perl-regex:re-engine-Lua = {
+        version   = %{V_re_engine_lua}
+        url       = http://www.cpan.org/authors/id/P/PE/PERRAD/
+        regex     = re-engine-Lua-(__VER__)\.tar\.gz
+    }
     prog perl-regex:Regexp-Bind = {
         version   = %{V_regexp_bind}
         url       = http://www.cpan.org/modules/by-module/Regexp/
@@ -196,6 +205,7 @@ AutoReqProv:  no
     %setup -q -T -D -a 11
     %setup -q -T -D -a 12
     %setup -q -T -D -a 13
+    %setup -q -T -D -a 14
     %patch -p0
 
 %build
@@ -212,7 +222,9 @@ AutoReqProv:  no
 %if "%{with_tre}" == "yes"
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE2}  configure build install
 %endif
+%if "%{with_lua}" == "yes"
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE3}  configure build install
+%endif
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE4}  configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE5}  configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE6}  configure build install
@@ -223,6 +235,7 @@ AutoReqProv:  no
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE11} configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE12} configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE13} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE14} configure build install
     %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} `cat perl-openpkg-files`