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

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   07-Aug-2004 19:56:42
  Branch: HEAD                             Handle: 2004080718564200

  Modified files:
    openpkg-src/kde-base    kde-base.patch kde-base.spec

  Log:
    correct comments, remove outcommented patch logic, replace missing
    chmod(1) system(3) patch code, and correct Makefile.in datadir
    substitutions

  Summary:
    Revision    Changes     Path
    1.4         +27 -25     openpkg-src/kde-base/kde-base.patch
    1.11        +6  -6      openpkg-src/kde-base/kde-base.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/kde-base/kde-base.patch
  ============================================================================
  $ cvs diff -u -r1.3 -r1.4 kde-base.patch
  --- openpkg-src/kde-base/kde-base.patch       6 Aug 2004 09:34:43 -0000       1.3
  +++ openpkg-src/kde-base/kde-base.patch       7 Aug 2004 17:56:42 -0000       1.4
  @@ -1,28 +1,30 @@
  -#--- kdesktop/init.cc.orig   Fri Oct 12 15:11:13 2001
  -#+++ kdesktop/init.cc        Thu Jul 18 06:48:59 2002
  -#@@ -80,6 +80,9 @@
  -#      QFile::encodeName(locate("data", QString("kdesktop/") + fileName)).data(),
  -#      QFile::encodeName(dir).data() );
  -#     system( cmd );
  -#+    cmd.sprintf( "chmod 644 %s/.directory", 
  -#+            QFile::encodeName(dir).data() );
  -#+    system( cmd );
  -#   }
  -# }
  -# 
  -#@@ -106,6 +109,9 @@
  -#    cmd += "' '";
  -#    cmd += QFile::encodeName(desktopPath + desk.readName());
  -#    cmd += "'";
  -#+   system( cmd );
  -#+   cmd.sprintf("chmod 644 '%s'",
  -#+               QFile::encodeName(desktopPath + desk.readName()).data());
  -#    system( cmd );
  -#     }
  -# }
  ---- kdm/backend/xdmcp.c.orig Wed May  8 14:21:31 2002
  -+++ kdm/backend/xdmcp.c      Wed Jun 26 20:14:02 2002
  -@@ -1012,7 +1012,7 @@
  +Index: kdesktop/init.cc
  +diff -Nau kdesktop/init.cc.orig kdesktop/init.cc
  +--- kdesktop/init.cc.orig    2004-08-04 18:36:42 +0200
  ++++ kdesktop/init.cc 2004-08-04 18:36:48 +0200
  +@@ -81,6 +81,8 @@
  +     cmd += " ";
  +     cmd += KProcess::quote(dir+"/.directory");
  +     system( QFile::encodeName(cmd) );
  ++    cmd = "chmod 644 " + KProcess::quote(dir+"/.directory");
  ++    system( QFile::encodeName(cmd) );
  +   }
  + }
  + 
  +@@ -114,6 +116,8 @@
  +     cmd += " ";
  +     cmd += QFile::encodeName(KProcess::quote(desktopPath));
  +     system( cmd );
  ++    cmd = "chmod 644 " + QFile::encodeName(KProcess::quote(desktopPath));
  ++    system( cmd );
  +     }
  + }
  + 
  +Index: kdm/backend/xdmcp.c
  +diff -Nau kdm/backend/xdmcp.c.orig kdm/backend/xdmcp.c
  +--- kdm/backend/xdmcp.c.orig 2004-08-04 18:40:10 +0200
  ++++ kdm/backend/xdmcp.c      2004-08-04 18:40:16 +0200
  +@@ -995,7 +995,7 @@
    
        sprintf (buf, "Session %ld failed for display %.260s: %s",
             (long) sessionID, name, reason);
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/kde-base/kde-base.spec
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 kde-base.spec
  --- openpkg-src/kde-base/kde-base.spec        6 Aug 2004 09:34:43 -0000       1.10
  +++ openpkg-src/kde-base/kde-base.spec        7 Aug 2004 17:56:42 -0000       1.11
  @@ -38,7 +38,7 @@
   Group:        KDE
   License:      GPL
   Version:      %{V_base}
  -Release:      20040806
  +Release:      20040807
   
   #   list of sources
   Source0:      
ftp://ftp.kde.org/pub/kde/stable/%{V_kde}/src/kdebase-%{V_base}.tar.bz2
  @@ -80,7 +80,7 @@
           -e 's;-pedantic;;' \
           configure
   
  -    #   adjust hard-coded paths
  +    #   adjust hardcoded paths
       %{l_shtool} subst \
           -e 's;kde3\(/plugins/designer\);kde\1;g' \
           configure
  @@ -90,17 +90,17 @@
           -e 's;grep klineedit;grep -i klineedit;g' \
           configure
   
  -    #   deactivate direct chown operations
  +    #   deactivate unsafe chown root operations
       %{l_shtool} subst \
           -e 's;-m 4755 -o root;-m 4755;g' \
           configure
   
  -    #   redirect back datadir based locations
  +    #   redirect false datadir based locations
       %{l_shtool} subst -s \
  -        -e 's;${prefix}/share/;${datadir};' \
  +        -e 's;$(prefix)/share/;$(datadir);' \
           `find . -name Makefile.in -type f -print`
   
  -    #   make sure KDE does search for binaries inside OpenPKG first
  +    #   make sure KDE searches for binaries inside OpenPKG first
       %{l_shtool} subst -s \
           -e 's;\(kde_default_bindirs\)="[^"]*";\1="%{l_prefix}/libexec/kde 
%{l_prefix}/bin /bin /sbin /usr/bin /usr/sbin";' \
           configure
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to