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 openpkg-web openpkg$ Date:   18-Aug-2003 20:23:30
  Branch: HEAD                             Handle: 2003081819232802

  Added files:
    openpkg-re/vcheck       vc.kde-base
    openpkg-src/kde-base    kde-base.patch kde-base.spec
  Modified files:
    openpkg-web             news.txt

  Log:
    new package: kde-base 3.1.3 (K Desktop Environment (Base Components))

  Summary:
    Revision    Changes     Path
    1.1         +11 -0      openpkg-re/vcheck/vc.kde-base
    1.1         +103 -0     openpkg-src/kde-base/kde-base.patch
    1.1         +175 -0     openpkg-src/kde-base/kde-base.spec
    1.6220      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-re/vcheck/vc.kde-base
  ============================================================================
  $ cvs diff -u -r0 -r1.1 vc.kde-base
  --- /dev/null 2003-08-18 20:23:29.000000000 +0200
  +++ vc.kde-base       2003-08-18 20:23:29.000000000 +0200
  @@ -0,0 +1,11 @@
  +config = {
  +}
  +
  +prog kde-base = {
  +  version   = 3.1.3
  +  url       = ftp://ftp.kde.org/pub/kde/stable/
  +  regex     = (\d+\.\d+\.\d+)
  +  url       = ftp://ftp.kde.org/pub/kde/stable/__NEWVER__/src/
  +  regex     = kdebase-(__VER__)\.tar\.bz2
  +}
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/kde-base/kde-base.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1 kde-base.patch
  --- /dev/null 2003-08-18 20:23:30.000000000 +0200
  +++ kde-base.patch    2003-08-18 20:23:30.000000000 +0200
  @@ -0,0 +1,103 @@
  +--- 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 @@
  + 
  +     sprintf (buf, "Session %ld failed for display %.260s: %s",
  +          (long) sessionID, name, reason);
  +-    Debug ("send_failed(%\"s)\n", buf);
  ++    Debug ("send_failed(\"%s\")\n", buf);
  +     status.length = strlen (buf);
  +     status.data = (CARD8Ptr) buf;
  +     header.version = XDM_PROTOCOL_VERSION;
  +--- kioslave/fish/fish.cpp.orig
  ++++ kioslave/fish/fish.cpp  
  +@@ -302,5 +302,5 @@
  + void fishProtocol::openConnection() {
  + static int open_pty_pair(int fd[2])
  + {
  +-#if defined(HAVE_TERMIOS_H) && defined(HAVE_GRANTPT)
  ++#if defined(HAVE_TERMIOS_H) && defined(HAVE_GRANTPT) && !defined (HAVE_OPENPTY)
  + /** with kind regards to The GNU C Library
  + Reference Manual for Version 2.2.x of the GNU C Library */
  +--- kcontrol/konqhtml/nsconfigwidget.ui.orig 2003-05-07 13:44:03.000000000 +0200
  ++++ kcontrol/konqhtml/nsconfigwidget.ui      2003-08-18 15:23:17.000000000 +0200
  +@@ -2,6 +2,8 @@
  + <class>NSConfigWidget</class>
  + <author>Stefan Schimanski &lt;[EMAIL PROTECTED]&gt;</author>
  + <include location="global">klocale.h</include>
  ++<include location="global">kurlrequester.h</include>
  ++<include location="global">klistbox.h</include>
  + <widget>
  +     <class>QWidget</class>
  +     <property stdset="1">
  +--- kicker/applets/clock/conf.ui.orig        2002-08-13 10:05:16.000000000 +0200
  ++++ kicker/applets/clock/conf.ui     2003-08-18 15:24:39.000000000 +0200
  +@@ -1695,6 +1695,9 @@
  + </tabstops>
  + <includes>
  +     <include location="global" impldecl="in declaration">klocale.h</include>
  ++    <include location="global" impldecl="in declaration">kurlrequester.h</include>
  ++    <include location="global" impldecl="in declaration">klistview.h</include>
  ++    <include location="global" impldecl="in declaration">kcolorbutton.h</include>
  + </includes>
  + <layoutdefaults spacing="6" margin="11"/>
  + </UI>
  +--- kpersonalizer/keyecandypagedlg.ui.orig   2003-05-07 13:44:16.000000000 +0200
  ++++ kpersonalizer/keyecandypagedlg.ui        2003-08-18 15:25:27.000000000 +0200
  +@@ -1,5 +1,6 @@
  + <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
  + <class>KEyeCandyPageDlg</class>
  ++<include location="global">klistview.h</include>
  + <widget class="QWidget">
  +     <property name="name">
  +         <cstring>KEyeCandyPageDlg</cstring>
  +--- ksysguard/gui/KSGAppletSettingsWidget.ui.orig    2002-06-23 21:16:24.000000000 
+0200
  ++++ ksysguard/gui/KSGAppletSettingsWidget.ui 2003-08-18 15:26:29.000000000 +0200
  +@@ -1,6 +1,7 @@
  + <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
  + <class>KSGAppletSettingsWidget</class>
  + <author>Nadeem Hasan</author>
  ++<include location="global">knuminput.h</include>
  + <widget class="QWidget">
  +     <property name="name">
  +         <cstring>KSGAppletSettingsWidget</cstring>
  +--- kxkb/kcmmiscwidget.ui.orig       2003-05-07 13:44:18.000000000 +0200
  ++++ kxkb/kcmmiscwidget.ui    2003-08-18 15:27:07.000000000 +0200
  +@@ -1,5 +1,6 @@
  + <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
  + <class>KeyboardConfigWidget</class>
  ++<include location="global">knuminput.h</include>
  + <widget class="QWidget">
  +     <property name="name">
  +         <cstring>KeyboardConfigWidget</cstring>
  +--- konqueror/sidebar/trees/history_module/history_dlg.ui.orig       2003-05-07 
13:44:16.000000000 +0200
  ++++ konqueror/sidebar/trees/history_module/history_dlg.ui    2003-08-18 
15:27:37.000000000 +0200
  +@@ -1,5 +1,6 @@
  + <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
  + <class>KonqSidebarHistoryDlg</class>
  ++<include location="global">knuminput.h</include>
  + <widget class="QWidget">
  +     <property name="name">
  +         <cstring>KonqHistoryDlg</cstring>
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/kde-base/kde-base.spec
  ============================================================================
  $ cvs diff -u -r0 -r1.1 kde-base.spec
  --- /dev/null 2003-08-18 20:23:30.000000000 +0200
  +++ kde-base.spec     2003-08-18 20:23:30.000000000 +0200
  @@ -0,0 +1,175 @@
  +##
  +##  kde-base.spec -- OpenPKG RPM Specification
  +##  Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
  +##  Copyright (c) 2000-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
  +##  Copyright (c) 2000-2003 Cable & Wireless <http://www.cw.com/>
  +##
  +##  Permission to use, copy, modify, and distribute this software for
  +##  any purpose with or without fee is hereby granted, provided that
  +##  the above copyright notice and this permission notice appear in all
  +##  copies.
  +##
  +##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  +##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  +##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  +##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
  +##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  +##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  +##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  +##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  +##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  +##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  +##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  +##  SUCH DAMAGE.
  +##
  +
  +#   package version
  +%define       V_kde      3.1.3
  +%define       V_base     3.1.3
  +
  +#   package information
  +Name:         kde-base
  +Summary:      K Desktop Environment (Base Components)
  +URL:          http://www.kde.org/
  +Vendor:       KDE Project
  +Packager:     The OpenPKG Project
  +Distribution: OpenPKG [EVAL]
  +Group:        KDE
  +License:      GPL
  +Version:      %{V_base}
  +Release:      20030818
  +
  +#   list of sources
  +Source0:      
ftp://ftp.kde.org/pub/kde/stable/%{V_kde}/src/kdebase-%{V_base}.tar.bz2
  +Patch0:       kde-base.patch
  +
  +#   build information
  +Prefix:       %{l_prefix}
  +BuildRoot:    %{l_buildroot}
  +BuildPreReq:  OpenPKG, openpkg >= 20030103, gcc, make
  +PreReq:       OpenPKG, openpkg >= 20030103,
  +BuildPreReq:  X11, kde-qt, kde-arts, kde-libs, openssl, gettext
  +PreReq:       X11, kde-qt, kde-arts, kde-libs, openssl, gettext
  +AutoReq:      no
  +AutoReqProv:  no
  +
  +%description
  +    KDE is a powerful Open Source graphical desktop environment for Unix
  +    workstations. It combines ease of use, contemporary functionality,
  +    and outstanding graphical design with the technological superiority
  +    of the Unix operating system.
  +
  +    This part is the KDE Base Components.
  +
  +%prep
  +    %setup -q -n kdebase-%{V_base}
  +    %patch -p0
  +
  +    #   GCC 3.3 with -pedantic is too restrictive for most vendor system headers.
  +    %{l_shtool} subst \
  +        -e 's;-pedantic;;' \
  +        configure
  +
  +    #   adjust hard-coded paths
  +    %{l_shtool} subst \
  +        -e 's;kde3\(/plugins/designer\);kde\1;g' \
  +        configure
  +
  +    #   fix UIC check
  +    %{l_shtool} subst \
  +        -e 's;grep klineedit;grep -i klineedit;g' \
  +        configure
  +
  +    #   deactivate direct chown operations
  +    %{l_shtool} subst \
  +        -e 's;-m 4755 -o root;-m 4755;g' \
  +        configure
  +
  +    #   redirect back datadir based locations
  +    %{l_shtool} subst -s \
  +        -e 's;${prefix}/share/;${datadir};' \
  +        `find . -name Makefile.in -type f -print`
  +
  +%build
  +    #   set standard KDE/Qt build environment
  +    export CC="%{l_cc}"
  +    export CXX="%{l_cxx}"
  +    export CFLAGS="`%{l_prefix}/bin/pkg-config --cflags-only-other kde-qt` 
%{l_cflags -O}"
  +    export CXXFLAGS="`%{l_prefix}/bin/pkg-config --cflags-only-other kde-qt` 
%{l_cxxflags -O}"
  +    export CPPFLAGS="`%{l_prefix}/bin/pkg-config --cflags-only-I kde-qt` 
%{l_cppflags}"
  +    export LDFLAGS="`%{l_prefix}/bin/pkg-config --libs-only-L kde-qt` %{l_ldflags}"
  +    export LIBS="`%{l_prefix}/bin/pkg-config --libs-only-l --libs-only-other 
kde-qt`"
  +    export PATH="%{l_prefix}/libexec/kde:`%{l_prefix}/etc/rc --query 
x11_bindir`:$PATH"
  +    export LD_LIBRARY_PATH="%{l_prefix}/lib/kde:${LD_LIBRARY_PATH-/usr/lib}"
  +    export MOC="%{l_prefix}/libexec/kde/moc"
  +    export UIC_PATH="%{l_prefix}/libexec/kde/uic"
  +    export HOME="`pwd`"
  +
  +    #   set KDE/Qt installation paths
  +    export KDEDIR="%{l_prefix}"
  +    export kde_htmldir='\${prefix}/share/kde/doc/HTML'
  +    export kde_appsdir='\${prefix}/share/kde/applnk'
  +    export kde_icondir='\${prefix}/share/kde/icons'
  +    export kde_sounddir='\${prefix}/share/kde/sounds'
  +    export kde_datadir='\${prefix}/share/kde/apps'
  +    export kde_locale='\${prefix}/share/kde/locale'
  +    export kde_confdir='\${prefix}/share/kde/config'
  +    export kde_mimedir='\${prefix}/share/kde/mimelnk'
  +    export kde_toolbardir='\${prefix}/share/kde/toolbar'
  +    export kde_wallpaperdir='\${prefix}/share/kde/wallpapers'
  +    export kde_templatesdir='\${prefix}/share/kde/templates'
  +    export kde_servicesdir='\${prefix}/share/kde/services'
  +    export kde_servicetypesdir='\${prefix}/share/kde/servicetypes'
  +    export kde_bindir='\${exec_prefix}/libexec/kde'
  +    export kde_cgidir='\${exec_prefix}/lib/kde/cgi'
  +    export kde_moduledir='\${prefix}/lib/kde/modules'
  +    export kde_styledir='\${prefix}/lib/kde/plugins/styles'
  +    export kde_widgetdir='\${prefix}/lib/kde/plugins/designer'
  +
  +    #   configure package
  +    ./configure \
  +        --prefix=%{l_prefix} \
  +        --bindir=%{l_prefix}/libexec/kde \
  +        --includedir=%{l_prefix}/include/kde \
  +        --libdir=%{l_prefix}/lib/kde \
  +        --datadir=%{l_prefix}/share/kde \
  +        --localstatedir=%{l_prefix}/var/kde \
  +        --with-x \
  +        --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
  +        --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
  +        --with-qt-dir=%{l_prefix} \
  +        --with-qt-includes=%{l_prefix}/include/kde/qt \
  +        --with-qt-libraries=%{l_prefix}/lib/kde \
  +        --with-extra-includes=%{l_prefix}/include \
  +        --with-extra-libs=%{l_prefix}/lib \
  +        --with-ssl-dir=%{l_prefix} \
  +        --without-java \
  +        --without-motif \
  +        --disable-debug \
  +        --enable-rpath \
  +        --disable-static \
  +        --enable-shared
  +
  +    #   build package
  +    %{l_make} %{l_mflags -O}
  +
  +%install
  +    #   set minimal KDE/Qt run-time environment
  +    export PATH="%{l_prefix}/libexec/kde:`%{l_prefix}/etc/rc --query 
x11_bindir`:$PATH"
  +    export LD_LIBRARY_PATH="%{l_prefix}/lib/kde:${LD_LIBRARY_PATH-/usr/lib}"
  +
  +    #   install package
  +    rm -rf $RPM_BUILD_ROOT
  +    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
  +
  +    #   strip down installation
  +    strip $RPM_BUILD_ROOT%{l_prefix}/libexec/kde/* >/dev/null 2>&1 || true
  +
  +    #   determine installation files
  +    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
  +
  +%files -f files
  +
  +%clean
  +    rm -rf $RPM_BUILD_ROOT
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.6219 -r1.6220 news.txt
  --- openpkg-web/news.txt      18 Aug 2003 18:21:33 -0000      1.6219
  +++ openpkg-web/news.txt      18 Aug 2003 18:23:29 -0000      1.6220
  @@ -1,3 +1,4 @@
  +18-Aug-2003: New package: P<kde-base-3.1.3-20030818>
   18-Aug-2003: New package: P<kde-libs-3.1.3a-20030818>
   18-Aug-2003: New package: P<kde-arts-1.1.3-20030818>
   18-Aug-2003: New package: P<kde-qt-3.1.2-20030818>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to