OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  r...@openpkg.org
  Module: openpkg-src                      Date:   07-Aug-2009 20:03:36
  Branch: HEAD                             Handle: 2009080719033600

  Modified files:
    openpkg-src/openvpn     openvpn.spec

  Log:
    move openvpn21 package to openvpn

  Summary:
    Revision    Changes     Path
    1.70        +8  -10     openpkg-src/openvpn/openvpn.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openvpn/openvpn.spec
  ============================================================================
  $ cvs diff -u -r1.69 -r1.70 openvpn.spec
  --- openpkg-src/openvpn/openvpn.spec  1 Jul 2009 18:12:34 -0000       1.69
  +++ openpkg-src/openvpn/openvpn.spec  7 Aug 2009 18:03:36 -0000       1.70
  @@ -22,8 +22,8 @@
   ##
   
   #   package version
  -%define       V_dist 2.0.9
  -%define       V_opkg 2.0.9
  +%define       V_dist 2.1_rc19
  +%define       V_opkg 2.1rc19
   
   #   package information
   Name:         openvpn
  @@ -36,7 +36,7 @@
   Group:        Network
   License:      GPL
   Version:      %{V_opkg}
  -Release:      20090701
  +Release:      20090807
   
   #   package options
   %option       with_fsl  yes
  @@ -56,8 +56,8 @@
   BuildPreReq:  openssl, lzo >= 1.08
   PreReq:       openssl, lzo >= 1.08
   %if "%{with_fsl}" == "yes"
  -BuildPreReq:  fsl
  -PreReq:       fsl
  +BuildPreReq:  fsl >= 1.3.0
  +PreReq:       fsl >= 1.3.0
   %endif
   AutoReq:      no
   AutoReqProv:  no
  @@ -71,7 +71,7 @@
       prog openvpn = {
           version   = %{V_dist}
           url       = http://openvpn.net/index.php/open-source/downloads.html
  -        regex     = openvpn-(\d+\.\d+(\.\d+)*)\.tar\.gz
  +        regex     = openvpn-(2\.[12](?:\.\d+|_rc\d+))\.tar\.gz
       }
   
   %prep
  @@ -87,6 +87,7 @@
       LIBS="%{l_fsl_libs}" \
       ./configure \
           --prefix=%{l_prefix} \
  +        --mandir=%{l_prefix}/man \
           --with-ssl-headers=%{l_prefix}/include/openssl \
           --with-ssl-lib=%{l_prefix}/lib \
           --with-lzo-headers=%{l_prefix}/include/lzo \
  @@ -102,15 +103,12 @@
   
       #   strip down installation files
       strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
  +    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc >/dev/null 2>&1 || true
   
       #   install additional files
       %{l_shtool} install -c -m 755 %{l_value -s -a} \
           -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;' \
           sample-scripts/verify-cn 
$RPM_BUILD_ROOT%{l_prefix}/sbin/openvpn-verify-cn
  -    %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/man/cat8
  -    %{l_shtool} install -c -m 644 \
  -        management/management-notes.txt 
$RPM_BUILD_ROOT%{l_prefix}/man/cat8/openvpn-management.8
   
       #   install run-command script
       %{l_shtool} mkdir -f -p -m 755 \
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to