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

  Server: cvs.openpkg.org                  Name:   Michael van Elst
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   28-Mar-2003 16:20:34
  Branch: HEAD                             Handle: 2003032815203201

  Modified files:
    openpkg-src/w3m         w3m.spec
    openpkg-web             news.txt

  Log:
    polishing, force search paths, fix help page and mailto: interface

  Summary:
    Revision    Changes     Path
    1.39        +27 -13     openpkg-src/w3m/w3m.spec
    1.3874      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/w3m/w3m.spec
  ============================================================================
  $ cvs diff -u -r1.38 -r1.39 w3m.spec
  --- openpkg-src/w3m/w3m.spec  6 Mar 2003 18:48:57 -0000       1.38
  +++ openpkg-src/w3m/w3m.spec  28 Mar 2003 15:20:33 -0000      1.39
  @@ -33,7 +33,7 @@
   Group:        Web
   License:      BSD
   Version:      0.4.1
  -Release:      20030306
  +Release:      20030328
   
   #   list of sources
   Source0:      http://osdn.dl.sourceforge.net/sourceforge/w3m/w3m-%{version}.tar.gz
  @@ -55,12 +55,14 @@
   
   %prep
       %setup -q
  +    %{l_shtool} subst \
  +        -e 's;for tlibdir in;& $prefix/lib;g' \
  +        -e 's;for inc in;& $prefix/include;g' \
  +        configure
   
   %build
       ( echo "# Configuration at `hostname`"
  -      echo "def_bindir='%{l_prefix}/bin'"
  -      echo "def_libdir='%{l_prefix}/libexec/w3m'"
  -      echo "def_helpdir='%{l_prefix}/share/w3m'"
  +      echo "use_help_cgi=n"
         echo "pref_lang=2"
         echo "lynx_key=n"
         echo "ftppass_hostnamegen=n"
  @@ -72,21 +74,31 @@
         echo "use_mouse=y"
         echo "use_cookie=y"
         echo "use_ssl=y"
  -      echo "dmodel=5"
         echo "customized=y"
  -      echo "use_ssl_verify=n"
  -      echo "dcc='%{l_cc}'"
  -      echo "dcflags='%{l_cflags -O} -I%{l_prefix}/include 
-I%{l_prefix}/include/openssl -I.'"
  -      echo "dldflags='-L%{l_prefix}/lib'"
  -      echo "dtermlib='-lncurses'"
  +      echo "use_ssl_verify=y"
  +      echo "use_digest_auth=y"
       ) >config.param
  -    echo "2" | ./configure -yes
  -    %{l_shtool} subst -e 's;-L ; ;' config.h
  +    CC="%{l_cc}" \
  +    CFLAGS="%{l_cflags -O}" \
  +    LDFLAGS="%{l_ldflags} -lncurses" \
  +    ./configure \
  +        -prefix="%{l_prefix}" \
  +        -libdir="%{l_prefix}/libexec/w3m" \
  +        -helpdir="%{l_prefix}/share/w3m" \
  +        -sysconfdir="%{l_prefix}/etc/w3m" \
  +        -model=monster \
  +        -lang=en \
  +        -yes \
  +        --ssl-includedir="%{l_prefix}/include" \
  +        --ssl-libdir="%{l_prefix}/lib" \
  +        --mimetypes="%{l_prefix}/etc/w3m/mime.types"
  +    %{l_shtool} subst -e 's;-L/usr/lib; ;g' config.h
       %{l_make} %{l_mflags}
   
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  +        $RPM_BUILD_ROOT%{l_prefix}/etc/w3m \
           $RPM_BUILD_ROOT%{l_prefix}/bin \
           $RPM_BUILD_ROOT%{l_prefix}/share/w3m \
           $RPM_BUILD_ROOT%{l_prefix}/libexec/w3m
  @@ -95,7 +107,9 @@
           w3mbookmark w3mhelperpanel \
           $RPM_BUILD_ROOT%{l_prefix}/libexec/w3m/
       %{l_shtool} install -c -m 755 \
  -        scripts/dirlist.cgi $RPM_BUILD_ROOT%{l_prefix}/libexec/w3m/
  +        scripts/dirlist.cgi \
  +        scripts/w3mmail.cgi \
  +        $RPM_BUILD_ROOT%{l_prefix}/libexec/w3m/
       %{l_shtool} install -c -m 644 w3mhelp-w3m_en.html \
           $RPM_BUILD_ROOT%{l_prefix}/share/w3m/w3mhelp.html
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.3873 -r1.3874 news.txt
  --- openpkg-web/news.txt      28 Mar 2003 15:00:31 -0000      1.3873
  +++ openpkg-web/news.txt      28 Mar 2003 15:20:32 -0000      1.3874
  @@ -1,3 +1,4 @@
  +28-Mar-2003: Upgraded package: P<w3m-0.4.1-20030328>
   28-Mar-2003: Upgraded package: P<openldap-2.1.16-20030328>
   28-Mar-2003: Upgraded package: P<uucp-1.06.1-20030328>
   28-Mar-2003: Upgraded package: P<vrrpd-0.8.6-20030328>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to