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

add optional support for my large set of RSE patches

Ralf S. Engelschall 24 лет назад
Родитель
Сommit
a954092aa3
2 измененных файлов с 5062 добавлено и 1 удалено
  1. 5042 0
      cvs/cvs.patches.rse
  2. 20 1
      cvs/cvs.spec

Разница между файлами не показана из-за своего большого размера
+ 5042 - 0
cvs/cvs.patches.rse


+ 20 - 1
cvs/cvs.spec

@@ -23,10 +23,16 @@
 ##  SUCH DAMAGE. 
 ##  
 
+#   the involved versions
 %define       V_cvs       1.11.1p1
 %define       V_cvslock   0.2
 %define       V_cvs2cl    2.38
 
+#   optional support for applying the RSE patches
+%if "%{?rse_patches:set}" != "set"
+%define       rse_patches no
+%endif
+
 #   package information
 Name:         cvs
 Summary:      Concurrent Versions Systems (CVS)
@@ -37,12 +43,13 @@ Distribution: OpenPKG [REL]
 Group:        CVS
 License:      GPL
 Version:      %{V_cvs}
-Release:      20020206
+Release:      20020216
 
 #   list of sources
 Source0:      http://www.cvshome.org/files/19/10/cvs-%{V_cvs}.tar.gz
 Source1:      ftp://riemann.iam.uni-bonn.de/pub/users/roessler/cvslock/cvslock-%{V_cvslock}.tar.gz
 Source2:      http://www.red-bean.com/cvs2cl/cvs2cl.pl
+Source3:      cvs.patches.rse
 
 #   build information
 Prefix:       %{l_prefix}
@@ -69,15 +76,27 @@ AutoReqProv:  no
     (a tool for assembling a GNU ChangeLog file from "cvs log" output)
     and cvslock (an administration tool for manually locking a CVS
     repository area).
+%if "%{rse_patches}" == "yes"
+    This version of CVS has the large set of patches applied from
+    Ralf S. Engelschall <rse@engelschall.com> (-DRSE_PATCHES). This
+    means that (still undocumented) extra functionality is available.
+%endif
 
 %prep
     %setup0 -q -c
     %setup1 -q -T -D -a 1
+%if "%{rse_patches}" == "yes"
+    ( cd cvs-%{V_cvs} && %{l_prefix}/bin/patch -p0 <%{SOURCE cvs.patches.rse} )
+%endif
 
 %build
     ( cd cvs-%{V_cvs}
       CC="%{l_cc}" \
+%if "%{rse_patches}" == "yes"
+      CFLAGS="%{l_cflags -O} -DRSE_PATCHES" \
+%else
       CFLAGS="%{l_cflags -O}" \
+%endif
       ./configure \
           --prefix=%{l_prefix} \
           --with-patch=%{l_prefix}/bin/patch \