[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/apt/ apt.patch apt.spec
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2003-11-28 21:44:57
[Download RAW message or body]

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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  rse@openpkg.org
  Module: openpkg-src                      Date:   28-Nov-2003 22:44:57
  Branch: HEAD                             Handle: 2003112821445600

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

  Log:
    cleanup patch

  Summary:
    Revision    Changes     Path
    1.10        +11 -11     openpkg-src/apt/apt.patch
    1.8         +5  -6      openpkg-src/apt/apt.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/apt/apt.patch
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 apt.patch
  --- openpkg-src/apt/apt.patch	28 Nov 2003 20:16:56 -0000	1.9
  +++ openpkg-src/apt/apt.patch	28 Nov 2003 21:44:56 -0000	1.10
  @@ -31,7 +31,7 @@
       
       // State   
   -   Cnf.Set("Dir::State","var/lib/apt/");
  -+   Cnf.Set("Dir::State","var/@name@/lib/");
  ++   Cnf.Set("Dir::State","var/apt/lib/");
       
       /* Just in case something goes horribly wrong, we can fall back to the
          old /var/state paths.. */
  @@ -40,14 +40,14 @@
       
       // Cache
   -   Cnf.Set("Dir::Cache","var/cache/apt/");
  -+   Cnf.Set("Dir::Cache","var/@name@/cache/");
  ++   Cnf.Set("Dir::Cache","var/apt/cache/");
       Cnf.Set("Dir::Cache::archives","archives/");
       Cnf.Set("Dir::Cache::srcpkgcache","srcpkgcache.bin");
       Cnf.Set("Dir::Cache::pkgcache","pkgcache.bin");
       
       // Configuration
   -   Cnf.Set("Dir::Etc","etc/apt/");
  -+   Cnf.Set("Dir::Etc","etc/@name@/");
  ++   Cnf.Set("Dir::Etc","etc/apt/");
       Cnf.Set("Dir::Etc::sourcelist","sources.list");
       // CNC:2003-03-03
       Cnf.Set("Dir::Etc::sourceparts","sources.list.d");
  @@ -214,7 +214,7 @@
    bool rpmSystem::Initialize(Configuration &Cnf)
    {
   -   Cnf.CndSet("Dir::Bin::rpm","/bin/rpm");
  -+   Cnf.CndSet("Dir::Bin::rpm","@l_bindir@/rpm");
  ++   Cnf.CndSet("Dir::Bin::rpm","@l_prefix@/bin/rpm");
       Cnf.CndSet("Dir::Etc::rpmpriorities", "rpmpriorities");
       Cnf.CndSet("Dir::Etc::translatelist", "translate.list");
       Cnf.CndSet("Dir::Etc::translateparts", "translate.list.d");
  @@ -229,7 +229,7 @@
       if (FileExists(RPMDBHandler::DataPath(false)))
          Score += 10;
   -   if (FileExists(Cnf.FindFile("Dir::Bin::rpm","/bin/rpm")) == true)
  -+   if (FileExists(Cnf.FindFile("Dir::Bin::rpm","@l_bindir@/rpm")) == true)
  ++   if (FileExists(Cnf.FindFile("Dir::Bin::rpm","@l_prefix@/bin/rpm")) == true)
          Score += 10;
    
       return Score;
  @@ -264,16 +264,16 @@
    [
       AC_CHECK_LIB(rpmdb,rpmdbOpen,
   -     [RPMDBLIBS="-lrpmdb"],
  -+     [RPMDBLIBS="@rpmlibs@"],
  ++     [RPMDBLIBS="@l_rpmlibs_base@"],
         [RPMDBLIBS="-ldb-3.1"],
   -     [-lrpm -lrpmio -lz -lbz2 -lpopt])
  -+     [@rpmlibs@ @l_rpmlibs@])
  ++     [@l_rpmlibs_base@ @l_rpmlibs_extra@])
    
       AC_CHECK_LIB(rpm,rpmdbGetIteratorOffset,
         [AC_DEFINE_UNQUOTED(HAVE_RPM, 1)
          AC_DEFINE_UNQUOTED(HAVE_RPM4, 1)
   -      RPMLIBS="-lrpm $RPMDBLIBS -lrpmio -lz -lbz2 -lpopt"
  -+      RPMLIBS="@rpmlibs@ $RPMDBLIBS @l_rpmlibs@"
  ++      RPMLIBS="@l_rpmlibs_base@ $RPMDBLIBS @l_rpmlibs_extra@"
          AC_CHECK_LIB(rpm, rpmtsUpdateDSI,
         	      [AC_DEFINE_UNQUOTED(HAVE_RPM41, 1)
         	       rpm_version="4.1"],
  @@ -282,13 +282,13 @@
         [AC_CHECK_LIB(rpm,rpmdbFirstRecNum,
                  [AC_DEFINE_UNQUOTED(HAVE_RPM, 1) 
   -               RPMLIBS="-lrpm -ldb1 -lz -lbz2 -lpopt"
  -+               RPMLIBS="@rpmlibs@"
  ++               RPMLIBS="@l_rpmlibs_base@"
                   rpm_version="3"],,
   -	      [-ldb1 -lz -lbz2 -lpopt])
  -+	      [@rpmlibs@])
  ++	      [@l_rpmlibs_base@])
         ],
   -     [$RPMDBLIBS -lrpmio -lz -lbz2 -lpopt])
  -+     [$RPMDBLIBS @rpmlibs@ @l_rpmlibs@])
  ++     [$RPMDBLIBS @l_rpmlibs_base@ @l_rpmlibs_extra@])
    
       AC_SUBST(RPMLIBS)
    ])
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/apt/apt.spec
  ============================================================================
  $ cvs diff -u -r1.7 -r1.8 apt.spec
  --- openpkg-src/apt/apt.spec	28 Nov 2003 21:34:41 -0000	1.7
  +++ openpkg-src/apt/apt.spec	28 Nov 2003 21:44:56 -0000	1.8
  @@ -65,17 +65,16 @@
       %patch -p0 -P 0
   
       #   replace hard-coded paths with OpenPKG ones
  -    l_rpmlibs=""
  +    l_rpmlibs_base="`%{l_prefix}/bin/rpm-config --libs`"
  +    l_rpmlibs_extra=""
       case "%{l_platform -t}" in
  -        *sunos* ) l_rpmlibs="${l_rpmlibs} -lsocket" ;;
  +        *sunos* ) l_rpmlibs_extra="${l_rpmlibs_extra} -lsocket" ;;
       esac
       find . -type f ! -name "*.orig" -print | \
       xargs %{l_shtool} subst \
           %{l_value -s l_prefix} \
  -        -e 's;@l_bindir@;%{l_prefix}/bin;g' \
  -        -e 's;@name@;apt;g' \
  -        -e "s;@rpmlibs@;`%{l_prefix}/bin/rpm-config --libs`;g" \
  -        -e "s;@l_rpmlibs@;${l_rpmlibs};g"
  +        -e "s;@l_rpmlibs_base@;${l_rpmlibs_base};g" \
  +        -e "s;@l_rpmlibs_extra@;${l_rpmlibs_extra};g"
   
       #   regenerate GNU autoconf based files
       %{l_prefix}/bin/autoconf
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org
[prev in list] [next in list] [prev in thread] [next in thread]