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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   03-Dec-2002 14:01:39
  Branch: HEAD                             Handle: 2002120313013500

  Modified files:
    openpkg-src/opensp      opensp.spec

  Log:
    Fix and polish new package:
    - replace tabs with spaces
    - add dependency gcc (because of C++)
    - fix typos "opensd" -> "opensp"
    - use --datadir=%{l_prefix}/share/sgml
    - use --disable-shared
    - use DESTDIR
    - depend on "sgml" and use its mkcatalog
    - do not keep out-commented things

  Summary:
    Revision    Changes     Path
    1.2         +28 -24     openpkg-src/opensp/opensp.spec
  ____________________________________________________________________________

  Index: openpkg-src/opensp/opensp.spec
  ============================================================
  $ cvs diff -u -r1.1 -r1.2 opensp.spec
  --- openpkg-src/opensp/opensp.spec    3 Dec 2002 12:09:22 -0000       1.1
  +++ openpkg-src/opensp/opensp.spec    3 Dec 2002 13:01:35 -0000       1.2
  @@ -42,51 +42,55 @@
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
   BuildPreReq:  OpenPKG, openpkg >= 20021122, gcc
  -PreReq:       OpenPKG, openpkg >= 20021122
  +PreReq:       OpenPKG, openpkg >= 20021122, sgml
   AutoReq:      no
   AutoReqProv:  no
   
   %description
  -     This package is a collection of SGML/XML tools called OpenSP. It is a fork from
  -     James Clark's SP suite. These tools are used to parse, validate, and normalize
  -     SGML and XML files.
  +    This package is a collection of SGML/XML tools called OpenSP. It is a fork from
  +    James Clark's SP suite. These tools are used to parse, validate, and normalize
  +    SGML and XML files.
   
   %prep
       %setup -q -n OpenSP-%{version}
   
   %build
  -    echo "ac_cv_func_setlocale=${ac_cv_func_setlocale='no'}" >config.cache
       CC="%{l_cc}" \
  +    CXX="%{l_cxx}" \
       CFLAGS="%{l_cflags -O}" \
  +    CXXFLAGS="%{l_cflags -O}" \
  +    CPPFLAGS="%{l_cppflags}" \
       ./configure \
           --prefix=%{l_prefix} \
  -        --datadir=%{l_prefix}/share/sgml/opensd \
  +        --datadir=%{l_prefix}/share/sgml \
           --enable-default-catalog=%{l_prefix}/share/sgml/catalog \
  -        --enable-default-search-path=%{l_prefix}/share/sgml 
  +        --enable-default-search-path=%{l_prefix}/share/sgml \
  +        --disable-shared \
  +        --disable-nls
       %{l_make} %{l_mflags -O}
   
   %install
       rm -rf $RPM_BUILD_ROOT
  -    %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/bin \
  -        $RPM_BUILD_ROOT%{l_prefix}/lib/opensd \
  -        $RPM_BUILD_ROOT%{l_prefix}/include/opensd \
  -        $RPM_BUILD_ROOT%{l_prefix}/share/sgml/opensd
  -    %{l_make} %{l_mflags} install \
  -        prefix=$RPM_BUILD_ROOT%{l_prefix} \
  -        exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
  -        datadir=$RPM_BUILD_ROOT%{l_prefix}/share/sgml/opensd
  -#    %{l_shtool} install -c -m 644 \
  -#        dsssl/* $RPM_BUILD_ROOT%{l_prefix}/share/sgml/opensd/
  -#    echo 'CATALOG "openjade/catalog"' 
>$RPM_BUILD_ROOT%{l_prefix}/share/sgml/catalog
  -#    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
  -#        %{SOURCE mkcatalog} $RPM_BUILD_ROOT%{l_prefix}/bin/
  -#    rm -f $RPM_BUILD_ROOT%{l_prefix}/share/sgml/openjade/ChangeLog
  -#    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
  -    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
  +    %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
  +    rm -rf $RPM_BUILD_ROOT%{l_prefix}/doc
  +    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/sgml/doc
  +    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
  +    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
  +        %{l_files_std} \
  +        '%not %dir %{l_prefix}/share/sgml'
   
   %files -f files
   
   %clean
       rm -rf $RPM_BUILD_ROOT
  +
  +%post
  +    if [ $1 -eq 1 ]; then
  +        $RPM_INSTALL_PREFIX/bin/mkcatalog -q install OpenSP
  +    fi
  +
  +%preun
  +    if [ $1 -eq 0 ]; then
  +        $RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall OpenSP
  +    fi
   
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to