Versions 3.5.12 and 3.5.13 Including some RHEL/Fedora specific patches.v3.5.13-sru
parent
21debd86d0
commit
adfc29286d
@ -0,0 +1,19 @@
|
|||||||
|
*** kdebase/kdesktop/krootwm.cc.ori 2011-07-20 14:14:25.822954866 +0200
|
||||||
|
--- kdebase/kdesktop/krootwm.cc 2011-07-20 14:16:09.964002976 +0200
|
||||||
|
***************
|
||||||
|
*** 760,766 ****
|
||||||
|
KConfigGroupSaver gs(KGlobal::config(), "General");
|
||||||
|
TQString terminal = KGlobal::config()->readPathEntry("TerminalApplication", "konsole");
|
||||||
|
|
||||||
|
! *p << terminal << "--workdir=" + KGlobalSettings::desktopPath() + "/";
|
||||||
|
|
||||||
|
p->start(KProcess::DontCare);
|
||||||
|
|
||||||
|
--- 760,766 ----
|
||||||
|
KConfigGroupSaver gs(KGlobal::config(), "General");
|
||||||
|
TQString terminal = KGlobal::config()->readPathEntry("TerminalApplication", "konsole");
|
||||||
|
|
||||||
|
! *p << terminal;
|
||||||
|
|
||||||
|
p->start(KProcess::DontCare);
|
||||||
|
|
@ -0,0 +1,78 @@
|
|||||||
|
*** kdebase/kioslave/media/mediamanager/halbackend.cpp.orig 2010-09-30 00:24:28.000000000 +0200
|
||||||
|
--- kdebase/kioslave/media/mediamanager/halbackend.cpp 2011-07-20 16:39:40.933056051 +0200
|
||||||
|
***************
|
||||||
|
*** 873,878 ****
|
||||||
|
--- 873,905 ----
|
||||||
|
s_HALBackend->DeviceCondition(udi, condition_name);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ TQStringList HALBackend::getHALmountoptions(TQString udi)
|
||||||
|
+ {
|
||||||
|
+ const char* _ppt_string;
|
||||||
|
+ LibHalVolume* volume;
|
||||||
|
+ LibHalDrive* drive;
|
||||||
|
+
|
||||||
|
+ TQString _ppt_QString;
|
||||||
|
+
|
||||||
|
+ volume = libhal_volume_from_udi( m_halContext, udi.latin1() );
|
||||||
|
+ if( volume )
|
||||||
|
+ drive = libhal_drive_from_udi( m_halContext, libhal_volume_get_storage_device_udi( volume ) );
|
||||||
|
+ else
|
||||||
|
+ drive = libhal_drive_from_udi( m_halContext, udi.latin1() );
|
||||||
|
+
|
||||||
|
+ if( !drive )
|
||||||
|
+ return TQString::null;
|
||||||
|
+
|
||||||
|
+ if( volume )
|
||||||
|
+ _ppt_string = libhal_volume_policy_get_mount_options ( drive, volume, NULL );
|
||||||
|
+ else
|
||||||
|
+ _ppt_string = libhal_drive_policy_get_mount_options ( drive, NULL );
|
||||||
|
+
|
||||||
|
+ _ppt_QString = TQString(_ppt_string ? _ppt_string : "");
|
||||||
|
+
|
||||||
|
+ return TQStringList::split(",",_ppt_QString);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
TQStringList HALBackend::mountoptions(const TQString &name)
|
||||||
|
{
|
||||||
|
const Medium* medium = m_mediaList.findById(name);
|
||||||
|
***************
|
||||||
|
*** 1472,1481 ****
|
||||||
|
--- 1499,1524 ----
|
||||||
|
soptions << TQString("data=ordered");
|
||||||
|
}
|
||||||
|
|
||||||
|
+ TQStringList hal_mount_options = getHALmountoptions(medium->id());
|
||||||
|
+ for (TQValueListIterator<TQString> it=hal_mount_options.begin();it!=hal_mount_options.end();it++)
|
||||||
|
+ {
|
||||||
|
+ soptions << *it;
|
||||||
|
+ kdDebug()<<"HALOption: "<<*it<<endl;
|
||||||
|
+ if ((*it).startsWith("iocharset="))
|
||||||
|
+ {
|
||||||
|
+ soptions.remove("utf8");
|
||||||
|
+ kdDebug()<<"\"iocharset=\" found. Removing \"utf8\" from options."<<endl;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+
|
||||||
|
const char **options = new const char*[soptions.size() + 1];
|
||||||
|
uint noptions = 0;
|
||||||
|
for (TQStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions)
|
||||||
|
+ {
|
||||||
|
options[noptions] = (*it).latin1();
|
||||||
|
+ kdDebug()<<"Option: "<<*it<<endl;
|
||||||
|
+ }
|
||||||
|
options[noptions] = NULL;
|
||||||
|
|
||||||
|
TQString qerror = i18n("Cannot mount encrypted drives!");
|
||||||
|
diff -r -u kdebase-3.5.5a.dfsg.1.orig/kioslave/media/mediamanager/halbackend.h kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.h
|
||||||
|
--- kdebase-3.5.5a.dfsg.1.orig/kioslave/media/mediamanager/halbackend.h 2007-01-25 12:34:07.133446000 +0300
|
||||||
|
+++ kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.h 2007-01-25 16:33:54.413638693 +0300
|
||||||
|
@@ -192,6 +192,7 @@
|
||||||
|
const char* message
|
||||||
|
);
|
||||||
|
|
||||||
|
+ QStringList getHALmountoptions(QString udi);
|
||||||
|
/* HAL and DBus structures */
|
||||||
|
private:
|
||||||
|
/**
|
@ -0,0 +1,45 @@
|
|||||||
|
diff -rcb kdebase.ORI/kdesu/kdesu/sudlg.cpp kdebase/kdesu/kdesu/sudlg.cpp
|
||||||
|
*** kdebase.ORI/kdesu/kdesu/sudlg.cpp 2010-12-17 22:55:07.725798945 +0100
|
||||||
|
--- kdebase/kdesu/kdesu/sudlg.cpp 2010-12-17 22:55:49.378797283 +0100
|
||||||
|
***************
|
||||||
|
*** 15,21 ****
|
||||||
|
#include "sudlg.h"
|
||||||
|
|
||||||
|
KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton)
|
||||||
|
! : KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon)
|
||||||
|
{
|
||||||
|
KConfig* config = KGlobal::config();
|
||||||
|
config->setGroup("super-user-command");
|
||||||
|
--- 15,21 ----
|
||||||
|
#include "sudlg.h"
|
||||||
|
|
||||||
|
KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton)
|
||||||
|
! : KPasswordDialog(Password, enableKeep, 0, icon)
|
||||||
|
{
|
||||||
|
KConfig* config = KGlobal::config();
|
||||||
|
config->setGroup("super-user-command");
|
||||||
|
***************
|
||||||
|
*** 34,45 ****
|
||||||
|
} else {
|
||||||
|
if (m_User == "root") {
|
||||||
|
prompt = i18n("The action you requested needs root privileges. "
|
||||||
|
! "Please enter root's password below or click "
|
||||||
|
! "Ignore to continue with your current privileges.");
|
||||||
|
} else {
|
||||||
|
prompt = i18n("The action you requested needs additional privileges. "
|
||||||
|
! "Please enter the password for \"%1\" below or click "
|
||||||
|
! "Ignore to continue with your current privileges.").arg(m_User);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
setPrompt(prompt);
|
||||||
|
--- 34,43 ----
|
||||||
|
} else {
|
||||||
|
if (m_User == "root") {
|
||||||
|
prompt = i18n("The action you requested needs root privileges. "
|
||||||
|
! "Please enter root's password below.");
|
||||||
|
} else {
|
||||||
|
prompt = i18n("The action you requested needs additional privileges. "
|
||||||
|
! "Please enter the password for \"%1\" below.").arg(m_User);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
setPrompt(prompt);
|
@ -0,0 +1,29 @@
|
|||||||
|
Index: kdebase/kcontrol/iccconfig/iccconfig.cpp
|
||||||
|
===================================================================
|
||||||
|
--- kdebase/kcontrol/iccconfig/iccconfig.cpp (revision 1220926)
|
||||||
|
+++ kdebase/kcontrol/iccconfig/iccconfig.cpp (revision 1220927)
|
||||||
|
@@ -286,7 +286,7 @@
|
||||||
|
base->deleteProfileButton->setFixedWidth(90);
|
||||||
|
|
||||||
|
XRROutputInfo *output_info;
|
||||||
|
- KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI::KRandrSimpleAPI();
|
||||||
|
+ KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI();
|
||||||
|
|
||||||
|
config->setReadDefaults( useDefaults );
|
||||||
|
|
||||||
|
@@ -356,7 +356,7 @@
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
int j;
|
||||||
|
- KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI::KRandrSimpleAPI();
|
||||||
|
+ KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI();
|
||||||
|
|
||||||
|
// Write system configuration
|
||||||
|
systemconfig->setGroup(NULL);
|
||||||
|
@@ -408,4 +408,4 @@
|
||||||
|
" for a more lifelike and vibrant image.");
|
||||||
|
}
|
||||||
|
|
||||||
|
-#include "iccconfig.moc"
|
||||||
|
\ No newline at end of file
|
||||||
|
+#include "iccconfig.moc"
|
@ -0,0 +1,19 @@
|
|||||||
|
*** kdebase/ksmserver/shutdowndlg.cpp.ORI 2011-08-23 21:42:55.206965177 +0200
|
||||||
|
--- kdebase/ksmserver/shutdowndlg.cpp 2011-08-23 21:43:26.429965029 +0200
|
||||||
|
***************
|
||||||
|
*** 80,86 ****
|
||||||
|
{
|
||||||
|
DCOPRef("kicker", "KMenu").call("hideMenu"); // Make sure the K Menu is completely removed from the screen before taking a snapshot...
|
||||||
|
m_grayImage = TQPixmap::grabWindow(qt_xrootwin(), 0, 0, TQApplication::desktop()->width(), TQApplication::desktop()->height()).convertToImage();
|
||||||
|
! m_unfadedImage = TQImage::TQImage();
|
||||||
|
resize(0, 0);
|
||||||
|
setShown(true);
|
||||||
|
TQTimer::singleShot( 500, this, TQT_SLOT( slotPaintEffect() ) );
|
||||||
|
--- 80,86 ----
|
||||||
|
{
|
||||||
|
DCOPRef("kicker", "KMenu").call("hideMenu"); // Make sure the K Menu is completely removed from the screen before taking a snapshot...
|
||||||
|
m_grayImage = TQPixmap::grabWindow(qt_xrootwin(), 0, 0, TQApplication::desktop()->width(), TQApplication::desktop()->height()).convertToImage();
|
||||||
|
! m_unfadedImage = TQImage();
|
||||||
|
resize(0, 0);
|
||||||
|
setShown(true);
|
||||||
|
TQTimer::singleShot( 500, this, TQT_SLOT( slotPaintEffect() ) );
|
@ -0,0 +1,20 @@
|
|||||||
|
diff -rcb kdebase/ksmserver/shutdowndlg.h kdebase.patch/ksmserver/shutdowndlg.h
|
||||||
|
*** kdebase/ksmserver/shutdowndlg.h Sat Sep 25 23:33:51 2010
|
||||||
|
--- kdebase.patch/ksmserver/shutdowndlg.h Thu Dec 9 14:58:43 2010
|
||||||
|
***************
|
||||||
|
*** 32,38 ****
|
||||||
|
|
||||||
|
/* We acknowledge the the dbus API is unstable */
|
||||||
|
#define DBUS_API_SUBJECT_TO_CHANGE
|
||||||
|
! #include <dbus/connection.h>
|
||||||
|
#include <libhal.h>
|
||||||
|
|
||||||
|
// The (singleton) widget that makes/fades the desktop gray.
|
||||||
|
--- 32,38 ----
|
||||||
|
|
||||||
|
/* We acknowledge the the dbus API is unstable */
|
||||||
|
#define DBUS_API_SUBJECT_TO_CHANGE
|
||||||
|
! #include <dbus/dbus.h>
|
||||||
|
#include <libhal.h>
|
||||||
|
|
||||||
|
// The (singleton) widget that makes/fades the desktop gray.
|
@ -0,0 +1,45 @@
|
|||||||
|
diff -rcb kdebase.ORI/kdesu/kdesu/sudlg.cpp kdebase/kdesu/kdesu/sudlg.cpp
|
||||||
|
*** kdebase.ORI/kdesu/kdesu/sudlg.cpp 2010-12-17 22:55:07.725798945 +0100
|
||||||
|
--- kdebase/kdesu/kdesu/sudlg.cpp 2010-12-17 22:55:49.378797283 +0100
|
||||||
|
***************
|
||||||
|
*** 15,21 ****
|
||||||
|
#include "sudlg.h"
|
||||||
|
|
||||||
|
KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton)
|
||||||
|
! : KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon)
|
||||||
|
{
|
||||||
|
KConfig* config = KGlobal::config();
|
||||||
|
config->setGroup("super-user-command");
|
||||||
|
--- 15,21 ----
|
||||||
|
#include "sudlg.h"
|
||||||
|
|
||||||
|
KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton)
|
||||||
|
! : KPasswordDialog(Password, enableKeep, 0, icon)
|
||||||
|
{
|
||||||
|
KConfig* config = KGlobal::config();
|
||||||
|
config->setGroup("super-user-command");
|
||||||
|
***************
|
||||||
|
*** 34,45 ****
|
||||||
|
} else {
|
||||||
|
if (m_User == "root") {
|
||||||
|
prompt = i18n("The action you requested needs root privileges. "
|
||||||
|
! "Please enter root's password below or click "
|
||||||
|
! "Ignore to continue with your current privileges.");
|
||||||
|
} else {
|
||||||
|
prompt = i18n("The action you requested needs additional privileges. "
|
||||||
|
! "Please enter the password for \"%1\" below or click "
|
||||||
|
! "Ignore to continue with your current privileges.").arg(static_cast<const char *>(m_User));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
setPrompt(prompt);
|
||||||
|
--- 34,43 ----
|
||||||
|
} else {
|
||||||
|
if (m_User == "root") {
|
||||||
|
prompt = i18n("The action you requested needs root privileges. "
|
||||||
|
! "Please enter root's password below.");
|
||||||
|
} else {
|
||||||
|
prompt = i18n("The action you requested needs additional privileges. "
|
||||||
|
! "Please enter the password for \"%1\" below.").arg(static_cast<const char *>(m_User));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
setPrompt(prompt);
|
@ -0,0 +1,9 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# This stupid scripts prevent the launch of 'plasma-desktop'
|
||||||
|
# (from KDE4) alongside with TDE.
|
||||||
|
|
||||||
|
case "${DESKTOP_SESSION}" in
|
||||||
|
"kde3"|"trinity"|"TDE") ;;
|
||||||
|
*) exec /usr/bin/plasma-desktop;;
|
||||||
|
esac
|
@ -0,0 +1,507 @@
|
|||||||
|
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
|
||||||
|
%if "%{?_prefix}" != "/usr"
|
||||||
|
%define _variant .opt
|
||||||
|
%define _libdir %{_prefix}/lib
|
||||||
|
%define _docdir %{_prefix}/share/doc
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
Name: trinity-kdebase
|
||||||
|
Version: 3.5.12
|
||||||
|
Release: 9%{?dist}%{?_variant}
|
||||||
|
License: GPL
|
||||||
|
Vendor: Trinity Project
|
||||||
|
Packager: Thales Communications
|
||||||
|
Summary: Trinity KDE Base Programs
|
||||||
|
|
||||||
|
Prefix: %{_prefix}
|
||||||
|
|
||||||
|
Source0: http://mirror3.tokra.lv/releases/3.5.12/kdebase-3.5.12.tar.gz
|
||||||
|
|
||||||
|
# Wrapper script to prevent Plasma launch at Trinity Startup
|
||||||
|
Source1: plasma-desktop
|
||||||
|
|
||||||
|
# TDE Official patches (from SVN), unmodified
|
||||||
|
# [kdebase/kcontrol] fix for openssl 1.0
|
||||||
|
Patch1: http://www.trinitydesktop.org/patches/r1201523.diff
|
||||||
|
# [kdebase/kcontrol] make it compatible with openssl < 1.0
|
||||||
|
Patch2: http://www.trinitydesktop.org/patches/r1201705.diff
|
||||||
|
# Fix My Documents shortcut on desktop
|
||||||
|
Patch4: http://www.trinitydesktop.org/patches/r1182808.diff
|
||||||
|
# [kdebase] fixed an incompatibility with gcc 4.5
|
||||||
|
Patch8: http://www.trinitydesktop.org/patches/r1221326.diff
|
||||||
|
|
||||||
|
# TDE Official patches (from SVN), modified
|
||||||
|
# [kdebase/ksmserver/shutdowndlg.cpp] Fixed invalid constructor per GCC 4.5.2
|
||||||
|
Patch7: kdebase-3.5.12-r1220975.patch
|
||||||
|
# [kdebase] Another invalid constructor per gcc 4.5
|
||||||
|
Patch9: kdebase-3.5.12-r1220927.patch
|
||||||
|
|
||||||
|
# TDE for RHEL/Fedora specific patches
|
||||||
|
# Fix for DBUS include files in RHEL6
|
||||||
|
Patch0: kdebase-3.5.12-shutdowndlg-dbus-include.patch
|
||||||
|
# [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
|
||||||
|
Patch3: kdebase-3.5.12-kdesu-noignorebutton.patch
|
||||||
|
# [kdebase/kdesktop] Modifies "open terminal here" on desktop
|
||||||
|
Patch5: kdebase-3.5.12-desktop-openterminalhere.patch
|
||||||
|
# [kdebase/kioslave]: Forces HAL backend to use HAL mount options
|
||||||
|
Patch6: kdebase-3.5.12-halmountoptions.patch
|
||||||
|
|
||||||
|
BuildRequires: tqtinterface-devel
|
||||||
|
BuildRequires: trinity-arts-devel
|
||||||
|
BuildRequires: trinity-kdelibs-devel
|
||||||
|
BuildRequires: qt3-devel >= 3.3.8b
|
||||||
|
BuildRequires: openssl-devel
|
||||||
|
BuildRequires: avahi-devel avahi-qt3-devel
|
||||||
|
BuildRequires: imake
|
||||||
|
BuildRequires: xorg-x11-proto-devel
|
||||||
|
BuildRequires: OpenEXR-devel
|
||||||
|
BuildRequires: libsmbclient-devel
|
||||||
|
BuildRequires: dbus-devel dbus-qt-devel
|
||||||
|
BuildRequires: lm_sensors-devel
|
||||||
|
BuildRequires: libfontenc-devel
|
||||||
|
BuildRequires: hal-devel
|
||||||
|
BuildRequires: audiofile-devel
|
||||||
|
BuildRequires: jack-audio-connection-kit-devel
|
||||||
|
BuildRequires: libraw1394-devel
|
||||||
|
BuildRequires: openldap-devel
|
||||||
|
BuildRequires: libvorbis-devel
|
||||||
|
BuildRequires: pam-devel
|
||||||
|
BuildRequires: libXdmcp-devel
|
||||||
|
BuildRequires: libxkbfile-devel
|
||||||
|
|
||||||
|
Requires: tqtinterface
|
||||||
|
Requires: trinity-arts
|
||||||
|
Requires: trinity-kdelibs
|
||||||
|
Requires: qt3 >= 3.3.8b
|
||||||
|
Requires: openssl
|
||||||
|
Requires: avahi avahi-qt3
|
||||||
|
|
||||||
|
|
||||||
|
# RHEL 6 Configuration files are provided in separate packages
|
||||||
|
%if "%{?_prefix}" == "/usr"
|
||||||
|
Requires: kde-settings-kdm
|
||||||
|
%endif
|
||||||
|
Requires: redhat-menus
|
||||||
|
|
||||||
|
%description
|
||||||
|
Core applications for the Trinity K Desktop Environment. Included are: kdm
|
||||||
|
(replacement for xdm), kwin (window manager), konqueror (filemanager,
|
||||||
|
web browser, ftp client, ...), konsole (xterm replacement), kpanel
|
||||||
|
(application starter and desktop pager), kaudio (audio server),
|
||||||
|
kdehelp (viewer for kde help files, info and man pages), kthememgr
|
||||||
|
(system for managing alternate theme packages) plus other KDE
|
||||||
|
components (kcheckpass, kikbd, kscreensaver, kcontrol, kfind,
|
||||||
|
kfontmanager, kmenuedit).
|
||||||
|
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Requires: %{name}
|
||||||
|
Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
Requires: trinity-kdelibs-devel
|
||||||
|
Summary: %{summary} - Development files
|
||||||
|
%if "%{?_prefix}" == "/usr"
|
||||||
|
Obsoletes: kdebase3-devel
|
||||||
|
%endif
|
||||||
|
Group: Development/Libraries
|
||||||
|
%description devel
|
||||||
|
Header files for developing applications using %{name}.
|
||||||
|
Install kdebase-devel if you want to develop or compile Konqueror,
|
||||||
|
Kate plugins or KWin styles.
|
||||||
|
|
||||||
|
|
||||||
|
%package extras
|
||||||
|
Summary: Extra applications from %{name}
|
||||||
|
Group: User Interface/Desktops
|
||||||
|
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
%description extras
|
||||||
|
%{summary}, including:
|
||||||
|
* kappfinder
|
||||||
|
* kpager
|
||||||
|
* ktip
|
||||||
|
* kpersonalizer
|
||||||
|
|
||||||
|
|
||||||
|
%package libs
|
||||||
|
Summary: %{name} runtime libraries
|
||||||
|
Group: System Environment/Libraries
|
||||||
|
Requires: trinity-kdelibs >= %{version}
|
||||||
|
%if "%{?_prefix}" == "/usr"
|
||||||
|
Obsoletes: kdebase3-libs
|
||||||
|
%endif
|
||||||
|
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
%description libs
|
||||||
|
%{summary}
|
||||||
|
|
||||||
|
|
||||||
|
%package pim-ioslaves
|
||||||
|
Summary: PIM KIOslaves from %{name}
|
||||||
|
Group: System Environment/Libraries
|
||||||
|
%description pim-ioslaves
|
||||||
|
Protocol handlers (KIOslaves) for personal information management, including:
|
||||||
|
* kio_ldap
|
||||||
|
* kio_nntp
|
||||||
|
* kio_pop3
|
||||||
|
* kio_smtp
|
||||||
|
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -n kdebase
|
||||||
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
%patch4 -p1
|
||||||
|
%patch5 -p1
|
||||||
|
%patch6 -p1
|
||||||
|
%patch7 -p1
|
||||||
|
%patch8 -p1
|
||||||
|
%patch9 -p1
|
||||||
|
|
||||||
|
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
|
||||||
|
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
|
||||||
|
%__make -f admin/Makefile.common
|
||||||
|
|
||||||
|
%build
|
||||||
|
unset QTDIR || : ; . /etc/profile.d/qt.sh
|
||||||
|
export PATH="%{_bindir}:${PATH}"
|
||||||
|
export LDFLAGS="-L%{_libdir} -I%{_includedir}"
|
||||||
|
export IMAKEINCLUDE="-I/usr/share/X11/config"
|
||||||
|
|
||||||
|
%configure \
|
||||||
|
--disable-rpath \
|
||||||
|
--enable-new-ldflags \
|
||||||
|
--disable-dependency-tracking \
|
||||||
|
--disable-debug --disable-warnings --enable-final \
|
||||||
|
--with-pam=yes \
|
||||||
|
--with-kdm-pam=kdm \
|
||||||
|
--with-kcp-pam=kcheckpass \
|
||||||
|
--with-kss-pam=kscreensaver \
|
||||||
|
--with-libraw1394 \
|
||||||
|
--with-openexr \
|
||||||
|
--with-samba \
|
||||||
|
--with-xinerama \
|
||||||
|
--with-xscreensaver \
|
||||||
|
--without-shadow \
|
||||||
|
--with-extra-includes=%{_includedir}/tqt
|
||||||
|
|
||||||
|
# Do NOT use %{?_smp_mflags} for this package, or it will fail to build !
|
||||||
|
%__make
|
||||||
|
|
||||||
|
%install
|
||||||
|
%__rm -rf %{?buildroot}
|
||||||
|
%__mkdir_p %{?buildroot}
|
||||||
|
%make_install
|
||||||
|
|
||||||
|
# Adds a GDM/KDM/XDM session called 'TDE'
|
||||||
|
%if "%{?_prefix}" != "/usr"
|
||||||
|
%__mkdir_p "%{?buildroot}%{_usr}/share/xsessions"
|
||||||
|
install -m 644 "%{?buildroot}%{_datadir}/apps/kdm/sessions/kde.desktop" "%{?buildroot}%{_usr}/share/xsessions/tde.desktop"
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Modifies 'startkde' to set KDEDIR and KDEHOME hardcoded specific for TDE
|
||||||
|
sed -i "%{?buildroot}%{_bindir}/startkde" \
|
||||||
|
-e '/^echo "\[startkde\] Starting startkde.".*/ s,$,\nexport KDEDIR=%{_prefix}\nexport KDEHOME=~/.trinity,'
|
||||||
|
|
||||||
|
# Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard'
|
||||||
|
mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
|
||||||
|
|
||||||
|
# TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
|
||||||
|
%if "%{?_prefix}" != "/usr"
|
||||||
|
%{__cp} -f "%{SOURCE1}" "%{?buildroot}%{_bindir}"
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%clean
|
||||||
|
%__rm -rf %{?buildroot}
|
||||||
|
|
||||||
|
|
||||||
|
%post
|
||||||
|
touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
|
gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
|
update-desktop-database 2> /dev/null || :
|
||||||
|
# Dirty hack to install '/etc/ksysguardrc' alongside with KDE4
|
||||||
|
[ -r %{_sysconfdir}/ksysguarddrc ] || cp -f %{_sysconfdir}/ksysguarddrc.tde %{_sysconfdir}/ksysguarddrc
|
||||||
|
|
||||||
|
%postun
|
||||||
|
touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
|
gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
|
update-desktop-database 2> /dev/null || :
|
||||||
|
|
||||||
|
|
||||||
|
%post libs -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%postun libs -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%post extras
|
||||||
|
for f in crystalsvg hicolor ; do
|
||||||
|
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
|
||||||
|
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
|
||||||
|
done
|
||||||
|
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
|
||||||
|
|
||||||
|
%postun extras
|
||||||
|
for f in crystalsvg hicolor ; do
|
||||||
|
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
|
||||||
|
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
|
||||||
|
done
|
||||||
|
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
|
||||||
|
|
||||||
|
|
||||||
|
%files extras
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
# kappfinder
|
||||||
|
%{_bindir}/kappfinder
|
||||||
|
%{_datadir}/applications/kde/kappfinder.desktop
|
||||||
|
%{_datadir}/applnk/System/kappfinder.desktop
|
||||||
|
%{_datadir}/apps/kappfinder/
|
||||||
|
%{_datadir}/icons/hicolor/*/apps/kappfinder.png
|
||||||
|
# ktip
|
||||||
|
%{_bindir}/ktip
|
||||||
|
%{_datadir}/applications/kde/ktip.desktop
|
||||||
|
%{_datadir}/applnk/Toys/ktip.desktop
|
||||||
|
%{_datadir}/apps/kdewizard
|
||||||
|
%{_datadir}/autostart/ktip.desktop
|
||||||
|
%{_datadir}/icons/hicolor/*/apps/ktip*
|
||||||
|
# kpersonalizer
|
||||||
|
%{_bindir}/kpersonalizer
|
||||||
|
%{_datadir}/applications/kde/kpersonalizer.desktop
|
||||||
|
%{_datadir}/applnk/System/kpersonalizer.desktop
|
||||||
|
%{_datadir}/apps/kpersonalizer/
|
||||||
|
%{_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
|
||||||
|
# kpager
|
||||||
|
%{_bindir}/kpager
|
||||||
|
%{_datadir}/applications/kde/kpager.desktop
|
||||||
|
%{_datadir}/applnk/Utilities/kpager.desktop
|
||||||
|
%{_datadir}/icons/hicolor/*/apps/kpager.png
|
||||||
|
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
# kappfinder
|
||||||
|
%exclude %{_datadir}/applications/kde/kappfinder.desktop
|
||||||
|
%exclude %{_datadir}/applnk/System/kappfinder.desktop
|
||||||
|
%exclude %{_datadir}/apps/kappfinder/
|
||||||
|
%exclude %{_datadir}/icons/hicolor/*/apps/kappfinder.png
|
||||||
|
# ktip
|
||||||
|
%exclude %{_datadir}/applications/kde/ktip.desktop
|
||||||
|
%exclude %{_datadir}/applnk/Toys/ktip.desktop
|
||||||
|
%exclude %{_datadir}/apps/kdewizard
|
||||||
|
%exclude %{_datadir}/autostart/ktip.desktop
|
||||||
|
%exclude %{_datadir}/icons/hicolor/*/apps/ktip*
|
||||||
|
# kpersonalizer
|
||||||
|
%exclude %{_datadir}/applications/kde/kpersonalizer.desktop
|
||||||
|
%exclude %{_datadir}/applnk/System/kpersonalizer.desktop
|
||||||
|
%exclude %{_datadir}/apps/kpersonalizer/
|
||||||
|
%exclude %{_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
|
||||||
|
# kpager
|
||||||
|
%exclude %{_datadir}/applications/kde/kpager.desktop
|
||||||
|
%exclude %{_datadir}/applnk/Utilities/kpager.desktop
|
||||||
|
%exclude %{_datadir}/icons/hicolor/*/apps/kpager.png
|
||||||
|
|
||||||
|
%doc AUTHORS COPYING README
|
||||||
|
%{_docdir}/HTML/en/*
|
||||||
|
%config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
|
||||||
|
%{_bindir}/genkdmconf
|
||||||
|
%{_bindir}/kaccess
|
||||||
|
%{_bindir}/kapplymousetheme
|
||||||
|
%{_bindir}/kate
|
||||||
|
%{_bindir}/kblankscrn.kss
|
||||||
|
%{_bindir}/kbookmarkmerger
|
||||||
|
%{_bindir}/kcminit
|
||||||
|
%{_bindir}/kcminit_startup
|
||||||
|
%{_bindir}/kcontrol
|
||||||
|
%{_bindir}/kcontroledit
|
||||||
|
%{_bindir}/kdebugdialog
|
||||||
|
%{_bindir}/kdeinstallktheme
|
||||||
|
%{_bindir}/kdepasswd
|
||||||
|
%{_bindir}/kdesu
|
||||||
|
%attr(0755,root,root) %{_bindir}/kdesud
|
||||||
|
%{_bindir}/kdialog
|
||||||
|
%{_bindir}/kdm
|
||||||
|
%{_bindir}/kdmctl
|
||||||
|
%{_bindir}/keditbookmarks
|
||||||
|
%{_bindir}/keditfiletype
|
||||||
|
%{_bindir}/kfind
|
||||||
|
%{_bindir}/kfmclient
|
||||||
|
%{_bindir}/khelpcenter
|
||||||
|
%{_bindir}/khotkeys
|
||||||
|
%{_bindir}/kinfocenter
|
||||||
|
%{_bindir}/klipper
|
||||||
|
%{_bindir}/kmenuedit
|
||||||
|
%{_bindir}/konqueror
|
||||||
|
%{_bindir}/konsole
|
||||||
|
%{_bindir}/krandom.kss
|
||||||
|
%{_bindir}/krandrtray
|
||||||
|
%{_bindir}/krdb
|
||||||
|
%{_bindir}/kreadconfig
|
||||||
|
%{_bindir}/ksmserver
|
||||||
|
%{_bindir}/ksplashsimple
|
||||||
|
%{_bindir}/kstart
|
||||||
|
%{_bindir}/ksysguard
|
||||||
|
%{_bindir}/ksysguardd
|
||||||
|
%{_bindir}/ksystraycmd
|
||||||
|
%{_bindir}/ktrash
|
||||||
|
%{_bindir}/kwin
|
||||||
|
%{_bindir}/kwin_killer_helper
|
||||||
|
%{_bindir}/kwin_rules_dialog
|
||||||
|
%{_bindir}/kwrite
|
||||||
|
%{_bindir}/kwriteconfig
|
||||||
|
%{_bindir}/kxkb
|
||||||
|
%{_bindir}/nspluginscan
|
||||||
|
%{_bindir}/nspluginviewer
|
||||||
|
%{_bindir}/startkde
|
||||||
|
%{_bindir}/kcheckrunning
|
||||||
|
%{_bindir}/kdesktop
|
||||||
|
%{_bindir}/kdesktop_lock
|
||||||
|
%{_bindir}/kdm_config
|
||||||
|
%{_bindir}/kdm_greet
|
||||||
|
%{_bindir}/kfontinst
|
||||||
|
%{_bindir}/kfontview
|
||||||
|
%{_bindir}/krootimage
|
||||||
|
%{_bindir}/kwebdesktop
|
||||||
|
%{_datadir}/autostart/*
|
||||||
|
%{_datadir}/desktop-directories/*
|
||||||
|
%{_datadir}/locale/*/entry.desktop
|
||||||
|
%{_datadir}/locale/l10n
|
||||||
|
%{_datadir}/templates/*
|
||||||
|
%{_datadir}/templates/.source/*
|
||||||
|
%{_datadir}/wallpapers/*
|
||||||
|
%{_bindir}/appletproxy
|
||||||
|
%{_bindir}/drkonqi
|
||||||
|
%{_bindir}/extensionproxy
|
||||||
|
%{_bindir}/kasbar
|
||||||
|
%attr(4755,root,root) %{_bindir}/kcheckpass
|
||||||
|
%{_bindir}/kdeeject
|
||||||
|
%{_bindir}/khc_docbookdig.pl
|
||||||
|
%{_bindir}/khc_htdig.pl
|
||||||
|
%{_bindir}/khc_htsearch.pl
|
||||||
|
%{_bindir}/khc_indexbuilder
|
||||||
|
%{_bindir}/khc_mansearch.pl
|
||||||
|
%{_bindir}/kicker
|
||||||
|
%{_bindir}/knetattach
|
||||||
|
%{_bindir}/kompmgr
|
||||||
|
%{_bindir}/kpm
|
||||||
|
%{_bindir}/ksplash
|
||||||
|
%{_libdir}/kconf_update_bin
|
||||||
|
%{_datadir}/applnk/*.desktop
|
||||||
|
%{_datadir}/applnk/*/*
|
||||||
|
%{_datadir}/applnk/.hidden/*
|
||||||
|
%exclude %{_datadir}/applnk/.hidden/.directory
|
||||||
|
%{_datadir}/config.kcfg/*
|
||||||
|
%{_bindir}/kde3
|
||||||
|
%{_bindir}/kio_media_mounthelper
|
||||||
|
%{_bindir}/kdcop
|
||||||
|
%{_bindir}/kdeprintfax
|
||||||
|
%{_bindir}/khc_beagle_index.pl
|
||||||
|
%{_bindir}/khc_beagle_search.pl
|
||||||
|
%{_bindir}/kxdglauncher
|
||||||
|
%{_bindir}/kjobviewer
|
||||||
|
%{_bindir}/klocaldomainurifilterhelper
|
||||||
|
%{_bindir}/kprinter
|
||||||
|
%{_datadir}/applications/*/*
|
||||||
|
%exclude %{_datadir}/applications/kde/display.desktop
|
||||||
|
%{_datadir}/apps/*
|
||||||
|
%exclude %{_datadir}/fonts/override/fonts.dir
|
||||||
|
%{_datadir}/icons/*color/*/*/*
|
||||||
|
%{_datadir}/icons/crystalsvg/*/*/*
|
||||||
|
%{_datadir}/mimelnk/*/*
|
||||||
|
%{_datadir}/services/*
|
||||||
|
%{_datadir}/servicetypes/*
|
||||||
|
%{_datadir}/sounds/*
|
||||||
|
%{_docdir}/kdm/README
|
||||||
|
%{_libdir}/kde3/*
|
||||||
|
%{_libdir}/libkdeinit_*.*
|
||||||
|
%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
|
||||||
|
%{_sysconfdir}/xdg/menus/kde-information.menu
|
||||||
|
%{_sysconfdir}/xdg/menus/kde-screensavers.menu
|
||||||
|
%{_sysconfdir}/xdg/menus/kde-settings.menu
|
||||||
|
/usr/share/xsessions/*.desktop
|
||||||
|
# Remove conflicts with redhat-menus
|
||||||
|
%if "%{?_prefix}" != "/usr"
|
||||||
|
%{_bindir}/plasma-desktop
|
||||||
|
%config(noreplace) %{_datadir}/config/*
|
||||||
|
%else
|
||||||
|
%exclude %{_datadir}/config
|
||||||
|
%endif
|
||||||
|
# exclude pim-ioslaves files from main package
|
||||||
|
%exclude %{_libdir}/kde3/kio_ldap.*
|
||||||
|
%exclude %{_libdir}/kde3/kio_nntp.*
|
||||||
|
%exclude %{_libdir}/kde3/kio_pop3.*
|
||||||
|
%exclude %{_libdir}/kde3/kio_smtp.*
|
||||||
|
%exclude %{_datadir}/services/ldap*.protocol
|
||||||
|
%exclude %{_datadir}/services/nntp*.protocol
|
||||||
|
%exclude %{_datadir}/services/pop3*.protocol
|
||||||
|
%exclude %{_datadir}/services/smtp*.protocol
|
||||||
|
|
||||||
|
%files libs
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%exclude %{_libdir}/libkdeinit_*.*
|
||||||
|
%{_libdir}/lib*.so.*
|
||||||
|
%{_libdir}/lib*.la
|
||||||
|
|
||||||
|
%files pim-ioslaves
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%{_libdir}/kde3/kio_ldap.*
|
||||||
|
%{_libdir}/kde3/kio_nntp.*
|
||||||
|
%{_libdir}/kde3/kio_pop3.*
|
||||||
|
%{_libdir}/kde3/kio_smtp.*
|
||||||
|
%{_datadir}/services/ldap*.protocol
|
||||||
|
%{_datadir}/services/nntp*.protocol
|
||||||
|
%{_datadir}/services/pop3*.protocol
|
||||||
|
%{_datadir}/services/smtp*.protocol
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%{_includedir}/*.h
|
||||||
|
%dir %{_includedir}/kate
|
||||||
|
%{_includedir}/kate/*
|
||||||
|
%dir %{_includedir}/kwin
|
||||||
|
%{_includedir}/kwin/*
|
||||||
|
%dir %{_includedir}/ksgrd
|
||||||
|
%{_includedir}/ksgrd/*
|
||||||
|
%dir %{_includedir}/ksplash
|
||||||
|
%{_includedir}/ksplash/*
|
||||||
|
%{_libdir}/lib*.so
|
||||||
|
%exclude %{_libdir}/libkdeinit_*.*
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-9
|
||||||
|
- Import to GIT
|
||||||
|
|
||||||
|
* Tue Aug 23 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-8
|
||||||
|
- Add missing BuildRequires
|
||||||
|
- Add Patch7, Patch8, Patch9 to allow compilation under GCC >= 4.5.2
|
||||||
|
|
||||||
|
* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
|
||||||
|
- Correct macro to install under "/opt", if desired
|
||||||
|
|
||||||
|
* Wed Jul 20 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
|
||||||
|
- Add patch to force halbackend to use HAL-provided mount options
|
||||||
|
|
||||||
|
* Wed Jul 20 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
|
||||||
|
- Add patch to modify "Open terminal here" shortcut (now opens in home directory)
|
||||||
|
|
||||||
|
* Tue Jul 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
|
||||||
|
- Add 'BuildRequires: dbus-qt' to enable HAL support
|
||||||
|
|
||||||
|
* Wed Jun 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
|
||||||
|
- Adds setuid bit on '/usr/bin/kcheckpass'
|
||||||
|
- Removes '/usr/share/applications/kde/display.desktop' (does not work on RHEL 6.0)
|
||||||
|
|
||||||
|
* Mon Dec 20 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
|
||||||
|
- Add missing Requires
|
||||||
|
- Rename 'kde3.desktop' to 'kde.desktop' in case of default prefix
|
||||||
|
|
||||||
|
* Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
|
||||||
|
- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/kde3)
|
||||||
|
- Add '--with-extra-includes=%{_includedir}/tqt'
|
||||||
|
- Add 'patch3' to remove ignore button on kdesu dialog box
|
||||||
|
- Add 'patch4' r1182808.diff : Fix My Documents shortcut on desktop
|
||||||
|
|
||||||
|
* Wed Dec 14 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
|
||||||
|
- Initial version
|
||||||
|
- Add script 'plasma-desktop' to prevent KDE4 plasma automatic startup
|
||||||
|
- Add 'patch0' to fix for DBUS include files in RHEL6
|
||||||
|
- Add 'patch1' r1201523.diff : [kdebase/kcontrol] fix for openssl 1.0
|
||||||
|
- Add 'patch2' r1201705.diff : [kdebase/kcontrol] make it compatible with openssl < 1.0
|
||||||
|
|
@ -0,0 +1,450 @@
|
|||||||
|
# Default version for this component
|
||||||
|
%if "%{?version}" == ""
|
||||||
|
%define version 3.5.13
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
|
||||||
|
%if "%{?_prefix}" != "/usr"
|
||||||
|
%define _variant .opt
|
||||||
|
%define _libdir %{_prefix}/lib
|
||||||
|
%define _docdir %{_prefix}/share/doc
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
Name: trinity-kdebase
|
||||||
|
Version: %{version}
|
||||||
|
Release: 0%{?dist}%{?_variant}
|
||||||
|
License: GPL
|
||||||
|
Vendor: Trinity Project
|
||||||
|
Packager: Francois Andriot <francois.andriot@free.fr>
|
||||||
|
Summary: Trinity KDE Base Programs
|
||||||
|
|
||||||
|
Prefix: %{_prefix}
|
||||||
|
|
||||||
|
Source0: kdebase-%{version}.tar.gz
|
||||||
|
|
||||||
|
# TDE for RHEL/Fedora specific patches
|
||||||
|
# [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
|
||||||
|
Patch3: kdebase-3.5.13-kdesu-noignorebutton.patch
|
||||||
|
# [kdebase/kdesktop] Modifies "open terminal here" on desktop
|
||||||
|
Patch5: kdebase-3.5.12-desktop-openterminalhere.patch
|
||||||
|
# [kdebase/kioslave]: Forces HAL backend to use HAL mount options
|
||||||
|
Patch6: kdebase-3.5.12-halmountoptions.patch
|
||||||
|
|
||||||
|
BuildRequires: tqtinterface-devel
|
||||||
|
BuildRequires: trinity-arts-devel
|
||||||
|
BuildRequires: trinity-kdelibs-devel
|
||||||
|
BuildRequires: qt3-devel >= 3.3.8d
|
||||||
|
BuildRequires: openssl-devel
|
||||||
|
BuildRequires: avahi-devel avahi-qt3-devel
|
||||||
|
BuildRequires: imake
|
||||||
|
BuildRequires: xorg-x11-proto-devel
|
||||||
|
BuildRequires: OpenEXR-devel
|
||||||
|
BuildRequires: libsmbclient-devel
|
||||||
|
BuildRequires: dbus-devel dbus-qt-devel
|
||||||
|
BuildRequires: lm_sensors-devel
|
||||||
|
BuildRequires: libfontenc-devel
|
||||||
|
BuildRequires: hal-devel
|
||||||
|
BuildRequires: audiofile-devel
|
||||||
|
BuildRequires: jack-audio-connection-kit-devel
|
||||||
|
BuildRequires: libraw1394-devel
|
||||||
|
BuildRequires: openldap-devel
|
||||||
|
BuildRequires: libvorbis-devel
|
||||||
|
BuildRequires: pam-devel
|
||||||
|
BuildRequires: libXdmcp-devel
|
||||||
|
BuildRequires: libxkbfile-devel
|
||||||
|
BuildRequires: dbus-tqt-devel
|
||||||
|
|
||||||
|
Requires: tqtinterface
|
||||||
|
Requires: trinity-arts
|
||||||
|
Requires: trinity-kdelibs
|
||||||
|
Requires: qt3 >= 3.3.8d
|
||||||
|
Requires: openssl
|
||||||
|
Requires: avahi avahi-qt3
|
||||||
|
Requires: dbus-tqt
|
||||||
|
|
||||||
|
|
||||||
|
# RHEL 6 Configuration files are provided in separate packages
|
||||||
|
%if "%{?_prefix}" == "/usr"
|
||||||
|
Requires: kde-settings-kdm
|
||||||
|
%endif
|
||||||
|
Requires: redhat-menus
|
||||||
|
|
||||||
|
%description
|
||||||
|
Core applications for the Trinity K Desktop Environment. Included are: kdm
|
||||||
|
(replacement for xdm), kwin (window manager), konqueror (filemanager,
|
||||||
|
web browser, ftp client, ...), konsole (xterm replacement), kpanel
|
||||||
|
(application starter and desktop pager), kaudio (audio server),
|
||||||
|
kdehelp (viewer for kde help files, info and man pages), kthememgr
|
||||||
|
(system for managing alternate theme packages) plus other KDE
|
||||||
|
components (kcheckpass, kikbd, kscreensaver, kcontrol, kfind,
|
||||||
|
kfontmanager, kmenuedit).
|
||||||
|
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Requires: %{name}
|
||||||
|
Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
Requires: trinity-kdelibs-devel
|
||||||
|
Summary: %{summary} - Development files
|
||||||
|
%if "%{?_prefix}" == "/usr"
|
||||||
|
Obsoletes: kdebase3-devel
|
||||||
|
%endif
|
||||||
|
Group: Development/Libraries
|
||||||
|
%description devel
|
||||||
|
Header files for developing applications using %{name}.
|
||||||
|
Install kdebase-devel if you want to develop or compile Konqueror,
|
||||||
|
Kate plugins or KWin styles.
|
||||||
|
|
||||||
|
|
||||||
|
%package extras
|
||||||
|
Summary: Extra applications from %{name}
|
||||||
|
Group: User Interface/Desktops
|
||||||
|
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
%description extras
|
||||||
|
%{summary}, including:
|
||||||
|
* kappfinder
|
||||||
|
* kpager
|
||||||
|
* ktip
|
||||||
|
* kpersonalizer
|
||||||
|
|
||||||
|
|
||||||
|
%package libs
|
||||||
|
Summary: %{name} runtime libraries
|
||||||
|
Group: System Environment/Libraries
|
||||||
|
Requires: trinity-kdelibs >= %{version}
|
||||||
|
%if "%{?_prefix}" == "/usr"
|
||||||
|
Obsoletes: kdebase3-libs
|
||||||
|
%endif
|
||||||
|
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
%description libs
|
||||||
|
%{summary}
|
||||||
|
|
||||||
|
|
||||||
|
%package pim-ioslaves
|
||||||
|
Summary: PIM KIOslaves from %{name}
|
||||||
|
Group: System Environment/Libraries
|
||||||
|
%description pim-ioslaves
|
||||||
|
Protocol handlers (KIOslaves) for personal information management, including:
|
||||||
|
* kio_ldap
|
||||||
|
* kio_nntp
|
||||||
|
* kio_pop3
|
||||||
|
* kio_smtp
|
||||||
|
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -n kdebase
|
||||||
|
%patch3 -p1
|
||||||
|
%patch5 -p1
|
||||||
|
%patch6 -p1
|
||||||
|
|
||||||
|
|
||||||
|
%build
|
||||||
|
unset QTDIR || : ; . /etc/profile.d/qt.sh
|
||||||
|
export PATH="%{_bindir}:${PATH}"
|
||||||
|
export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
|
||||||
|
export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
|
||||||
|
export LD_LIBRARY_PATH="%{_libdir}"
|
||||||
|
|
||||||
|
%__mkdir build
|
||||||
|
cd build
|
||||||
|
%cmake \
|
||||||
|
-DWITH_SASL=ON \
|
||||||
|
-DWITH_LDAP=ON \
|
||||||
|
-DWITH_SAMBA=ON \
|
||||||
|
-DWITH_OPENEXR=ON \
|
||||||
|
-DWITH_XCOMPOSITE=ON \
|
||||||
|
-DWITH_XCURSOR=ON \
|
||||||
|
-DWITH_XFIXES=ON \
|
||||||
|
-DWITH_XRANDR=ON \
|
||||||
|
-DWITH_XRENDER=ON \
|
||||||
|
-DWITH_XDAMAGE=ON \
|
||||||
|
-DWITH_XEXT=ON \
|
||||||
|
-DWITH_LIBUSB=ON \
|
||||||
|
-DWITH_LIBRAW1394=ON \
|
||||||
|
-DWITH_PAM=ON \
|
||||||
|
-DWITH_SHADOW=OFF \
|
||||||
|
-DWITH_XDMCP=ON \
|
||||||
|
-DWITH_XINERAMA=ON \
|
||||||
|
-DWITH_ARTS=ON \
|
||||||
|
-DWITH_I8K=OFF \
|
||||||
|
-DWITH_HAL=ON \
|
||||||
|
-DBUILD_ALL=ON \
|
||||||
|
..
|
||||||
|
|
||||||
|
%__make %{?_smp_mflags}
|
||||||
|
|
||||||
|
%install
|
||||||
|
%__rm -rf %{?buildroot}
|
||||||
|
%__mkdir_p %{?buildroot}
|
||||||
|
%make_install -C build
|
||||||
|
|
||||||
|
# Adds a GDM/KDM/XDM session called 'TDE'
|
||||||
|
%if "%{?_prefix}" != "/usr"
|
||||||
|
%__mkdir_p "%{?buildroot}%{_usr}/share/xsessions"
|
||||||
|
install -m 644 "%{?buildroot}%{_datadir}/apps/kdm/sessions/tde.desktop" "%{?buildroot}%{_usr}/share/xsessions/tde.desktop"
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Modifies 'startkde' to set KDEDIR and KDEHOME hardcoded specific for TDE
|
||||||
|
sed -i "%{?buildroot}%{_bindir}/startkde" \
|
||||||
|
-e '/^echo "\[startkde\] Starting startkde.".*/ s,$,\nexport KDEDIR=%{_prefix}\nexport KDEHOME=~/.trinity,'
|
||||||
|
|
||||||
|
# Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard'
|
||||||
|
mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
|
||||||
|
|
||||||
|
%clean
|
||||||
|
%__rm -rf %{?buildroot}
|
||||||
|
|
||||||
|
|
||||||
|
%post
|
||||||
|
touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
|
gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
|
update-desktop-database 2> /dev/null || :
|
||||||
|
# Dirty hack to install '/etc/ksysguardrc' alongside with KDE4
|
||||||
|
[ -r %{_sysconfdir}/ksysguarddrc ] || cp -f %{_sysconfdir}/ksysguarddrc.tde %{_sysconfdir}/ksysguarddrc
|
||||||
|
|
||||||
|
%postun
|
||||||
|
touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
|
gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
|
update-desktop-database 2> /dev/null || :
|
||||||
|
|
||||||
|
|
||||||
|
%post libs -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%postun libs -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%post extras
|
||||||
|
for f in crystalsvg hicolor ; do
|
||||||
|
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
|
||||||
|
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
|
||||||
|
done
|
||||||
|
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
|
||||||
|
|
||||||
|
%postun extras
|
||||||
|
for f in crystalsvg hicolor ; do
|
||||||
|
touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
|
||||||
|
gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
|
||||||
|
done
|
||||||
|
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
|
||||||
|
|
||||||
|
|
||||||
|
%files extras
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
# kappfinder
|
||||||
|
%{_bindir}/kappfinder
|
||||||
|
%{_datadir}/applications/kde/kappfinder.desktop
|
||||||
|
%{_datadir}/applnk/System/kappfinder.desktop
|
||||||
|
%{_datadir}/apps/kappfinder/
|
||||||
|
%{_datadir}/icons/hicolor/*/apps/kappfinder.png
|
||||||
|
# ktip
|
||||||
|
%{_bindir}/ktip
|
||||||
|
%{_datadir}/applications/kde/ktip.desktop
|
||||||
|
%{_datadir}/applnk/Toys/ktip.desktop
|
||||||
|
%{_datadir}/apps/kdewizard
|
||||||
|
%{_datadir}/autostart/ktip.desktop
|
||||||
|
%{_datadir}/icons/hicolor/*/apps/ktip*
|
||||||
|
# kpersonalizer
|
||||||
|
%{_bindir}/kpersonalizer
|
||||||
|
%{_datadir}/applications/kde/kpersonalizer.desktop
|
||||||
|
%{_datadir}/applnk/System/kpersonalizer.desktop
|
||||||
|
%{_datadir}/apps/kpersonalizer/
|
||||||
|
%{_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
|
||||||
|
# kpager
|
||||||
|
%{_bindir}/kpager
|
||||||
|
%{_datadir}/applications/kde/kpager.desktop
|
||||||
|
%{_datadir}/applnk/Utilities/kpager.desktop
|
||||||
|
%{_datadir}/icons/hicolor/*/apps/kpager.png
|
||||||
|
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
# kappfinder
|
||||||
|
%exclude %{_datadir}/applications/kde/kappfinder.desktop
|
||||||
|
%exclude %{_datadir}/applnk/System/kappfinder.desktop
|
||||||
|
%exclude %{_datadir}/apps/kappfinder/
|
||||||
|
%exclude %{_datadir}/icons/hicolor/*/apps/kappfinder.png
|
||||||
|
# ktip
|
||||||
|
%exclude %{_datadir}/applications/kde/ktip.desktop
|
||||||
|
%exclude %{_datadir}/applnk/Toys/ktip.desktop
|
||||||
|
%exclude %{_datadir}/apps/kdewizard
|
||||||
|
%exclude %{_datadir}/autostart/ktip.desktop
|
||||||
|
%exclude %{_datadir}/icons/hicolor/*/apps/ktip*
|
||||||
|
# kpersonalizer
|
||||||
|
%exclude %{_datadir}/applications/kde/kpersonalizer.desktop
|
||||||
|
%exclude %{_datadir}/applnk/System/kpersonalizer.desktop
|
||||||
|
%exclude %{_datadir}/apps/kpersonalizer/
|
||||||
|
%exclude %{_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png
|
||||||
|
# kpager
|
||||||
|
%exclude %{_datadir}/applications/kde/kpager.desktop
|
||||||
|
%exclude %{_datadir}/applnk/Utilities/kpager.desktop
|
||||||
|
%exclude %{_datadir}/icons/hicolor/*/apps/kpager.png
|
||||||
|
|
||||||
|
%doc AUTHORS COPYING README
|
||||||
|
%{_docdir}/kde/HTML/en/*
|
||||||
|
%config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
|
||||||
|
%{_bindir}/genkdmconf
|
||||||
|
%{_bindir}/kaccess
|
||||||
|
%{_bindir}/kapplymousetheme
|
||||||
|
%{_bindir}/kate
|
||||||
|
%{_bindir}/kblankscrn.kss
|
||||||
|
%{_bindir}/kbookmarkmerger
|
||||||
|
%{_bindir}/kcminit
|
||||||
|
%{_bindir}/kcminit_startup
|
||||||
|
%{_bindir}/kcontrol
|
||||||
|
%{_bindir}/kcontroledit
|
||||||
|
%{_bindir}/kdebugdialog
|
||||||
|
%{_bindir}/kdeinstallktheme
|
||||||
|
%{_bindir}/kdepasswd
|
||||||
|
%{_bindir}/kdesu
|
||||||
|
%attr(0755,root,root) %{_bindir}/kdesud
|
||||||
|
%{_bindir}/kdialog
|
||||||
|
%{_bindir}/kdm
|
||||||
|
%{_bindir}/kdmctl
|
||||||
|
%{_bindir}/keditbookmarks
|
||||||
|
%{_bindir}/keditfiletype
|
||||||
|
%{_bindir}/kfind
|
||||||
|
%{_bindir}/kfmclient
|
||||||
|
%{_bindir}/khelpcenter
|
||||||
|
%{_bindir}/khotkeys
|
||||||
|
%{_bindir}/kinfocenter
|
||||||
|
%{_bindir}/klipper
|
||||||
|
%{_bindir}/kmenuedit
|
||||||
|
%{_bindir}/konqueror
|
||||||
|
%{_bindir}/konsole
|
||||||
|
%{_bindir}/krandom.kss
|
||||||
|
%{_bindir}/krandrtray
|
||||||
|
%{_bindir}/krdb
|
||||||
|
%{_bindir}/kreadconfig
|
||||||
|
%{_bindir}/ksmserver
|
||||||
|
%{_bindir}/ksplashsimple
|
||||||
|
%{_bindir}/kstart
|
||||||
|
%{_bindir}/ksysguard
|
||||||
|
%{_bindir}/ksysguardd
|
||||||
|
%{_bindir}/ksystraycmd
|
||||||
|
%{_bindir}/ktrash
|
||||||
|
%{_bindir}/kwin
|
||||||
|
%{_bindir}/kwin_killer_helper
|
||||||
|
%{_bindir}/kwin_rules_dialog
|
||||||
|
%{_bindir}/kwrite
|
||||||
|
%{_bindir}/kwriteconfig
|
||||||
|
%{_bindir}/kxkb
|
||||||
|
%{_bindir}/nspluginscan
|
||||||
|
%{_bindir}/nspluginviewer
|
||||||
|
%{_bindir}/startkde
|
||||||
|
%{_bindir}/kcheckrunning
|
||||||
|
%{_bindir}/kdesktop
|
||||||
|
%{_bindir}/kdesktop_lock
|
||||||
|
%{_bindir}/kdm_config
|
||||||
|
%{_bindir}/kdm_greet
|
||||||
|
%{_bindir}/kfontinst
|
||||||
|
%{_bindir}/kfontview
|
||||||
|
%{_bindir}/krootimage
|
||||||
|
%{_bindir}/kwebdesktop
|
||||||
|
%{_datadir}/autostart/*
|
||||||
|
%{_datadir}/desktop-directories/*
|
||||||
|
%{_datadir}/locale/*/entry.desktop
|
||||||
|
%{_datadir}/locale/l10n
|
||||||
|
%{_datadir}/templates/*
|
||||||
|
%{_datadir}/templates/.source/*
|
||||||
|
%{_datadir}/wallpapers/*
|
||||||
|
%{_bindir}/appletproxy
|
||||||
|
%{_bindir}/drkonqi
|
||||||
|
%{_bindir}/extensionproxy
|
||||||
|
%{_bindir}/kasbar
|
||||||
|
%attr(4755,root,root) %{_bindir}/kcheckpass
|
||||||
|
%{_bindir}/kdeeject
|
||||||
|
%{_bindir}/khc_docbookdig.pl
|
||||||
|
%{_bindir}/khc_htdig.pl
|
||||||
|
%{_bindir}/khc_htsearch.pl
|
||||||
|
%{_bindir}/khc_indexbuilder
|
||||||
|
%{_bindir}/khc_mansearch.pl
|
||||||
|
%{_bindir}/kicker
|
||||||
|
%{_bindir}/knetattach
|
||||||
|
%{_bindir}/kompmgr
|
||||||
|
%{_bindir}/kpm
|
||||||
|
%{_bindir}/ksplash
|
||||||
|
%{_libdir}/kconf_update_bin
|
||||||
|
%{_datadir}/applnk/*.desktop
|
||||||
|
%{_datadir}/applnk/*/*
|
||||||
|
%{_datadir}/applnk/.hidden/*
|
||||||
|
%exclude %{_datadir}/applnk/.hidden/.directory
|
||||||
|
%{_datadir}/config.kcfg/*
|
||||||
|
%{_bindir}/kio_media_mounthelper
|
||||||
|
%{_bindir}/kdcop
|
||||||
|
%{_bindir}/kdeprintfax
|
||||||
|
%{_bindir}/khc_beagle_index.pl
|
||||||
|
%{_bindir}/khc_beagle_search.pl
|
||||||
|
%{_bindir}/kxdglauncher
|
||||||
|
%{_bindir}/kjobviewer
|
||||||
|
%{_bindir}/klocaldomainurifilterhelper
|
||||||
|
%{_bindir}/kprinter
|
||||||
|
%{_datadir}/applications/*/*
|
||||||
|
%{_datadir}/apps/*
|
||||||
|
%{_datadir}/icons/*color/*/*/*
|
||||||
|
%{_datadir}/icons/crystalsvg/*/*/*
|
||||||
|
%{_datadir}/mimelnk/*/*
|
||||||
|
%{_datadir}/services/*
|
||||||
|
%{_datadir}/servicetypes/*
|
||||||
|
%{_datadir}/sounds/*
|
||||||
|
%{_libdir}/trinity/*
|
||||||
|
%{_libdir}/libkdeinit_*.*
|
||||||
|
%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
|
||||||
|
%{_sysconfdir}/xdg/menus/kde-information.menu
|
||||||
|
%{_sysconfdir}/xdg/menus/kde-screensavers.menu
|
||||||
|
%{_sysconfdir}/xdg/menus/kde-settings.menu
|
||||||
|
/usr/share/xsessions/*.desktop
|
||||||
|
# Remove conflicts with redhat-menus
|
||||||
|
%if "%{?_prefix}" != "/usr"
|
||||||
|
%config(noreplace) %{_datadir}/config/*
|
||||||
|
%else
|
||||||
|
%exclude %{_datadir}/config
|
||||||
|
%endif
|
||||||
|
# exclude pim-ioslaves files from main package
|
||||||
|
%exclude %{_libdir}/trinity/kio_ldap.*
|
||||||
|
%exclude %{_libdir}/trinity/kio_nntp.*
|
||||||
|
%exclude %{_libdir}/trinity/kio_pop3.*
|
||||||
|
%exclude %{_libdir}/trinity/kio_smtp.*
|
||||||
|
%exclude %{_datadir}/services/ldap*.protocol
|
||||||
|
%exclude %{_datadir}/services/nntp*.protocol
|
||||||
|
%exclude %{_datadir}/services/pop3*.protocol
|
||||||
|
%exclude %{_datadir}/services/smtp*.protocol
|
||||||
|
|
||||||
|
# New in TDE 3.5.13
|
||||||
|
%{_bindir}/krootbacking
|
||||||
|
|
||||||
|
%files libs
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%exclude %{_libdir}/libkdeinit_*.*
|
||||||
|
%{_libdir}/lib*.so.*
|
||||||
|
%{_libdir}/lib*.la
|
||||||
|
|
||||||
|
%files pim-ioslaves
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%{_libdir}/trinity/kio_ldap.*
|
||||||
|
%{_libdir}/trinity/kio_nntp.*
|
||||||
|
%{_libdir}/trinity/kio_pop3.*
|
||||||
|
%{_libdir}/trinity/kio_smtp.*
|
||||||
|
%{_datadir}/services/ldap*.protocol
|
||||||
|
%{_datadir}/services/nntp*.protocol
|
||||||
|
%{_datadir}/services/pop3*.protocol
|
||||||
|
%{_datadir}/services/smtp*.protocol
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%{_includedir}/*.h
|
||||||
|
%dir %{_includedir}/kate
|
||||||
|
%{_includedir}/kate/*
|
||||||
|
%dir %{_includedir}/kwin
|
||||||
|
%{_includedir}/kwin/*
|
||||||
|
%dir %{_includedir}/ksgrd
|
||||||
|
%{_includedir}/ksgrd/*
|
||||||
|
%dir %{_includedir}/ksplash
|
||||||
|
%{_includedir}/ksplash/*
|
||||||
|
%{_libdir}/lib*.so
|
||||||
|
%exclude %{_libdir}/libkdeinit_*.*
|
||||||
|
# New in TDE 3.5.13
|
||||||
|
%{_datadir}/cmake/*.cmake
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12.99-0
|
||||||
|
- Import to GIT
|
||||||
|
- Use TDE 3.5.13, cmake, QT3.3.3.8d
|
Loading…
Reference in new issue