Просмотр исходного кода

upgrade to latest develper version and polish packaging

Ralf S. Engelschall 24 лет назад
Родитель
Сommit
914fa1984d
1 измененных файлов с 14 добавлено и 15 удалено
  1. 14 15
      flex/flex.spec

+ 14 - 15
flex/flex.spec

@@ -23,15 +23,18 @@
 ##  SUCH DAMAGE. 
 ##  
 
-%define       V_branch      release
+#   package options
+%ifndef       with_branch
+%define       with_branch   release
+%endif
 
+#   package versions
 %define       V_release     2.5.4a
 %define       V_release_maj 2.5.4
 %define       V_release_min a
-
-%define       V_devel       20011203
+%define       V_devel       2.5.6s20020228
 %define       V_devel_maj   2.5.6
-%define       V_devel_min   2001-12-03
+%define       V_devel_min   2002-02-28
 
 #   package information
 Name:         flex
@@ -42,15 +45,15 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [REL]
 Group:        Language
 License:      BSD
-%if "%{V_branch}" == "release"
+%if "%{with_branch}" == "release"
 Version:      %{V_release}
 %else
 Version:      %{V_devel}
 %endif
-Release:      20020206
+Release:      20020313
 
 #   list of sources
-%if "%{V_branch}" == "release"
+%if "%{with_branch}" == "release"
 Source0:      ftp://ftp.gnu.org/non-gnu/flex/flex-%{V_release}.tar.gz
 %else
 Source0:      http://astro.temple.edu/~john43/flex/flex-%{V_devel_maj}-developer-%{V_devel_min}.tar.gz
@@ -60,9 +63,6 @@ Source0:      http://astro.temple.edu/~john43/flex/flex-%{V_devel_maj}-developer
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20020206, bison, make
-%if "%{V_branch}" == "devel"
-BuildPreReq:  autoconf, automake
-%endif
 PreReq:       OpenPKG, openpkg >= 20020206
 AutoReq:      no
 AutoReqProv:  no
@@ -77,19 +77,18 @@ 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: with_branch=%{with_branch}
+
 %prep
-%if "%{V_branch}" == "release"
+%if "%{with_branch}" == "release"
     %setup -q -n flex-%{V_release_maj}
 %else
-    %setup -q -n flex
+    %setup -q -n flex-%{V_devel_maj}
 %endif
 
 %build
     PATH="%{l_prefix}/bin:%{l_prefix}/sbin:$PATH"
     export PATH
-%if "%{V_branch}" == "devel"
-    ./autogen.sh
-%endif
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
     ./configure \