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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   20-Mar-2008 20:40:27
  Branch: HEAD                             Handle: 2008032019402600

  Modified files:
    openpkg-src/asterisk    asterisk.patch asterisk.spec

  Log:
    the Perl AGI module is now packaged as perl-asterisk

  Summary:
    Revision    Changes     Path
    1.34        +0  -8      openpkg-src/asterisk/asterisk.patch
    1.58        +4  -26     openpkg-src/asterisk/asterisk.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/asterisk/asterisk.patch
  ============================================================================
  $ cvs diff -u -r1.33 -r1.34 asterisk.patch
  --- openpkg-src/asterisk/asterisk.patch       20 Mar 2008 19:21:16 -0000      
1.33
  +++ openpkg-src/asterisk/asterisk.patch       20 Mar 2008 19:40:26 -0000      
1.34
  @@ -61,14 +61,6 @@
    ifeq ($(OSARCH),NetBSD)
      ASTCFLAGS+=-pthread -I/usr/pkg/include
    endif
  -Index: asterisk-perl-0.10/Makefile.PL
  ---- asterisk-perl-0.10/Makefile.PL.orig      2003-06-13 07:52:12 +0200
  -+++ asterisk-perl-0.10/Makefile.PL   2008-03-18 22:06:58 +0100
  -@@ -14,3 +14,4 @@
  -                        },
  - );
  - 
  -+
   Index: channels/console_video.h
   --- channels/console_video.h.orig    2008-01-09 19:03:40 +0100
   +++ channels/console_video.h 2008-03-18 22:06:58 +0100
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/asterisk/asterisk.spec
  ============================================================================
  $ cvs diff -u -r1.57 -r1.58 asterisk.spec
  --- openpkg-src/asterisk/asterisk.spec        20 Mar 2008 19:25:05 -0000      
1.57
  +++ openpkg-src/asterisk/asterisk.spec        20 Mar 2008 19:40:26 -0000      
1.58
  @@ -27,7 +27,6 @@
   %define       V_asterisk_addons       1.6.0-beta2
   %define       V_asterisk_sounds_core  1.4.10
   %define       V_asterisk_sounds_extra 1.4.7
  -%define       V_asterisk_perl         0.10
   %define       V_chan_capi             1_6_1
   
   #   package information
  @@ -62,10 +61,9 @@
   Source1:      
http://downloads.digium.com/pub/asterisk/releases/asterisk-addons-%{V_asterisk_addons}.tar.gz
   Source2:      
http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-%{V_asterisk_sounds_core}.tar.gz
   Source3:      
http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-%{V_asterisk_sounds_extra}.tar.gz
  -Source4:      
http://asterisk.gnuinter.net/files/asterisk-perl-%{V_asterisk_perl}.tar.gz
  -Source5:      
http://www.turbocat.net/~hselasky/capi4pbx/releases/chan_capi_%{V_chan_capi}.tar.bz2
  -Source6:      asterisk.txt
  -Source7:      rc.asterisk
  +Source4:      
http://www.turbocat.net/~hselasky/capi4pbx/releases/chan_capi_%{V_chan_capi}.tar.bz2
  +Source5:      asterisk.txt
  +Source6:      rc.asterisk
   Patch0:       asterisk.patch
   
   #   build information
  @@ -75,8 +73,6 @@
   PreReq:       OpenPKG, openpkg >= 20040130
   BuildPreReq:  zlib, curl, openssl, ncurses, speex, popt
   PreReq:       zlib, curl, openssl, ncurses, speex, popt
  -BuildPreReq:  perl, perl-openpkg
  -PreReq:       perl
   %if "%{with_ogg}" == "yes"
   BuildPreReq:  vorbis-libs
   PreReq:       vorbis-libs
  @@ -156,11 +152,6 @@
           url       = 
http://downloads.digium.com/pub/telephony/sounds/releases/
           regex     = asterisk-extra-sounds-en-alaw-(\d+\.\d+(\.\d+)+)\.tar\.gz
       }
  -    prog asterisk:agi = {
  -        version   = %{V_asterisk_perl}
  -        url       = http://asterisk.gnuinter.net/files/
  -        regex     = asterisk-perl-(__VER__)\.tar\.gz
  -    }
       prog asterisk:chan_capi = {
           version   = %{V_chan_capi}
           url       = http://www.turbocat.net/~hselasky/capi4pbx/releases/
  @@ -171,7 +162,6 @@
       %setup -q -n asterisk-%{V_asterisk}
       %setup -q -n asterisk-%{V_asterisk} -D -T -a 1
       %setup -q -n asterisk-%{V_asterisk} -D -T -a 4
  -    %setup -q -n asterisk-%{V_asterisk} -D -T -a 5
       %patch -p0
       cp %{SOURCE2} %{SOURCE3} sounds/
       %{l_shtool} subst \
  @@ -374,10 +364,6 @@
       ) || exit $?
   %endif
   
  -    #   build Perl API
  -    %{l_prefix}/bin/perl-openpkg prepare
  -    %{l_prefix}/bin/perl-openpkg -d asterisk-perl-%{V_asterisk_perl} 
configure build
  -
   %install
       #   install program
       rm -rf $RPM_BUILD_ROOT
  @@ -399,14 +385,6 @@
       ) || exit $?
   %endif
   
  -    #   install Perl API
  -    %{l_prefix}/bin/perl-openpkg -d asterisk-perl-%{V_asterisk_perl} install
  -    %{l_shtool} install -c -m 644 %{l_value -s -a} \
  -        -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;' \
  -        asterisk-perl-%{V_asterisk_perl}/examples/* \
  -        $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/agi-bin/
  -    %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
  -
       #   strip down installation
       rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/autosupport >/dev/null 2>&1 || true
       rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/safe_asterisk >/dev/null 2>&1 || 
true
  @@ -452,7 +430,7 @@
   
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
  -        %{l_files_std} `cat perl-openpkg-files` \
  +        %{l_files_std} \
           '%config %attr(640,%{l_mgrp},%{l_rgrp}) %{l_prefix}/etc/asterisk/*' \
           '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/asterisk'
   
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to