[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kdebase/FC-5 kdebase-3.5.3-kioslave_media_dbus.patch, NONE, 1.1 kdebase.spec, 1.168, 1.169 kdebase-3.5.2-kioslave_media_dbus.patch, 1.2, NONE



Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31749

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.3-kioslave_media_dbus.patch 
Removed Files:
	kdebase-3.5.2-kioslave_media_dbus.patch 
Log Message:
update kioslave_media_dbus patch


kdebase-3.5.3-kioslave_media_dbus.patch:
 Makefile.am                                 |    5 
 configure.in.in                             |    7 
 kcmodule/managermodule.cpp                  |    4 
 kcmodule/media.desktop                      |    2 
 kfile-plugin/kfile_media.desktop            |    2 
 kfile-plugin/kfilemediaplugin.cpp           |    9 
 libmediacommon/medium.cpp                   |    4 
 libmediacommon/medium.h                     |   21 
 mediaimpl.cpp                               |   15 
 mediamanager/halbackend.cpp                 |  620 +++++++++++++++++++++++++++-
 mediamanager/halbackend.h                   |   19 
 mediamanager/mediamanager.cpp               |   81 +++
 mediamanager/mediamanager.h                 |    8 
 medianotifier/medianotifier.cpp             |    9 
 mimetypes/audiocd.desktop                   |    4 
 mimetypes/blankcd.desktop                   |    2 
 mimetypes/blankdvd.desktop                  |    2 
 mimetypes/cdrom_mounted.desktop             |    4 
 mimetypes/cdrom_unmounted.desktop           |    2 
 mimetypes/cdwriter_mounted.desktop          |    2 
 mimetypes/cdwriter_unmounted.desktop        |    2 
 mimetypes/dvdvideo.desktop                  |    4 
 mimetypes/floppy5_mounted.desktop           |    2 
 mimetypes/floppy5_unmounted.desktop         |    2 
 mimetypes/floppy_mounted.desktop            |    2 
 mimetypes/floppy_unmounted.desktop          |    2 
 mimetypes/hdd_mounted.desktop               |    1 
 mimetypes/hdd_unmounted.desktop             |    1 
 mimetypes/nfs_mounted.desktop               |    1 
 mimetypes/nfs_unmounted.desktop             |    1 
 mimetypes/removable_mounted.desktop         |    5 
 mimetypes/removable_unmounted.desktop       |    5 
 mimetypes/smb_mounted.desktop               |    3 
 mimetypes/smb_unmounted.desktop             |    3 
 mimetypes/vcd.desktop                       |    1 
 mounthelper/Makefile.am                     |    2 
 mounthelper/kio_media_mounthelper.cpp       |   51 +-
 propsdlgplugin/Makefile.am                  |   12 
 propsdlgplugin/media_propsdlgplugin.desktop |    7 
 propsdlgplugin/propertiespage.cpp           |  217 +++++++++
 propsdlgplugin/propertiespage.h             |   46 ++
 propsdlgplugin/propertiespagegui.ui         |  390 +++++++++++++++++
 propsdlgplugin/propertiespagegui.ui.h       |   22 
 propsdlgplugin/propsdlgshareplugin.cpp      |  100 ++++
 propsdlgplugin/propsdlgshareplugin.h        |   44 +
 services/media_eject.desktop                |    2 
 46 files changed, 1654 insertions(+), 96 deletions(-)

--- NEW FILE kdebase-3.5.3-kioslave_media_dbus.patch ---
--- kdebase-3.5.2/kioslave/media/medianotifier/medianotifier.cpp.kio	2006-03-17 11:17:33.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/medianotifier/medianotifier.cpp	2006-04-28 18:22:09.000000000 +0200
@@ -54,7 +54,10 @@
 {
 	kdDebug() << "MediaNotifier::onMediumChange( " << name << ", "
 	          << allowNotification << ")" << endl;
-	
+
+	if ( !allowNotification )
+	  return;
+
 // Update user activity timestamp, otherwise the notification dialog will be shown
 // in the background due to focus stealing prevention. Entering a new media can
 // be seen as a kind of user activity after all. It'd be better to update the timestamp
@@ -95,11 +98,11 @@
 {
 	QString mimetype = medium.mimetype();
 
-	bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" );
+	bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" );
 	bool is_mounted = mimetype.endsWith( "_mounted" );
 	
 	// We autorun only on CD/DVD or removable disks (USB, Firewire)
-	if ( !( is_cdrom && is_mounted )
+	if ( !( is_cdrom || is_mounted )
 	  && mimetype!="media/removable_mounted" )
 	{
 		return false;
--- kdebase-3.5.2/kioslave/media/services/media_eject.desktop.kio	2006-03-17 11:17:33.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/services/media_eject.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -23,7 +23,7 @@
 Name[eo]=Eligo
 Name[es]=Expulsar
 Name[et]=Väljastamine
-Name[eu]=Egotzi
+Name[eu]=Kanporatu
 Name[fa]=اخراج
 Name[fi]=Poista
 Name[fr]=Éjecter
--- kdebase-3.5.2/kioslave/media/libmediacommon/medium.h.kio	2005-10-10 17:04:00.000000000 +0200
+++ kdebase-3.5.2/kioslave/media/libmediacommon/medium.h	2006-04-28 18:22:09.000000000 +0200
@@ -22,6 +22,7 @@
 #include <qstring.h>
 #include <qstringlist.h>
 #include <kurl.h>
+#include <qmap.h>
 
 class Medium
 {
@@ -78,14 +79,32 @@
 
 	void setMimeType(const QString &mimeType);
 	void setIconName(const QString &iconName);
+	void setHalMounted(bool flag) const { m_halmounted = flag; }
+	bool halMounted() const { return m_halmounted; }
 
 private:
 	Medium();
 	void loadUserLabel();
 
 	QStringList m_properties;
-
+	mutable bool m_halmounted;
+	
 friend class QValueListNode<const Medium>;
 };
 
+namespace MediaManagerUtils {
+  static inline QMap<QString,QString> splitOptions(const QStringList & options) 
+    {
+      QMap<QString,QString> valids;
+
+      for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it)
+	{
+	  QString key = (*it).left((*it).find('='));
+	  QString value = (*it).mid((*it).find('=') + 1);
+	  valids[key] = value;
+	}
+      return valids;
+    }
+}
+
 #endif
--- kdebase-3.5.2/kioslave/media/libmediacommon/medium.cpp.kio	2005-10-10 17:04:00.000000000 +0200
+++ kdebase-3.5.2/kioslave/media/libmediacommon/medium.cpp	2006-04-28 18:22:09.000000000 +0200
@@ -40,6 +40,8 @@
 	m_properties+= QString::null; /* ICON_NAME */
 
 	loadUserLabel();
+
+	m_halmounted = false;
 }
 
 Medium::Medium()
@@ -57,6 +59,8 @@
 	m_properties+= QString::null; /* BASE_URL */
 	m_properties+= QString::null; /* MIME_TYPE */
 	m_properties+= QString::null; /* ICON_NAME */
+	
+	m_halmounted = false;
 }
 
 const Medium Medium::create(const QStringList &properties)
--- /dev/null	2006-04-05 11:13:39.664052750 +0200
+++ kdebase-3.5.2/kioslave/media/propsdlgplugin/propertiespage.h	2006-04-28 18:22:09.000000000 +0200
@@ -0,0 +1,46 @@
+/*
+  Copyright (c) 2004 Jan Schaefer <j_schaef informatik uni-kl de>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+#ifndef PROPERTIESPAGE_H
+#define PROPERTIESPAGE_H
+
+#include "propertiespagegui.h"
+#include <qmap.h>
+
+class QCheckBox;
+class Medium;
+
+class PropertiesPage : public PropertiesPageGUI
+{
+  Q_OBJECT
+
+public:
+  PropertiesPage(QWidget* parent, const QString &_id);
+  virtual ~PropertiesPage();
+  
+  bool save();
+
+protected:
+  
+  QMap<QString,QString> options;
+  QString id;
+
+};
+
+#endif
--- /dev/null	2006-04-05 11:13:39.664052750 +0200
+++ kdebase-3.5.2/kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Service
+Name=Media Properties Page
+Comment=Konqueror properties dialog plugin to configure mount behaviour
+X-KDE-Library=media_propsdlgplugin
+ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted
--- /dev/null	2006-04-05 11:13:39.664052750 +0200
+++ kdebase-3.5.2/kioslave/media/propsdlgplugin/propertiespagegui.ui	2006-04-28 18:22:09.000000000 +0200
@@ -0,0 +1,390 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>PropertiesPageGUI</class>
+<widget class="QWidget">
+    <property name="name">
+        <cstring>PropertiesPageGUI</cstring>
+    </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>527</width>
+            <height>476</height>
+        </rect>
+    </property>
+    <property name="caption">
+        <string>PropertiesPageGUI</string>
+    </property>
+    <hbox>
+        <property name="name">
+            <cstring>unnamed</cstring>
+        </property>
+        <property name="margin">
+            <number>0</number>
+        </property>
+        <widget class="QLayoutWidget">
+            <property name="name">
+                <cstring>layout17</cstring>
+            </property>
+            <vbox>
+                <property name="name">
+                    <cstring>unnamed</cstring>
+                </property>
+                <widget class="QGroupBox">
+                    <property name="name">
[...2086 lines suppressed...]
 Comment[sl]=Odklopljen odstranljiv medij
--- kdebase-3.5.2/kioslave/media/mimetypes/blankcd.desktop.kio	2006-03-17 11:17:34.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/mimetypes/blankcd.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -12,7 +12,7 @@
 Comment[da]=Blank cd
 Comment[de]=Leere CD
 Comment[el]=Κενό CD
-Comment[es]=CD vacío
+Comment[es]=Borrar CD
 Comment[et]=Tühi CD
 Comment[eu]=CD hutsik
 Comment[fi]=Tyhjä CD
--- kdebase-3.5.2/kioslave/media/mimetypes/hdd_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/mimetypes/hdd_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -21,7 +21,6 @@
 Comment[fi]=Irrotettu kiintolevyosio
 Comment[fr]=Partition de disque dur non montée
 Comment[fy]=Ofkeppele Fêsteskiif folume
-Comment[ga]=Imleabhar Diosca Crua Gan Fheistiú
 Comment[gl]=Partizón do Disco Duro Non Montada
 Comment[he]=מחיצת כונן קשיח מנותקת
 Comment[hi]=अनमाउन्टेड हार्ड डिस्क वॉल्यूम
--- kdebase-3.5.2/kioslave/media/mimetypes/floppy5_mounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/mimetypes/floppy5_mounted.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -52,7 +52,7 @@
 Comment[pt]=Disquete de 5¼" montada
 Comment[pt_BR]=Disquete  5¼" Montado
 Comment[ro]=Dischetă 5¼" montată
-Comment[ru]=Смонтированная дискета 5¼"
+Comment[ru]=Смонтированный дисковод 5¼"
 Comment[rw]=Disikete 5¼" Yashyizwemo
 Comment[se]=Čatnon 5¼-dibmaskearru
 Comment[sk]=Pripojená disketa 5¼"
--- kdebase-3.5.2/kioslave/media/mimetypes/audiocd.desktop.kio	2006-03-17 11:17:34.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/mimetypes/audiocd.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -19,7 +19,7 @@
 Comment[he]=תקליטורי שמע
 Comment[hi]=ऑडियो सीडी
 Comment[hu]=Hang-CD
-Comment[is]=Hljóðdiskur
+Comment[is]=Hljóð CD
 Comment[it]=CD audio
 Comment[ja]=オーディオ CD
 Comment[km]=ស៊ីឌី​អូឌីយ៉ូ
@@ -33,7 +33,7 @@
 Comment[pt]=CD áudio
 Comment[pt_BR]=CD de Áudio
 Comment[ro]=CD Audio
-Comment[ru]=Аудио CD
+Comment[ru]=Звуковой CD
 Comment[rw]=CD y'Inyumvo
 Comment[se]=Jietna-CD
 Comment[sl]=Glasbeni CD
--- kdebase-3.5.2/kioslave/media/mimetypes/cdwriter_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/mimetypes/cdwriter_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -53,7 +53,7 @@
 Comment[pt]=Gravador de CDs desmontado
 Comment[pt_BR]=Gravador de CD Desmontado
 Comment[ro]=CD Writer nemontat
-Comment[ru]=Отмонтированный CD (с возможностью записи)
+Comment[ru]=Отмонтированный CD Writer
 Comment[rw]=Mwandika CD Yakuwemo
 Comment[se]=Gálgajuvvon CD-čálli
 Comment[sk]=Nepripojená napaľovacia mechanika CD
--- kdebase-3.5.2/kioslave/media/mimetypes/nfs_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/mimetypes/nfs_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -21,7 +21,6 @@
 Comment[fi]=Irrotettu NFS-jako
 Comment[fr]=Ressource NFS non montée
 Comment[fy]=Oankeppele NFS-boarne
-Comment[ga]=Comhroinn NFS Gan Fheistiú
 Comment[gl]=Compartizón NFS non Montada
 Comment[he]=משאב NFS מנותק
 Comment[hi]=अनमाउन्टेड एनएफ़एस साझा
--- kdebase-3.5.2/kioslave/media/mimetypes/cdrom_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/mimetypes/cdrom_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -53,7 +53,7 @@
 Comment[pt]=CD-ROM desmontado
 Comment[pt_BR]=CD-ROM Desmontado
 Comment[ro]=CD-ROM nemontat
-Comment[ru]=Отмонтированный CD
+Comment[ru]=Отмонтированный CD-ROM
 Comment[rw]=CD-ROM Yakuwemo
 Comment[se]=Gálgajuvvon CD-ROM
 Comment[sk]=Nepripojený CD-ROM
--- kdebase-3.5.2/kioslave/media/mediaimpl.cpp.kio	2005-10-10 17:04:01.000000000 +0200
+++ kdebase-3.5.2/kioslave/media/mediaimpl.cpp	2006-04-28 18:22:09.000000000 +0200
@@ -226,6 +226,8 @@
 
 		mp_mounting = &medium;
 		
+		
+		/*
 		KIO::Job* job = KIO::mount(false, 0,
 		                           medium.deviceNode(),
 		                           medium.mountPoint());
@@ -234,6 +236,7 @@
 		         this, SLOT( slotMountResult( KIO::Job * ) ) );
 		connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ),
 		         this, SLOT( slotWarning( KIO::Job *, const QString & ) ) );
+		*/
 		kapp->dcopClient()
 		->connectDCOPSignal("kded", "mediamanager",
 		                    "mediumChanged(QString, bool)",
@@ -241,7 +244,17 @@
 		                    "slotMediumChanged(QString)",
 		                    false);
 
-		qApp->eventLoop()->enterLoop();
+		DCOPRef mediamanager("kded", "mediamanager");
+		DCOPReply reply = mediamanager.call( "mount", medium.id());
+		if (reply.isValid())
+		  reply.get(m_lastErrorMessage);
+		else
+		  m_lastErrorMessage = i18n("Internal Error");
+		if (!m_lastErrorMessage.isEmpty())
+		  m_lastErrorCode = KIO::ERR_SLAVE_DEFINED;
+		else {
+		  qApp->eventLoop()->enterLoop();
+		}
 
 		mp_mounting = 0L;
 		
--- kdebase-3.5.2/kioslave/media/kcmodule/media.desktop.kio	2006-03-17 11:17:33.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/kcmodule/media.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -79,7 +79,6 @@
 Comment[fi]=Aseta tallennusmedia
 Comment[fr]=Configurer le média de stockage
 Comment[fy]=Opslachmedia ynstelle
-Comment[ga]=Cumraigh Meáin Stórála
 Comment[gl]=Configurar Medios de Armacenaxe
 Comment[hu]=A tárolóeszközök beállítása
 Comment[is]=Stillingar geymslumiðla
@@ -123,7 +122,6 @@
 Keywords[fi]=varasto,media,usb,cdrom,laite
 Keywords[fr]=stockage,media,medium,usb,cdrom,périphérique
 Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart
-Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas
 Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo
 Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz
 Keywords[is]=geymsla,miðill,usb,cdrom,tæki
--- kdebase-3.5.2/kioslave/media/kcmodule/managermodule.cpp.kio	2005-11-20 20:14:21.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/kcmodule/managermodule.cpp	2006-04-28 18:22:09.000000000 +0200
@@ -39,15 +39,15 @@
 	QString hal_text = view->kcfg_HalBackendEnabled->text();
 	hal_text += " ("+i18n("No support for HAL on this system")+")";
 	view->kcfg_HalBackendEnabled->setText( hal_text );
-	view->kcfg_HalBackendEnabled->setEnabled( false );
 #endif
+	view->kcfg_HalBackendEnabled->setEnabled( false );
 
 #ifndef COMPILE_LINUXCDPOLLING
 	QString poll_text = view->kcfg_CdPollingEnabled->text();
 	poll_text += " ("+i18n("No support for CD polling on this system")+")";
 	view->kcfg_CdPollingEnabled->setText( poll_text );
-	view->kcfg_CdPollingEnabled->setEnabled( false );
 #endif
+	view->kcfg_CdPollingEnabled->setEnabled( false );
 
 	load();
 }
--- kdebase-3.5.2/kioslave/media/kfile-plugin/kfilemediaplugin.cpp.kio	2005-11-08 23:36:07.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/kfile-plugin/kfilemediaplugin.cpp	2006-04-28 18:22:09.000000000 +0200
@@ -64,12 +64,16 @@
 	addMimeType( "media/floppy_unmounted" );
 	addMimeType( "media/zip_unmounted" );
 	addMimeType( "media/gphoto2camera" );
+	addMimeType( "media/camera_mounted" );
+	addMimeType( "media/camera_unmounted" );	
 }
 
 bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
 {
-	const Medium medium = askMedium(info);
+        const Medium medium = askMedium(info);
 
+	kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl;
+ 
 	if (medium.id().isNull()) return false;
 	
 	QString mount_point = medium.mountPoint();
@@ -161,7 +165,8 @@
 const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info)
 {
 	DCOPRef mediamanager("kded", "mediamanager");
-	DCOPReply reply = mediamanager.call( "properties", info.url().fileName() );
+	kdDebug() << "properties " << info.url() << endl;
+	DCOPReply reply = mediamanager.call( "properties", info.url().url() );
 
 	if ( !reply.isValid() )
 	{

--- kdebase-3.5.2/kioslave/media/kfile-plugin/kfile_media.desktop.kio	2006-03-17 11:17:33.000000000 +0100
+++ kdebase-3.5.2/kioslave/media/kfile-plugin/kfile_media.desktop	2006-04-28 18:22:09.000000000 +0200
@@ -58,4 +57,4 @@
 Name[zh_TW]=媒體資訊
 ServiceTypes=KFilePlugin
 X-KDE-Library=kfile_media
-MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera
+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- kdebase.spec	8 Jun 2006 12:56:28 -0000	1.168
+++ kdebase.spec	8 Jun 2006 17:08:46 -0000	1.169
@@ -48,7 +48,7 @@
 Patch9: kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff
 Patch10: kdebase-3.4.2-kdesktop-konsole.patch
 Patch11: kdebase-3.5.1-xdg.patch
-Patch12: kdebase-3.5.2-kioslave_media_dbus.patch
+Patch12: kdebase-3.5.3-kioslave_media_dbus.patch
 Patch13: kdebase-3.5.2-dbus.patch
 Patch14: kdebase-3.5.1-kdm-readme.patch
 Patch15: kdebase-3.5.1-konsole-fonts.patch
@@ -400,6 +400,7 @@
 %attr(4755,root,root) %{_bindir}/kcheckpass
 %{_bindir}/kcheckrunning
 %{_bindir}/kcminit
+%{_bindir}/kcminit_startup
 %{_bindir}/kcontrol
 %{_bindir}/kcontroledit
 %{_bindir}/kdcop
@@ -471,7 +472,9 @@
 %{_bindir}/nspluginscan
 %{_bindir}/nspluginviewer
 %{_bindir}/startkde
-%{_libdir}/*.??*
+%{_libdir}/*.so.*
+%{_libdir}/libkdeinit_*.so
+%{_libdir}/*.la
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin
 %{_datadir}/applications/*
@@ -511,6 +514,9 @@
 %{_includedir}/kde/ksgrd/*
 %dir %{_includedir}/kde/ksplash
 %{_includedir}/kde/ksplash/*
+%{_libdir}/*.so
+%exclude %{_libdir}/libkdeinit_*.so
+
 
 %changelog
 * Thu Jun 08 2006 Than Ngo <than redhat com> 6:3.5.3-0.1.fc5


--- kdebase-3.5.2-kioslave_media_dbus.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]