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:   02-Jan-2005 10:22:48
  Branch: HEAD                             Handle: 2005010209224800

  Modified files:
    openpkg-src/xalan-c     xalan-c.spec

  Log:
    cleanup packaging

  Summary:
    Revision    Changes     Path
    1.24        +22 -52     openpkg-src/xalan-c/xalan-c.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/xalan-c/xalan-c.spec
  ============================================================================
  $ cvs diff -u -r1.23 -r1.24 xalan-c.spec
  --- openpkg-src/xalan-c/xalan-c.spec  1 Jan 2005 10:55:56 -0000       1.23
  +++ openpkg-src/xalan-c/xalan-c.spec  2 Jan 2005 09:22:48 -0000       1.24
  @@ -40,7 +40,7 @@
   Group:        Web
   License:      Apache Software License 1.1
   Version:      %{V_opkg}
  -Release:      20041021
  +Release:      20050102
   
   #   package options
   %option       with_threads  no
  @@ -83,63 +83,33 @@
   
   %build
       rm -rf $RPM_BUILD_ROOT
  -    ( XALANCROOT=`pwd`/c ;
  -      XERCESCROOT=%{l_prefix} ;
  -      export XALANCROOT XERCESCROOT ;
  -      cd c/src ;
  +    ( XALANCROOT=`pwd`/c
  +      XERCESCROOT=%{l_prefix}
  +      export XALANCROOT XERCESCROOT
  +      cd c/src
         %{l_shtool} subst \
             -e 's;@l_ar@;ar cru;' \
             -e 's;@l_ranlib@;ranlib;' \
  -          Makefile.in ;
  -      pf=LINUX;
  -      cf="";
  -      lf="";
  +          Makefile.in
  +      pf=LINUX
  +      cf=""
  +      lf=""
   %if "%{with_threads}" == "yes"
         case "%{l_platform -t}" in
  -        *-freebsd*)     pf=LINUX
  -                        cf="-pthread"
  -                        lf=""
  -                        ;;
  -        *-linux*)       pf=LINUX
  -                        cf="-pthread"
  -                        lf=""
  -                        ;;
  -        *-hpux*)        pf=LINUX
  -                        cf="-pthread"
  -                        lf=""
  -                        ;;
  -        *-sunos*)       pf=LINUX
  -                        cf=""
  -                        lf="-lpthread -lsocket -lnsl"
  -                        ;;
  -        *-aix*)         pf=AIX;
  -                        cf="-pthread"
  -                        lf=""
  -                        ;;
  -      esac ;
  +          *-freebsd*) pf=LINUX; cf="-pthread"; lf="" ;;
  +          *-linux*)   pf=LINUX; cf="-pthread"; lf="" ;;
  +          *-hpux*)    pf=LINUX; cf="-pthread"; lf="" ;;
  +          *-sunos*)   pf=LINUX; cf=""; lf="-lpthread -lsocket -lnsl" ;;
  +          *-aix*)     pf=AIX;   cf="-pthread"; lf="" ;;
  +      esac
   %else
         case "%{l_platform -t}" in
  -        *-freebsd*)     pf=LINUX
  -                        cf=""
  -                        lf=""
  -                        ;;
  -        *-linux*)       pf=LINUX
  -                        cf=""
  -                        lf=""
  -                        ;;
  -        *-hpux*)        pf=LINUX
  -                        cf=""
  -                        lf=""
  -                        ;;
  -        *-sunos*)       pf=LINUX
  -                        cf=""
  -                        lf="-lsocket -lnsl"
  -                        ;;
  -        *-aix*)         pf=AIX;
  -                        cf=""
  -                        lf=""
  -                        ;;
  -      esac ;
  +          *-freebsd*) pf=LINUX; cf=""; lf="" ;;
  +          *-linux*)   pf=LINUX; cf=""; lf="" ;;
  +          *-hpux*)    pf=LINUX; cf=""; lf="" ;;
  +          *-sunos*)   pf=LINUX; cf=""; lf="-lsocket -lnsl" ;;
  +          *-aix*)     pf=AIX;   cf=""; lf="" ;;
  +      esac
   %endif
         CC="%{l_cc}" \
         CXX="%{l_cxx}" \
  @@ -147,7 +117,7 @@
         CXXFLAGS="%{l_cxxflags -O}" \
         LDFLAGS="%{l_ldflags} $lf" \
         ./configure \
  -        --prefix=%{l_prefix}
  +          --prefix=%{l_prefix}
         %{l_make} %{l_mflags -O} PLATFORM="$pf"
       ) || exit $?
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to