Merge remote-tracking branch 'origin/master' into f17
Conflicts: .gitignore 0002-Trigger-installation-of-missing-components-when-inst.patch kdelibs-udisks2-backend.patch kdelibs.spec sources
This commit is contained in:
Rex Dieter
commit
20c504f9d3
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
/kdelibs-4.8.5.tar.xz
|
||||
/kdelibs-4.9.1.tar.xz
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -up kdelibs-4.8.4/plasma/package.cpp.libplasma-pk-0002 kdelibs-4.8.4/plasma/package.cpp
|
||||
--- kdelibs-4.8.4/plasma/package.cpp.libplasma-pk-0002 2012-06-01 14:28:39.306441886 +0200
|
||||
+++ kdelibs-4.8.4/plasma/package.cpp 2012-06-06 11:19:01.239154039 +0200
|
||||
diff -up kdelibs-4.8.90/plasma/package.cpp.libplasma-pk-0002 kdelibs-4.8.90/plasma/package.cpp
|
||||
--- kdelibs-4.8.90/plasma/package.cpp.libplasma-pk-0002 2012-06-05 10:47:01.000000000 +0200
|
||||
+++ kdelibs-4.8.90/plasma/package.cpp 2012-06-08 15:40:14.219728253 +0200
|
||||
@@ -43,8 +43,11 @@
|
||||
#include <kdebug.h>
|
||||
|
||||
@ -13,10 +13,10 @@ diff -up kdelibs-4.8.4/plasma/package.cpp.libplasma-pk-0002 kdelibs-4.8.4/plasma
|
||||
#include "private/package_p.h"
|
||||
#include "private/plasmoidservice_p.h"
|
||||
#include "private/service_p.h"
|
||||
@@ -581,6 +584,42 @@ bool Package::installPackage(const QStri
|
||||
@@ -580,6 +583,41 @@ bool Package::installPackage(const QStri
|
||||
// no need to remove the temp dir (which has been successfully moved if it's an archive)
|
||||
tempdir.setAutoRemove(false);
|
||||
}
|
||||
|
||||
+ // check for missing dependencies
|
||||
+ QString requiredScriptEngine = meta.implementationApi();
|
||||
+ if (!requiredScriptEngine.isEmpty()) {
|
||||
@ -52,13 +52,12 @@ diff -up kdelibs-4.8.4/plasma/package.cpp.libplasma-pk-0002 kdelibs-4.8.4/plasma
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
|
||||
if (!servicePrefix.isEmpty()) {
|
||||
// and now we register it as a service =)
|
||||
kDebug() << "************************** 1";
|
||||
diff -up kdelibs-4.8.4/plasma/packagemetadata.cpp.libplasma-pk-0002 kdelibs-4.8.4/plasma/packagemetadata.cpp
|
||||
--- kdelibs-4.8.4/plasma/packagemetadata.cpp.libplasma-pk-0002 2011-12-21 01:14:57.000000000 +0100
|
||||
+++ kdelibs-4.8.4/plasma/packagemetadata.cpp 2012-06-06 11:14:36.743181062 +0200
|
||||
diff -up kdelibs-4.8.90/plasma/packagemetadata.cpp.libplasma-pk-0002 kdelibs-4.8.90/plasma/packagemetadata.cpp
|
||||
--- kdelibs-4.8.90/plasma/packagemetadata.cpp.libplasma-pk-0002 2012-05-23 01:45:26.000000000 +0200
|
||||
+++ kdelibs-4.8.90/plasma/packagemetadata.cpp 2012-06-08 15:24:24.439149182 +0200
|
||||
@@ -52,6 +52,7 @@ class PackageMetadataPrivate
|
||||
QString serviceType;
|
||||
QString api;
|
||||
@ -107,9 +106,9 @@ diff -up kdelibs-4.8.4/plasma/packagemetadata.cpp.libplasma-pk-0002 kdelibs-4.8.
|
||||
void PackageMetadata::setType(const QString &type)
|
||||
{
|
||||
d->type = type;
|
||||
diff -up kdelibs-4.8.4/plasma/packagemetadata.h.libplasma-pk-0002 kdelibs-4.8.4/plasma/packagemetadata.h
|
||||
--- kdelibs-4.8.4/plasma/packagemetadata.h.libplasma-pk-0002 2011-07-27 20:34:38.705247040 +0200
|
||||
+++ kdelibs-4.8.4/plasma/packagemetadata.h 2012-06-06 11:14:36.743181062 +0200
|
||||
diff -up kdelibs-4.8.90/plasma/packagemetadata.h.libplasma-pk-0002 kdelibs-4.8.90/plasma/packagemetadata.h
|
||||
--- kdelibs-4.8.90/plasma/packagemetadata.h.libplasma-pk-0002 2012-05-23 01:45:26.000000000 +0200
|
||||
+++ kdelibs-4.8.90/plasma/packagemetadata.h 2012-06-08 15:24:24.481149665 +0200
|
||||
@@ -21,6 +21,7 @@
|
||||
#define PLASMA_PACKAGEMETADATA_H
|
||||
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff -up kdelibs-4.8.3/experimental/libkdeclarative/CMakeLists.txt.kdeclarative-install-location kdelibs-4.8.3/experimental/libkdeclarative/CMakeLists.txt
|
||||
--- kdelibs-4.8.3/experimental/libkdeclarative/CMakeLists.txt.kdeclarative-install-location 2012-04-29 22:37:35.777207066 +0200
|
||||
+++ kdelibs-4.8.3/experimental/libkdeclarative/CMakeLists.txt 2012-04-30 12:20:40.384393056 +0200
|
||||
@@ -6,6 +6,9 @@ endif(KDE_PLATFORM_FEATURE_BINARY_COMPAT
|
||||
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kdeclarative.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdeclarative.h)
|
||||
|
||||
+set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '64')")
|
||||
+set( LIB_INSTALL_DIR lib${LIB_SUFFIX} )
|
||||
+
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}
|
||||
${CMAKE_BINARY_DIR}
|
||||
19
kdelibs-4.9.1-udisks_detatch_external_hdd.patch
Normal file
19
kdelibs-4.9.1-udisks_detatch_external_hdd.patch
Normal file
@ -0,0 +1,19 @@
|
||||
diff -up kdelibs-4.9.1/solid/solid/backends/udisks/udisksstorageaccess.cpp.solid-detach-external-hdd kdelibs-4.9.1/solid/solid/backends/udisks/udisksstorageaccess.cpp
|
||||
--- kdelibs-4.9.1/solid/solid/backends/udisks/udisksstorageaccess.cpp.solid-detach-external-hdd 2012-08-28 15:37:29.000000000 +0200
|
||||
+++ kdelibs-4.9.1/solid/solid/backends/udisks/udisksstorageaccess.cpp 2012-09-04 12:18:00.030489289 +0200
|
||||
@@ -199,7 +199,14 @@ void UDisksStorageAccess::slotDBusReply(
|
||||
QDBusMessage msg = QDBusMessage::createMethodCall(UD_DBUS_SERVICE, drivePath, UD_DBUS_INTERFACE_DISKS_DEVICE, "DriveEject");
|
||||
msg << QStringList(); // options, unused now
|
||||
c.call(msg, QDBus::NoBlock);
|
||||
- }
|
||||
+ // power down removable USB hard drives, rhbz#852196
|
||||
+ UDisksDevice drive(drivePath);
|
||||
+ if (drive.prop("DriveCanDetach").toBool()) {
|
||||
+ QDBusMessage msg2 = QDBusMessage::createMethodCall(UD_DBUS_SERVICE, drivePath, UD_DBUS_INTERFACE_DISKS_DEVICE, "DriveDetach");
|
||||
+ msg2 << QStringList(); // options, unused now
|
||||
+ c.call(msg2, QDBus::NoBlock);
|
||||
+ }
|
||||
+ }
|
||||
|
||||
m_teardownInProgress = false;
|
||||
m_device->broadcastActionDone("teardown");
|
||||
@ -359,7 +359,7 @@ index 0000000..19cb70a
|
||||
+#endif // UDISKS2BLOCK_H
|
||||
diff --git a/tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp b/tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp
|
||||
new file mode 100644
|
||||
index 0000000..fb74fa2
|
||||
index 0000000..3076278
|
||||
--- /dev/null
|
||||
+++ b/tier1/solid/src/solid/backends/udisks2/udisksdevice.cpp
|
||||
@@ -0,0 +1,910 @@
|
||||
@ -522,7 +522,7 @@ index 0000000..fb74fa2
|
||||
+ case Solid::DeviceInterface::GenericInterface:
|
||||
+ return true;
|
||||
+ case Solid::DeviceInterface::Block:
|
||||
+ return isBlock();
|
||||
+ return isBlock() || isDrive();
|
||||
+ case Solid::DeviceInterface::StorageVolume:
|
||||
+ return isStorageVolume();
|
||||
+ case Solid::DeviceInterface::StorageAccess:
|
||||
@ -1708,10 +1708,10 @@ index 0000000..d225f32
|
||||
+#endif // SOLID_BACKENDS_UDISKS2_GENERICINTERFACE_H
|
||||
diff --git a/tier1/solid/src/solid/backends/udisks2/udisksmanager.cpp b/tier1/solid/src/solid/backends/udisks2/udisksmanager.cpp
|
||||
new file mode 100644
|
||||
index 0000000..0a77c16
|
||||
index 0000000..de7d564
|
||||
--- /dev/null
|
||||
+++ b/tier1/solid/src/solid/backends/udisks2/udisksmanager.cpp
|
||||
@@ -0,0 +1,227 @@
|
||||
@@ -0,0 +1,231 @@
|
||||
+/*
|
||||
+ Copyright 2012 Lukáš Tinkl <ltinkl@redhat.com>
|
||||
+
|
||||
@ -1891,6 +1891,7 @@ index 0000000..0a77c16
|
||||
+
|
||||
+ // new device, we don't know it yet
|
||||
+ if (!m_deviceCache.contains(udi)) {
|
||||
+ qDebug() << "ADDING NEW DEVICE" << udi;
|
||||
+ m_deviceCache.append(udi);
|
||||
+ Q_EMIT deviceAdded(udi);
|
||||
+ }
|
||||
@ -1905,6 +1906,7 @@ index 0000000..0a77c16
|
||||
+ Device device(udi);
|
||||
+
|
||||
+ if (!udi.isEmpty() && (interfaces.isEmpty() || device.interfaces().isEmpty() || device.interfaces().contains(UD2_DBUS_INTERFACE_FILESYSTEM))) {
|
||||
+ qDebug() << "REMOVING DEVICE" << udi;
|
||||
+ Q_EMIT deviceRemoved(udi);
|
||||
+ m_deviceCache.removeAll(udi);
|
||||
+ }
|
||||
@ -1922,11 +1924,13 @@ index 0000000..0a77c16
|
||||
+ qDebug() << "MEDIA CHANGED in" << udi << "; size is:" << size;
|
||||
+
|
||||
+ if (!m_deviceCache.contains(udi) && size > 0) { // we don't know the optdisc, got inserted
|
||||
+ qDebug() << "ADDING NEW OPTDISC" << udi;
|
||||
+ m_deviceCache.append(udi);
|
||||
+ Q_EMIT deviceAdded(udi);
|
||||
+ }
|
||||
+
|
||||
+ if (m_deviceCache.contains(udi) && size == 0) { // we know the optdisc, got removed
|
||||
+ qDebug() << "REMOVING OPTDISC" << udi;
|
||||
+ Q_EMIT deviceRemoved(udi);
|
||||
+ m_deviceCache.removeAll(udi);
|
||||
+ }
|
||||
@ -2689,10 +2693,10 @@ index 0000000..4c98ef5
|
||||
+#endif // UDISKS2OPTICALDRIVE_H
|
||||
diff --git a/tier1/solid/src/solid/backends/udisks2/udisksstorageaccess.cpp b/tier1/solid/src/solid/backends/udisks2/udisksstorageaccess.cpp
|
||||
new file mode 100644
|
||||
index 0000000..c2af2b0
|
||||
index 0000000..ec18369
|
||||
--- /dev/null
|
||||
+++ b/tier1/solid/src/solid/backends/udisks2/udisksstorageaccess.cpp
|
||||
@@ -0,0 +1,360 @@
|
||||
@@ -0,0 +1,362 @@
|
||||
+/*
|
||||
+ Copyright 2009 Pino Toscano <pino@kde.org>
|
||||
+ Copyright 2009-2012 Lukáš Tinkl <ltinkl@redhat.com>
|
||||
@ -2869,7 +2873,9 @@ index 0000000..c2af2b0
|
||||
+ if (!drivePath.isEmpty() || drivePath != "/")
|
||||
+ {
|
||||
+ Device drive(drivePath);
|
||||
+ if (drive.prop("Ejectable").toBool() && !m_device->isOpticalDisc()) // optical drives have their Eject method
|
||||
+ if (drive.prop("Ejectable").toBool() &&
|
||||
+ drive.prop("MediaAvailable").toBool() &&
|
||||
+ !m_device->isOpticalDisc()) // optical drives have their Eject method
|
||||
+ {
|
||||
+ QDBusConnection c = QDBusConnection::systemBus();
|
||||
+ QDBusMessage msg = QDBusMessage::createMethodCall(UD2_DBUS_SERVICE, drivePath, UD2_DBUS_INTERFACE_DRIVE, "Eject");
|
||||
|
||||
174
kdelibs.spec
174
kdelibs.spec
@ -1,10 +1,10 @@
|
||||
%define attica_ver 0.2.0
|
||||
%define dbusmenu_qt_ver 0.5.2
|
||||
%define phonon_ver 4.5.0
|
||||
%define qt4_ver 4.7.0
|
||||
%define shared_desktop_ontologies_ver 0.7.0
|
||||
%define soprano_ver 2.6.51
|
||||
%define strigi_ver 0.7.2
|
||||
%define attica_ver 0.4.0
|
||||
%define dbusmenu_qt_ver 0.9.0
|
||||
%define phonon_ver 4.6.0
|
||||
%define qt4_ver 4.8.1
|
||||
%define shared_desktop_ontologies_ver 0.10.0
|
||||
%define soprano_ver 2.8.0
|
||||
%define strigi_ver 0.7.7
|
||||
%define apidocs 1
|
||||
# to build/include QCH apidocs or not (currently broken)
|
||||
#define apidocs_qch 1
|
||||
@ -24,8 +24,8 @@
|
||||
%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
|
||||
|
||||
Summary: KDE Libraries
|
||||
Version: 4.8.5
|
||||
Release: 2%{?dist}
|
||||
Version: 4.9.1
|
||||
Release: 1%{?dist}
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
@ -36,15 +36,13 @@ Provides: kdelibs4 = %{version}-%{release}
|
||||
# http://techbase.kde.org/Policies/Licensing_Policy
|
||||
License: LGPLv2+
|
||||
URL: http://www.kde.org/
|
||||
Group: System Environment/Libraries
|
||||
%global revision %(echo %{version} | cut -d. -f3)
|
||||
%if %{revision} >= 50
|
||||
%global stable unstable
|
||||
%else
|
||||
%global stable stable
|
||||
%endif
|
||||
Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/kdelibs-%{version}%{?alphatag}.tar.xz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Source0: http://download.kde.org/%{stable}/%{version}/src/kdelibs-%{version}.tar.xz
|
||||
|
||||
BuildRequires: kde4-macros(api) >= 2
|
||||
BuildRequires: kde-filesystem >= 4-23
|
||||
@ -58,11 +56,12 @@ Requires: hicolor-icon-theme
|
||||
Requires: kde-filesystem >= 4-23
|
||||
Requires: kde-settings
|
||||
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
|
||||
# versioned dep ok, as long as it comes from *here*
|
||||
Requires: %{name}-common = %{epoch}:%{version}-%{release}
|
||||
Requires: hunspell
|
||||
# https://git.reviewboard.kde.org/r/103028/
|
||||
Requires: media-player-info
|
||||
# beware of possible bootstrapping problems
|
||||
# moved back to kdebase-runtime
|
||||
# moved back to kde-runtime
|
||||
#Requires: oxygen-icon-theme >= %{version}
|
||||
Requires: phonon%{?_isa} >= %{phonon_version}
|
||||
Requires: shared-desktop-ontologies >= %{shared_desktop_ontologies_version}
|
||||
@ -146,11 +145,9 @@ Patch53: kdelibs-4.7.2-kjs-s390.patch
|
||||
Patch54: kdelibs-4.8.4-kjs-locale.patch
|
||||
|
||||
# Can't safely remove a USB removable hard drive ( http://bugzilla.redhat.com/852196 )
|
||||
Patch55: kdelibs-4.9.0-udisks_detatch_external_hdd.patch
|
||||
Patch55: kdelibs-4.9.1-udisks_detatch_external_hdd.patch
|
||||
|
||||
## upstream
|
||||
# fix kdeclarative install location (by wstephenson as found in kde-packager list)
|
||||
Patch100: kdelibs-4.8.3-kdeclarative-install-location.patch
|
||||
|
||||
## security fix
|
||||
# Not Upstreamed? why not ? -- Rex
|
||||
@ -159,14 +156,8 @@ Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
|
||||
# rhel patches
|
||||
Patch300: kdelibs-4.8.3-webkit.patch
|
||||
|
||||
# force upgrade of apps using the discontinued KatePart Smart* interfaces to
|
||||
# versions using the new Moving* interfaces instead
|
||||
# conditionize these? how long to carry them? -- rex
|
||||
Conflicts: kdevplatform < 1.1.80
|
||||
Conflicts: kdevelop < 9:4.1.80
|
||||
# 2.1-0.9.b4.fc15 is the first build with the fix from beta 5 backported
|
||||
Conflicts: kile < 2.1-0.9
|
||||
Conflicts: rkward < 0.5.4
|
||||
# kmailservice moved here
|
||||
Conflicts: kdelibs3 < 3.5.10-38
|
||||
|
||||
BuildRequires: qt4-devel >= %{qt4_ver}
|
||||
%if 0%{?fedora}
|
||||
@ -210,12 +201,11 @@ BuildRequires: pkgconfig(phonon) >= %{phonon_ver}
|
||||
BuildRequires: pkgconfig(polkit-qt-1)
|
||||
BuildRequires: pkgconfig(qca2)
|
||||
BuildRequires: pkgconfig(shared-desktop-ontologies) >= %{shared_desktop_ontologies_ver}
|
||||
BuildRequires: pkgconfig(shared-mime-info)
|
||||
BuildRequires: pkgconfig(soprano) >= %{soprano_ver}
|
||||
BuildRequires: shared-mime-info
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
# extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
|
||||
#define x_deps libSM-devel libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
|
||||
%define x_deps pkgconfig(sm) pkgconfig(xcomposite) pkgconfig(xdamage) pkgconfig(xkbfile) pkgconfig(xpm) pkgconfig(xscrnsaver) pkgconfig(xtst) pkgconfig(xv) pkgconfig(xxf86misc)
|
||||
%define x_deps pkgconfig(sm) pkgconfig(xcomposite) pkgconfig(xdamage) pkgconfig(xkbfile) pkgconfig(xpm) pkgconfig(xproto) pkgconfig(xscrnsaver) pkgconfig(xtst) pkgconfig(xv) pkgconfig(xxf86misc)
|
||||
%{?x_deps:BuildRequires: %{x_deps}}
|
||||
|
||||
Requires: %{?udisks} upower
|
||||
@ -228,25 +218,16 @@ BuildRequires: graphviz
|
||||
BuildRequires: qt4-doc
|
||||
%endif
|
||||
|
||||
Provides: katepart = %{version}-%{release}
|
||||
Provides: katepart%{?_isa} = %{version}-%{release}
|
||||
Provides: kross(javascript) = %{version}-%{release}
|
||||
Provides: kross(qtscript) = %{version}-%{release}
|
||||
|
||||
Provides: kdelibs-experimental = %{version}-%{release}
|
||||
Obsoletes: kdelibs-experimental < 4.3.75
|
||||
|
||||
Provides: katepart = %{version}-%{release}
|
||||
# not sure this one is needed -- rex
|
||||
%{?_isa:Provides: katepart%{?_isa} = %{version}-%{release}}
|
||||
|
||||
%if 0%{?fedora} && 0%{?fedora} < 15
|
||||
Obsoletes: webkitkde < 0.0.6
|
||||
%endif
|
||||
|
||||
%description
|
||||
Libraries for KDE 4.
|
||||
|
||||
%package common
|
||||
Group: System Environment/Libraries
|
||||
Summary: Common files for KDE 3 and KDE 4 libraries
|
||||
# some files moved kdebase-runtime -> here
|
||||
Conflicts: kdebase-runtime < 4.5.80
|
||||
@ -254,17 +235,13 @@ Conflicts: kdebase-runtime < 4.5.80
|
||||
This package includes the common files for the KDE 3 and KDE 4 libraries.
|
||||
|
||||
%package devel
|
||||
Group: Development/Libraries
|
||||
Summary: Header files for compiling KDE 4 applications
|
||||
%if 0%{?fedora} && 0%{?fedora} < 15
|
||||
Obsoletes: webkitkde-devel < 0.0.6
|
||||
%endif
|
||||
Provides: plasma-devel = %{version}-%{release}
|
||||
Provides: nepomuk-devel = %{version}-%{release}
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Obsoletes: kdelibs4-devel < %{version}-%{release}
|
||||
Provides: kdelibs4-devel = %{version}-%{release}
|
||||
%{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}}
|
||||
Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}
|
||||
Requires: automoc4 >= 0.9.88
|
||||
Requires: cmake >= 2.6.4
|
||||
Requires: pkgconfig(libattica) >= %{attica_ver}
|
||||
@ -276,10 +253,6 @@ Requires: qt4-devel
|
||||
%if 0%{?fedora}
|
||||
Requires: pkgconfig(QtWebKit)
|
||||
%endif
|
||||
# do we really still need all these below? -- Rex
|
||||
Requires: pkgconfig(libstreams)
|
||||
Requires: pkgconfig(gamin)
|
||||
Requires: bzip2-devel libacl-devel
|
||||
%{?x_deps:Requires: %{x_deps}}
|
||||
|
||||
%description devel
|
||||
@ -287,10 +260,7 @@ This package includes the header files you will need to compile
|
||||
applications for KDE 4.
|
||||
|
||||
%package apidocs
|
||||
Group: Development/Documentation
|
||||
Summary: KDE 4 API documentation
|
||||
# Not strictly required -- Rex
|
||||
# Requires: %{name} = %{?epoch:%{epoch}:}%{version}
|
||||
Requires: kde-filesystem
|
||||
Provides: kdelibs4-apidocs = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
@ -300,10 +270,7 @@ This package includes the KDE 4 API documentation in HTML
|
||||
format for easy browsing.
|
||||
|
||||
%package apidocs-qch
|
||||
Group: Development/Documentation
|
||||
Summary: KDE 4 API documentation for Qt Assistant
|
||||
# Not strictly required -- Rex
|
||||
# Requires: %{name} = %{?epoch:%{epoch}:}%{version}
|
||||
# Directory ownership (%{_qt4_docdir}/qch)
|
||||
Requires: qt4
|
||||
Provides: kdelibs4-apidocs-qch = %{version}-%{release}
|
||||
@ -362,7 +329,6 @@ popd
|
||||
%patch55 -p1 -b .solid-detach-external-hdd
|
||||
|
||||
# upstream patches
|
||||
%patch100 -p1 -b .kdeclarative-install-location
|
||||
|
||||
# security fixes
|
||||
%patch200 -p1 -b .CVE-2009-2702
|
||||
@ -405,6 +371,11 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
|
||||
mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
|
||||
%{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
|
||||
|
||||
# kmailservice symlink
|
||||
# Mailto not working in Firefox: can't find kmailservice
|
||||
# http://bugzilla.redhat.com/773414
|
||||
ln -s %{_kde4_libexecdir}/kmailservice %{buildroot}%{_kde4_bindir}/kmailservice
|
||||
|
||||
# create/own stuff
|
||||
# see http://bugzilla.redhat.com/483318
|
||||
mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin
|
||||
@ -429,7 +400,6 @@ do
|
||||
case "$i" in
|
||||
libkdeinit4_*.so)
|
||||
;;
|
||||
## FIXME/TODO: imo, should leave everything except for known-conflicts -- Rex
|
||||
*)
|
||||
linktarget=`readlink "$i"`
|
||||
rm -f "$i"
|
||||
@ -490,7 +460,6 @@ rm -rf %{buildroot}
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS README TODO
|
||||
%doc COPYING.LIB
|
||||
%{_kde4_bindir}/checkXML
|
||||
@ -504,6 +473,7 @@ rm -rf %{buildroot}
|
||||
%{_kde4_bindir}/kfilemetadatareader
|
||||
%{_kde4_bindir}/kjs
|
||||
%{_kde4_bindir}/kjscmd
|
||||
%{_kde4_bindir}/kmailservice
|
||||
%{_kde4_bindir}/kross
|
||||
%{_kde4_bindir}/kshell4
|
||||
%{_kde4_bindir}/kunittestmodrunner
|
||||
@ -574,7 +544,6 @@ rm -rf %{buildroot}
|
||||
%{_mandir}/man8/meinproc4.8*
|
||||
|
||||
%files common
|
||||
%defattr(-,root,root,-)
|
||||
%{_kde4_bindir}/preparetips
|
||||
%{_kde4_configdir}/colors/
|
||||
%{_kde4_configdir}/ksslcalist
|
||||
@ -587,7 +556,6 @@ rm -rf %{buildroot}
|
||||
%{_kde4_datadir}/locale/en_US/entry.desktop
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%doc KDE4PORTING.html
|
||||
%{_mandir}/man1/kdecmake.1*
|
||||
%{_mandir}/man1/makekdewidgets.1*
|
||||
@ -606,47 +574,81 @@ rm -rf %{buildroot}
|
||||
|
||||
%if 0%{?apidocs}
|
||||
%files apidocs
|
||||
%defattr(-,root,root,-)
|
||||
%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/
|
||||
|
||||
%if 0%{?apidocs_qch}
|
||||
%files apidocs-qch
|
||||
%defattr(-,root,root,-)
|
||||
%{_qt4_docdir}/qch/*.qch
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Aug 29 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.8.5-2
|
||||
* Mon Sep 03 2012 Than Ngo <than@redhat.com> - 6:4.9.1-1
|
||||
- 4.9.1
|
||||
|
||||
* Wed Aug 29 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.0-4
|
||||
- Can't safely remove a USB removable hard drive (#852196)
|
||||
|
||||
* Thu Aug 02 2012 Rex Dieter <rdieter@fedoraproject.org> - 6:4.8.5-1
|
||||
- 4.8.5
|
||||
* Sun Aug 12 2012 Rex Dieter <rdieter@fedoraproject.org> - 6:4.9.0-3
|
||||
- drop .spec cruft
|
||||
- Requires: media-player-info
|
||||
|
||||
* Fri Jul 13 2012 Rex Dieter <rdieter@fedoraproject.org> - 6:4.8.4-8
|
||||
- CD drive tray goes back in after 'Eject' when dolphin is running (kde#296657, #811609)
|
||||
|
||||
* Thu Jul 12 2012 Than Ngo <than@redhat.com> - 6:4.8.4-7
|
||||
- fix kjs to return valid lang (RFC 1766)
|
||||
|
||||
* Fri Jun 29 2012 Lukáš Tinkl <ltinkl@redhat.com> - 6:4.8.4-6
|
||||
- sync the udisks2 backend patch
|
||||
|
||||
* Wed Jun 20 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.8.4-5
|
||||
- rebuild (attica)
|
||||
|
||||
* Thu Jun 14 2012 Than Ngo <than@redhat.com> - 6:4.8.4-4
|
||||
- fix bz#830178, regression in 4.8.4
|
||||
|
||||
* Thu Jun 07 2012 Lukáš Tinkl <ltinkl@redhat.com> - 6:4.8.4-3
|
||||
- another respin
|
||||
|
||||
* Wed Jun 06 2012 Than Ngo <than@redhat.com> - 6:4.8.4-2
|
||||
* Thu Aug 02 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.9.0-2
|
||||
- respin
|
||||
|
||||
* Mon Jun 04 2012 Than Ngo <than@redhat.com> - 6:4.8.4-1
|
||||
- 4.8.4
|
||||
* Thu Jul 26 2012 Lukas Tinkl <ltinkl@redhat.com> - 6:4.9.0-1
|
||||
- 4.9.0
|
||||
|
||||
* Sun Jul 22 2012 Kevin Kofler <Kevin@tigcc.ticalc.org> - 6:4.8.97-7
|
||||
- revert "-devel: move only conflicting lib symlinks to kde4/devel" (#842142)
|
||||
|
||||
* Sat Jul 21 2012 Rex Dieter <rdieter@fedoraproject.org> - 6:4.8.97-6
|
||||
- -devel: move only conflicting lib symlinks to kde4/devel
|
||||
- drop old Conflicts/Obsoletes
|
||||
|
||||
* Wed Jul 18 2012 Lukas Tinkl <ltinkl@redhat.com> - 6:4.8.97-5
|
||||
- respin the udisks2 backend patch
|
||||
- fix k3b not recognizing any CD/DVD burning device
|
||||
|
||||
* Fri Jul 13 2012 Rex Dieter <rdieter@fedoraproject.org> - 6:4.8.97-4
|
||||
- CD drive tray goes back in after 'Eject' when dolphin is running (kde#296657, #811609)
|
||||
|
||||
* Thu Jul 12 2012 Rex Dieter <rdieter@fedoraproject.org> - 6:4.8.97-3
|
||||
- provide /usr/bin/kmailservice (#773414)
|
||||
|
||||
* Thu Jul 12 2012 Than Ngo <than@redhat.com> - 6:4.8.97-2
|
||||
- fix kjs to return valid lang (RFC 1766)
|
||||
|
||||
* Wed Jul 11 2012 Rex Dieter <rdieter@fedoraproject.org> - 6:4.8.97-1
|
||||
- 4.8.97
|
||||
|
||||
* Wed Jun 27 2012 Lukas Tinkl <ltinkl@redhat.com> - 6:4.8.95-2
|
||||
- respin the udisks2 backend patch
|
||||
- Resolves #835107 - Unable to eject optical media using "Device
|
||||
notifier"
|
||||
|
||||
* Wed Jun 27 2012 Radek Novacek <rnovacek@redhat.com> - 6:4.8.95-1
|
||||
- 4.8.95
|
||||
|
||||
* Tue Jun 26 2012 Lukáš Tinkl <ltinkl@redhat.com> - 6:4.8.90-4
|
||||
- update the udisks2 backend patch
|
||||
|
||||
|
||||
* Wed Jun 20 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.8.90-3
|
||||
- rebuild (attica)
|
||||
|
||||
* Sat Jun 09 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.8.90-2
|
||||
- rebuild
|
||||
|
||||
* Fri Jun 08 2012 Jaroslav Reznik <jreznik@redhat.com> - 6:4.8.90-1
|
||||
- 4.8.90
|
||||
|
||||
* Fri Jun 01 2012 Jaroslav Reznik <jreznik@redhat.com> - 6:4.8.80-2
|
||||
- respin
|
||||
|
||||
* Fri May 25 2012 Jaroslav Reznik <jreznik@redhat.com> - 6:4.8.80-1
|
||||
- 4.8.80
|
||||
|
||||
* Fri May 25 2012 Rex Dieter <rdieter@fedoraproject.org>
|
||||
- 6:4.8.3-4
|
||||
|
||||
Loading…
Reference in New Issue
Block a user