rpms/kdebase/F-7 kde-legacy.pamd, NONE, 1.1 kde-np-legacy.pamd, NONE, 1.1 kde-np.pamd, NONE, 1.1 kde.pamd, NONE, 1.1 kdebase-3.5.7-kde#83974.patch, NONE, 1.1 post-3.5.7-kdebase-konqueror.diff, NONE, 1.1 kdebase.spec, 1.258, 1.259 kde-np, 1.4, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Fri Aug 17 15:03:08 UTC 2007


Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14785

Modified Files:
	kdebase.spec 
Added Files:
	kde-legacy.pamd kde-np-legacy.pamd kde-np.pamd kde.pamd 
	kdebase-3.5.7-kde#83974.patch 
	post-3.5.7-kdebase-konqueror.diff 
Removed Files:
	kde-np 
Log Message:
sync w/devel branch, namely for:
CVE-2007-3820, CVE-2007-4224, CVE-2007-4225



--- NEW FILE kde-legacy.pamd ---
#%PAM-1.0
auth       sufficient  pam_timestamp.so
auth       required    pam_stack.so service=system-auth
account	   required    pam_nologin.so 
account    required    pam_stack.so service=system-auth
password   required    pam_stack.so service=system-auth
session    required    pam_stack.so service=system-auth
session    required    pam_loginuid.so
session    optional    pam_timestamp.so
session    optional    pam_console.so


--- NEW FILE kde-np-legacy.pamd ---
#%PAM-1.0
auth       required	pam_env.so
auth       required	pam_nologin.so
auth       required	pam_permit.so
account    required	pam_stack.so service=system-auth
password   required	pam_stack.so service=system-auth
session    required	pam_stack.so service=system-auth
session    required     pam_loginuid.so
session    optional     pam_selinux.so
session    optional     pam_console.so


--- NEW FILE kde-np.pamd ---
#%PAM-1.0
auth       required	pam_env.so
auth       required	pam_nologin.so
auth       required	pam_permit.so
account    include	system-auth
password   include	system-auth
session	   optional	pam_keyinit.so force revoke
session    include	system-auth
session    required     pam_loginuid.so
session    optional     pam_selinux.so
session    optional     pam_console.so


--- NEW FILE kde.pamd ---
#%PAM-1.0
auth       include     system-auth
account    required    pam_nologin.so
account    include     system-auth
password   include     system-auth
session    optional    pam_keyinit.so force revoke
session    include     system-auth
session    required    pam_loginuid.so
session    optional    pam_selinux.so
session    optional    pam_console.so

kdebase-3.5.7-kde#83974.patch:

--- NEW FILE kdebase-3.5.7-kde#83974.patch ---
--- branches/KDE/3.5/kdebase/konsole/konsole/main.cpp	2007/05/29 14:31:54	669487
+++ branches/KDE/3.5/kdebase/konsole/konsole/main.cpp	2007/05/29 14:32:54	669488
@@ -46,18 +46,15 @@
 
 #include "konsole.h"
 
-// COMPOSITE disabled by default because the QApplication constructor
-// needed to enable the ARGB32 visual has undesired side effects.
-//#if 0
 #if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
 #define COMPOSITE
 #endif
-//#endif
 
 #ifdef COMPOSITE
 # include <X11/Xlib.h>
 # include <X11/extensions/Xrender.h>
 # include <fixx11h.h>
+# include <dlfcn.h>
 #endif
 
 static const char description[] =
@@ -255,47 +252,62 @@
   if( qtargs->isSet("font") )
       kdWarning() << "The Qt option -fn, --font has no effect." << endl;
 
+  KApplication* a = NULL;
 #ifdef COMPOSITE
-  char *display = 0;
-  if ( qtargs->isSet("display"))
-    display = qtargs->getOption( "display" ).data();
-
-  Display *dpy = XOpenDisplay( display );
-  if ( !dpy ) {
-    kdError() << "cannot connect to X server " << display << endl;
-    exit( 1 );
-  }
-
-  int screen = DefaultScreen( dpy );
-  Colormap colormap = 0;
-  Visual *visual = 0;
-  int event_base, error_base;
-
-  if ( args->isSet("real-transparency") && XRenderQueryExtension( dpy, &event_base, &error_base ) )
-  {
-    int nvi;
-    XVisualInfo templ;
-    templ.screen  = screen;
-    templ.depth   = 32;
-    templ.c_class = TrueColor;
-    XVisualInfo *xvi = XGetVisualInfo( dpy, VisualScreenMask | VisualDepthMask
-		  | VisualClassMask, &templ, &nvi );
-
-    for ( int i = 0; i < nvi; i++ ) {
-      XRenderPictFormat *format = XRenderFindVisualFormat( dpy, xvi[i].visual );
-      if ( format->type == PictTypeDirect && format->direct.alphaMask ) {
-        visual = xvi[i].visual;
-        colormap = XCreateColormap( dpy, RootWindow( dpy, screen ), visual, AllocNone );
-        kdDebug() << "found visual with alpha support" << endl;
-        argb_visual = true;
-        break;
+  if ( args->isSet("real-transparency")) {
+    char *display = 0;
+    if ( qtargs->isSet("display"))
+      display = qtargs->getOption( "display" ).data();
+
+    Display *dpy = XOpenDisplay( display );
+    if ( !dpy ) {
+      kdError() << "cannot connect to X server " << display << endl;
+      exit( 1 );
+    }
+
+    int screen = DefaultScreen( dpy );
+    Colormap colormap = 0;
+    Visual *visual = 0;
+    int event_base, error_base;
+
+    if ( XRenderQueryExtension( dpy, &event_base, &error_base ) ) {
+      int nvi;
+      XVisualInfo templ;
+      templ.screen  = screen;
+      templ.depth   = 32;
+      templ.c_class = TrueColor;
+      XVisualInfo *xvi = XGetVisualInfo( dpy, VisualScreenMask | VisualDepthMask
+		    | VisualClassMask, &templ, &nvi );
+
+      for ( int i = 0; i < nvi; i++ ) {
+        XRenderPictFormat *format = XRenderFindVisualFormat( dpy, xvi[i].visual );
+        if ( format->type == PictTypeDirect && format->direct.alphaMask ) {
+          visual = xvi[i].visual;
+          colormap = XCreateColormap( dpy, RootWindow( dpy, screen ), visual, AllocNone );
+          kdDebug() << "found visual with alpha support" << endl;
+          argb_visual = true;
+          break;
+        }
       }
     }
-  }
+    // The QApplication ctor used is normally intended for applications not using Qt
+    // as the primary toolkit (e.g. Motif apps also using Qt), with some slightly
+    // unpleasant side effects (e.g. #83974). This code checks if qt-copy patch #0078
+    // is applied, which allows turning this off.
+    bool* qt_no_foreign_hack = static_cast< bool* >( dlsym( RTLD_DEFAULT, "qt_no_foreign_hack" ));
+    if( qt_no_foreign_hack )
+        *qt_no_foreign_hack = true;
+    // else argb_visual = false ... ? *shrug*
 
-  KApplication a( dpy, Qt::HANDLE( visual ), Qt::HANDLE( colormap ) );
+    if( argb_visual )
+      a = new KApplication( dpy, Qt::HANDLE( visual ), Qt::HANDLE( colormap ) );
+    else
+      XCloseDisplay( dpy );
+  }
+  if( a == NULL )
+      a = new KApplication;
 #else
-  KApplication a;
+  KApplication* a = new KApplication;
 #endif
 
   QString dataPathBase = KStandardDirs::kde_default("data").append("konsole/");
@@ -351,7 +363,7 @@
   fixed_size = !args->isSet("resize");
 
   if (!full_script)
-	a.dcopClient()->setQtBridgeEnabled(false);
+	a->dcopClient()->setQtBridgeEnabled(false);
 
   QCString type = "";
 
@@ -467,13 +479,13 @@
   putenv((char*)"COLORTERM="); // to trigger mc's color detection
   KonsoleSessionManaged ksm;
 
-  if (a.isRestored() || !profile.isEmpty())
+  if (a->isRestored() || !profile.isEmpty())
   {
     if (!shell)
        shell = konsole_shell(eargs);
 
     if (profile.isEmpty())
-      sessionconfig = a.sessionConfig();
+      sessionconfig = a->sessionConfig();
     sessionconfig->setDesktopGroup();
     int n = 1;
 
@@ -629,7 +641,7 @@
     m->setAutoClose(auto_close);
   }
 
-  int ret = a.exec();
+  int ret = a->exec();
 
  //// Temporary code, waiting for Qt to do this properly
 
@@ -654,6 +666,8 @@
      delete w;
   }
   delete list;
+  
+  delete a;
 
   return ret;
 }

post-3.5.7-kdebase-konqueror.diff:

--- NEW FILE post-3.5.7-kdebase-konqueror.diff ---
--- konqueror/konq_combo.cc
+++ konqueror/konq_combo.cc
@@ -158,6 +158,9 @@ void KonqCombo::setURL( const QString& u
         kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
                                   "addToCombo(QString,QCString)", data);
     }
+    // important security consideration: always display the beginning
+    // of the url rather than its end to prevent spoofing attempts.
+    lineEdit()->setCursorPosition( 0 );
 }
 
 void KonqCombo::setTemporary( const QString& text )
--- konqueror/konq_mainwindow.cc
+++ konqueror/konq_mainwindow.cc
@@ -611,12 +611,11 @@ void KonqMainWindow::openURL( KonqView *
   }
   else // no known serviceType, use KonqRun
   {
-      if ( ( view && view == m_currentView ) ||
-              ( !view && !req.newTab ) ) // startup with argument
+      if ( ( !view || view->url().isEmpty() ) && !req.newTab ) // startup with argument
       {
           // Show it for now in the location bar, but we'll need to store it in the view
           // later on (can't do it yet since either view == 0 or updateHistoryEntry will be called).
-          kdDebug(1202) << "setLocationBarURL : url = " << url << endl;
+          kdDebug(1202) << "setLocationBarURL (startup) : url = " << url << endl;
           setLocationBarURL( url );
       }
 
@@ -819,8 +818,6 @@ bool KonqMainWindow::openView( QString s
         if ( childView )
         {
             enableAllActions( true );
-
-            m_pViewManager->setActivePart( childView->part() );
             m_currentView = childView;
         }
       }
--- konqueror/konq_viewmgr.cc
+++ konqueror/konq_viewmgr.cc
@@ -1395,6 +1395,8 @@ void KonqViewManager::slotActivePartChan
 
 void KonqViewManager::emitActivePartChanged()
 {
+    // prevent unnecessary multiple calls to slotPartActivated:
+    m_activePartChangedTimer->stop();
     m_pMainWindow->slotPartActivated( activePart() );
 }
 


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-7/kdebase.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- kdebase.spec	2 Jul 2007 13:06:03 -0000	1.258
+++ kdebase.spec	17 Aug 2007 15:02:34 -0000	1.259
@@ -1,4 +1,3 @@
-%define rhel 0
 
 %define debug 0 
 %define final 0
@@ -19,9 +18,11 @@
 Name:    kdebase
 Epoch:   6
 Version: 3.5.7
-Release: 3%{?dist}
+Release: 13%{?dist}
 
-License: GPL
+# programs: GPLv2, libs: LGPLv2
+# a lot(most/all?) of files are +, but we'll be conservative, for now. -- Rex
+License: GPLv2
 Url: http://www.kde.org
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,7 +32,7 @@
 Source2: KDE.session.gnome
 Source3: kde.desktop
 Source4: kde-redhat-config-3.5-fc7-1.tar.bz2
-Source5: kde-np
+Source5: kde-np.pamd
 Source6: logrotate-kdm
 Source7: mailsettings.cc
 Source8: env.sh
@@ -40,6 +41,10 @@
 Source11: cr48-app-package_games_kids.png
 Source12: kderc
 
+Source50:   kde-np-legacy.pamd
+Source1001: kde.pamd
+Source1002: kde-legacy.pamd
+
 Patch0: kdebase-3.5.5-redhat-pam.patch
 Patch1: kdebase-3.5.7-1-redhat-startkde.patch
 Patch2: kdebase-3.3.92-vroot.patch
@@ -65,11 +70,19 @@
 Patch28: kdebase-3.5.6-kdm-alternatebackground.patch
 Patch29: kdebase-3.5.7-bz#244906.patch
 
+# upstream patches
+# alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
+Patch83974: kdebase-3.5.7-kde#83974.patch
+# http://www.kde.org/info/security/advisory-20070815-1.txt
+Patch502: ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdebase-konqueror.diff
+
+Provides: kdebase3 = %{version}-%{release}
+
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires(post): fileutils sh-utils
 Requires(postun): fileutils sh-utils
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdelibs3 >= %{version}
 # See http://bugzilla.redhat.com/191306
 Requires(hint): htdig
 # man2html
@@ -77,9 +90,6 @@
 # /sbin/fuser
 Requires: psmisc
 
-%ifarch %{ix86} x86_64 ia64 ppc ppc64
-Requires: pm-utils
-%endif
 %ifnarch s390 s390x
 Requires: eject
 %endif
@@ -99,7 +109,7 @@
 Requires: redhat-artwork-kde >= 7.0.0-8
 %endif
 
-BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+BuildRequires: kdelibs3-devel >= %{version}
 BuildRequires: libxslt-devel libxml2-devel
 %if 0%{?fedora} > 6
 BuildRequires: libsmbclient-devel
@@ -108,7 +118,6 @@
 %endif
 BuildRequires: pam-devel
 BuildRequires: gettext
-BuildRequires: imake
 BuildRequires: perl
 BuildRequires: sed
 %if %{make_cvs}
@@ -116,14 +125,24 @@
 %endif
 BuildRequires: pkgconfig
 BuildRequires: doxygen
-BuildRequires: dbus-devel >= 0.90
-BuildRequires: hal-devel >= 0.5
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%ifarch %{ix86} x86_64 ia64 ppc ppc64
+%define _with_suspend 1
+Requires: pm-utils
+%endif
+%define _with_hal --with-hal
+# dbus >= 0.90, hal >= 0.5 (mock/yum is having problems groking this for me on el5/x86_64) -- Rex
+BuildRequires: dbus-devel hal-devel
+%endif
 BuildRequires: freetype-devel
 BuildRequires: openldap-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: libart_lgpl-devel
-BuildRequires: xorg-x11-proto-devel
+## X11 support details (xmkmf, bdftopcf)
 BuildRequires: xorg-x11-font-utils
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires: imake
+BuildRequires: xorg-x11-proto-devel
 BuildRequires: libfontenc-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: libXdamage-devel
@@ -132,20 +151,23 @@
 BuildRequires: libXrandr-devel
 BuildRequires: libXrender-devel
 BuildRequires: libXfixes-devel
-BuildRequires: libXext-devel 
+BuildRequires: libXext-devel
 BuildRequires: libXtst-devel
 BuildRequires: libXxf86misc-devel
 BuildRequires: libxkbfile-devel
-BuildRequires: libutempter-devel
+%endif
+%if 0%{?fedora} > 5 || 0%{?rhel} > 4
+# See also http://bugzilla.redhat.com/205767
+%define _with_libutempter 1
+%endif
 %ifnarch s390 s390x
 BuildRequires: libraw1394-devel
 BuildRequires: libusb-devel
-%endif
-%ifarch alpha %{ix86} x86_64
 BuildRequires: lm_sensors-devel
 %endif
 BuildRequires: OpenEXR-devel
 
+
 %description
 Core applications for the K Desktop Environment.  Included are: kdm
 (replacement for xdm), kwin (window manager), konqueror (filemanager,
@@ -158,7 +180,9 @@
 
 %package devel
 Summary: Development files for kdebase
-Requires: kdelibs-devel >= %{version}
+Provides: kdebase3-devel = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: kdelibs3-devel
 Group: Development/Libraries
 %description devel
 Header files for developing applications using kdebase.
@@ -168,7 +192,7 @@
 %package extras
 Summary: Extras packages from kdebase
 Group: User Interface/Desktops
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description extras
 Extra applications for the K Desktop Environment, including:
  * kappfinder
@@ -190,7 +214,7 @@
 %patch8 -p1 -b .logo
 %patch10 -p1 -b .kdestop-konsole
 %patch11 -p1 -b .xdg
-%patch13 -p1 -b .dbus
+%{?_with_hal:%patch13 -p1 -b .dbus}
 %patch14 -p1 -b .kdm-readme
 %patch15 -p1 -b .konsole-fonts
 %patch18 -p1 -b .klipper
@@ -199,15 +223,14 @@
 %patch22 -p1 -b .htdig
 %patch24 -p1 -b .tango-icon-theme
 %patch25 -p1 -b .konqueror-shortcut
-%patch26 -p1 -b .suspend
-%patch27 -p1 -b .consolekit
+%{?_with_suspend:%patch26 -p1 -b .suspend}
+%{?_with_hal:%patch27 -p1 -b .consolekit}
 %patch28 -p1 -b .kdm-alternatebackground
 %patch29 -p1 -b .konsole-bz#244906
+## alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
+#patch83974 -p4 -b .kde#83974
 
-%if %{rhel}
-   rm -rf kdeprint/kdeprintfax
-   perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am
-%endif
+%patch502 -p0 -b .advisory-20070815-1
 
 %if %redhatify
    cp %{SOURCE1} konsole
@@ -259,7 +282,8 @@
 %else
    --enable-debug \
 %endif
-   --includedir=%{_includedir}/kde
+   --includedir=%{_includedir}/kde \
+  %{?_with_hal} %{!?_with_hal:--without-hal}
 
 make %{?_smp_mflags}
 
@@ -277,18 +301,17 @@
 # Fix up permissions on some things
 chmod 755 %{buildroot}%{_bindir}/kdesud
 
-# install pam configuration file
-install -p -D -m 644 %{SOURCE5} %{buildroot}/etc/pam.d/kdm-np
-install -p -D -m 644 kdm.pamd %{buildroot}/etc/pam.d/kdm
-install -p -D -m 644 kde.pamd %{buildroot}/etc/pam.d/kscreensaver
-install -p -D -m 644 kde.pamd %{buildroot}/etc/pam.d/kcheckpass
-
-%if %{rhel}
-rm -rf %{buildroot}%{_bindir}/kappfinder \
-       %{buildroot}%{_datadir}/applnk/System/kappfinder.desktop \
-       %{buildroot}%{_datadir}/applications/kde/kappfinder.desktop \
-       %{buildroot}%{_datadir}/icons/*/*/*/kappfinder.png \
-       %{buildroot}%{_datadir}/apps/kappfinder
+## install pam configuration files
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+install -p -m644 -D %{SOURCE5}    $RPM_BUILD_ROOT/etc/pam.d/kdm-np
+install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kdm
+install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kscreensaver
+install -p -m644 -D %{SOURCE1001} $RPM_BUILD_ROOT/etc/pam.d/kcheckpass
+%else
+install -p -m644 -D %{SOURCE50}   $RPM_BUILD_ROOT/etc/pam.d/kdm-np
+install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kdm
+install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kscreensaver
+install -p -m644 -D %{SOURCE1002} $RPM_BUILD_ROOT/etc/pam.d/kcheckpass
 %endif
 
 # Nuke man2html - we get it from man
@@ -375,12 +398,10 @@
       echo "OnlyShowIn=KDE;" >> $f
    done
 
-   # "create/own {/usr,/etc/kde}/{env,shutdown}", http://bugzilla.redhat.com/178326
-   mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown}
-   mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown}
-   install -p -m755 %{SOURCE8} %{buildroot}/etc/kde/env/
 %endif
 
+install -p -m755 -D %{SOURCE8} %{buildroot}%{_sysconfdir}/kde/env/env.sh
+
 # Own Mozilla plugin dir
 mkdir -p %{buildroot}%{_libdir}/mozilla/plugins
 
@@ -420,7 +441,7 @@
 
 
 %files extras
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 # kappfinder
 %{_bindir}/kappfinder
 %{_datadir}/applications/kde/kappfinder.desktop
@@ -450,7 +471,7 @@
 %{_datadir}/icons/hicolor/*/apps/kpager.png
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 # kappfinder
 %exclude %{_datadir}/applications/kde/kappfinder.desktop
 %exclude %{_datadir}/applnk/System/kappfinder.desktop
@@ -476,12 +497,12 @@
 %exclude %{_datadir}/icons/hicolor/*/apps/kpager.png
 
 %doc AUTHORS COPYING README
-%doc %{_docdir}/HTML/en/*
+%{_docdir}/HTML/en/*
 %config(noreplace) /etc/ksysguarddrc
-/etc/kde
 %config(noreplace) /etc/xdg/menus/*
 %config(noreplace) /etc/logrotate.d/kdm
 %config(noreplace) %{_datadir}/xsessions/*
+%{_sysconfdir}/kde/env/*
 %if ! %{kde_settings}
 %dir /etc/skel/.kde
 /etc/skel/.kde/*
@@ -546,7 +567,7 @@
 %{_bindir}/knetattach
 %{_bindir}/kompmgr
 %{_bindir}/konqueror
-%attr(2755,root,utempter) %{_bindir}/konsole
+%{?_with_libutempter:%attr(2755,root,utempter) }%{_bindir}/konsole
 %{_bindir}/kpm
 %{_bindir}/kprinter
 %{_bindir}/krandom.kss
@@ -578,13 +599,15 @@
 %{_libdir}/*.la
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin
-%{_datadir}/applications/*
-%{_datadir}/applnk/
+%{_datadir}/applications/*/*
+%{_datadir}/applnk/*.desktop
+%{_datadir}/applnk/*/*
+%{_datadir}/applnk/.hidden/
 %{_datadir}/apps/*
 %{_datadir}/autostart/*
 %config(noreplace) %{_datadir}/config/*
-%{_datadir}/config.kcfg/
-%{_datadir}/desktop-directories
+%{_datadir}/config.kcfg/*
+%{_datadir}/desktop-directories/*
 %if ! %{redhatify}
 %{_datadir}/fonts/bitmap-fonts/*
 %endif
@@ -592,20 +615,16 @@
 %{_datadir}/icons/*color/*/*/*
 %{_datadir}/locale/*/entry.desktop
 %{_datadir}/locale/l10n
-%{_datadir}/mimelnk/application/*
-%{_datadir}/mimelnk/fonts
-%{_datadir}/mimelnk/inode
-%{_datadir}/mimelnk/media
-%{_datadir}/mimelnk/print
+%{_datadir}/mimelnk/*/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
-%{_datadir}/sounds/
-%{_datadir}/templates/
-%{_datadir}/wallpapers/
-%{_datadir}/apps/kdm/faces/
+%{_datadir}/sounds/*
+%{_datadir}/templates/*
+%{_datadir}/templates/.source/*
+%{_datadir}/wallpapers/*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/kde/*.h
 %dir %{_includedir}/kde/kate
 %{_includedir}/kde/kate/*
@@ -620,9 +639,33 @@
 
 
 %changelog
-* Mon Jul 02 2007 Than Ngo <than at redhat.com> -  3.5.7-3
+* Wed Aug 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-13
+- CVE-2007-3820, CVE-2007-4224, CVE-2007-4225
+- License: GPLv2
+- Requires: kdelibs3(-devel)
+
+* Fri Jul 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-12
+- fix unpackaged files
+
+* Fri Jul 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-9
+- %%ifnarch s390 s390x: BR: lm_sensors
+
+* Thu Jul 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-7
+- omit dirs owned by kde-filesystem
+
+* Mon Jul 02 2007 Than Ngo <than at redhat.com> - 6:3.5.7-6
 - fix bz#244906
 
+* Wed Jun 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-5
+- Provides: kdebase3(-devel)
+
+* Wed Jun 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-4
+- -devel: Requires: %%name... 
+- portability++
+
+* Fri Jun 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-3
+- specfile portability
+
 * Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
 - fix BR: kdelibs-devel
 - cleanup Req's wrt kde-settings


--- kde-np DELETED ---




More information about the scm-commits mailing list