Merge remote-tracking branch 'master' into f16
Conflicts: .gitignore kdelibs.spec sources
This commit is contained in:
commit
fdd41f6c9b
6
.gitignore
vendored
6
.gitignore
vendored
@ -1,6 +1,4 @@
|
|||||||
/kdelibs-4.6.5.tar.bz2
|
/kdelibs-4.6.5.tar.bz2
|
||||||
/kdelibs-4.7.3.tar.bz2
|
|
||||||
/kdelibs-4.7.4.tar.bz2
|
/kdelibs-4.7.4.tar.bz2
|
||||||
/kdelibs-4.7.80.tar.bz2
|
/kdelibs-4.8.0.tar.bz2
|
||||||
/kdelibs-4.7.95.tar.bz2
|
/kdelibs-4.8.1.tar.xz
|
||||||
/kdelibs-4.7.97.tar.bz2
|
|
||||||
|
@ -1,30 +1,13 @@
|
|||||||
From 5bf9e0aa14f849726f3573b04eb51acfff635fc6 Mon Sep 17 00:00:00 2001
|
diff -up kdelibs-4.7.80/plasma/CMakeLists.txt.libplasma-pk-0001 kdelibs-4.7.80/plasma/CMakeLists.txt
|
||||||
Message-Id: <5bf9e0aa14f849726f3573b04eb51acfff635fc6.1312359834.git.kevin.kofler@chello.at>
|
--- kdelibs-4.7.80/plasma/CMakeLists.txt.libplasma-pk-0001 2011-11-17 21:54:56.000000000 +0100
|
||||||
From: Kevin Kofler <kevin.kofler@chello.at>
|
+++ kdelibs-4.7.80/plasma/CMakeLists.txt 2011-11-18 13:16:23.243039344 +0100
|
||||||
Date: Mon, 1 Aug 2011 21:53:32 +0200
|
@@ -6,10 +6,15 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL
|
||||||
Subject: [PATCH] Add an API (currently private) for installing missing Plasma
|
|
||||||
engines.
|
|
||||||
|
|
||||||
Use it when a requested data or script engine is not found.
|
|
||||||
|
|
||||||
REVIEW: 102175
|
|
||||||
---
|
|
||||||
plasma/CMakeLists.txt | 11 ++++
|
|
||||||
plasma/dataenginemanager.cpp | 4 +
|
|
||||||
plasma/private/componentinstaller.cpp | 103 +++++++++++++++++++++++++++++++++
|
|
||||||
plasma/private/componentinstaller_p.h | 94 ++++++++++++++++++++++++++++++
|
|
||||||
plasma/scripting/scriptengine.cpp | 4 +
|
|
||||||
5 files changed, 216 insertions(+), 0 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt
|
|
||||||
index ef411df..f929967 100644
|
|
||||||
--- a/plasma/CMakeLists.txt
|
|
||||||
+++ b/plasma/CMakeLists.txt
|
|
||||||
@@ -6,8 +6,13 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
|
|
||||||
set(PLASMA_NO_KNEWSTUFF TRUE)
|
set(PLASMA_NO_KNEWSTUFF TRUE)
|
||||||
set(PLASMA_NO_SOLID TRUE)
|
set(PLASMA_NO_SOLID TRUE)
|
||||||
set(PLASMA_NO_KIO TRUE)
|
set(PLASMA_NO_KIO TRUE)
|
||||||
+ set(PLASMA_NO_PACKAGEKIT TRUE)
|
+ set(PLASMA_NO_PACKAGEKIT TRUE)
|
||||||
|
set(PLASMA_NO_KUTILS TRUE)
|
||||||
|
set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE)
|
||||||
endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
|
endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
|
||||||
|
|
||||||
+if(NOT Q_WS_X11)
|
+if(NOT Q_WS_X11)
|
||||||
@ -34,7 +17,7 @@ index ef411df..f929967 100644
|
|||||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${KDE4_KDECORE_INCLUDES}
|
${KDE4_KDECORE_INCLUDES}
|
||||||
${KDE4_KDEUI_INCLUDES}
|
${KDE4_KDEUI_INCLUDES}
|
||||||
@@ -42,6 +47,11 @@ if(NOT PLASMA_NO_SOLID)
|
@@ -44,6 +49,11 @@ if(NOT PLASMA_NO_SOLID)
|
||||||
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_SOLID_LIBS})
|
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_SOLID_LIBS})
|
||||||
endif(NOT PLASMA_NO_SOLID)
|
endif(NOT PLASMA_NO_SOLID)
|
||||||
|
|
||||||
@ -43,10 +26,10 @@ index ef411df..f929967 100644
|
|||||||
+ set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${QT_QTDBUS_LIBRARY})
|
+ set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${QT_QTDBUS_LIBRARY})
|
||||||
+endif(NOT PLASMA_NO_PACKAGEKIT)
|
+endif(NOT PLASMA_NO_PACKAGEKIT)
|
||||||
+
|
+
|
||||||
if(QCA2_FOUND)
|
if (NOT PLASMA_NO_KUTILS)
|
||||||
include_directories(${QCA2_INCLUDE_DIR})
|
include_directories(${CMAKE_SOURCE_DIR}/kutils)
|
||||||
set(ENABLE_REMOTE_WIDGETS TRUE)
|
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_KUTILS_LIBS})
|
||||||
@@ -110,6 +120,7 @@ set(plasma_LIB_SRCS
|
@@ -117,6 +127,7 @@ set(plasma_LIB_SRCS
|
||||||
private/animablegraphicswebview.cpp
|
private/animablegraphicswebview.cpp
|
||||||
private/applethandle.cpp
|
private/applethandle.cpp
|
||||||
private/associatedapplicationmanager.cpp
|
private/associatedapplicationmanager.cpp
|
||||||
@ -54,10 +37,9 @@ index ef411df..f929967 100644
|
|||||||
private/datacontainer_p.cpp
|
private/datacontainer_p.cpp
|
||||||
private/dataenginebindings.cpp
|
private/dataenginebindings.cpp
|
||||||
private/dataengineconsumer.cpp
|
private/dataengineconsumer.cpp
|
||||||
diff --git a/plasma/dataenginemanager.cpp b/plasma/dataenginemanager.cpp
|
diff -up kdelibs-4.7.80/plasma/dataenginemanager.cpp.libplasma-pk-0001 kdelibs-4.7.80/plasma/dataenginemanager.cpp
|
||||||
index 988fe76..c98ac40 100644
|
--- kdelibs-4.7.80/plasma/dataenginemanager.cpp.libplasma-pk-0001 2011-08-22 15:13:55.000000000 +0200
|
||||||
--- a/plasma/dataenginemanager.cpp
|
+++ kdelibs-4.7.80/plasma/dataenginemanager.cpp 2011-11-18 12:48:37.513008572 +0100
|
||||||
+++ b/plasma/dataenginemanager.cpp
|
|
||||||
@@ -29,6 +29,7 @@
|
@@ -29,6 +29,7 @@
|
||||||
|
|
||||||
#include "datacontainer.h"
|
#include "datacontainer.h"
|
||||||
@ -66,7 +48,7 @@ index 988fe76..c98ac40 100644
|
|||||||
#include "private/dataengine_p.h"
|
#include "private/dataengine_p.h"
|
||||||
#include "private/datacontainer_p.h"
|
#include "private/datacontainer_p.h"
|
||||||
#include "scripting/scriptengine.h"
|
#include "scripting/scriptengine.h"
|
||||||
@@ -130,6 +131,9 @@ Plasma::DataEngine *DataEngineManager::loadEngine(const QString &name)
|
@@ -130,6 +131,9 @@ Plasma::DataEngine *DataEngineManager::l
|
||||||
|
|
||||||
DataEngine *engine = PluginLoader::pluginLoader()->loadDataEngine(name);
|
DataEngine *engine = PluginLoader::pluginLoader()->loadDataEngine(name);
|
||||||
if (!engine) {
|
if (!engine) {
|
||||||
@ -76,11 +58,9 @@ index 988fe76..c98ac40 100644
|
|||||||
return d->nullEngine();
|
return d->nullEngine();
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/plasma/private/componentinstaller.cpp b/plasma/private/componentinstaller.cpp
|
diff -up kdelibs-4.7.80/plasma/private/componentinstaller.cpp.libplasma-pk-0001 kdelibs-4.7.80/plasma/private/componentinstaller.cpp
|
||||||
new file mode 100644
|
--- kdelibs-4.7.80/plasma/private/componentinstaller.cpp.libplasma-pk-0001 2011-11-18 12:48:37.513008572 +0100
|
||||||
index 0000000..870667f
|
+++ kdelibs-4.7.80/plasma/private/componentinstaller.cpp 2011-11-18 12:48:37.513008572 +0100
|
||||||
--- /dev/null
|
|
||||||
+++ b/plasma/private/componentinstaller.cpp
|
|
||||||
@@ -0,0 +1,103 @@
|
@@ -0,0 +1,103 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright 2011 Kevin Kofler <kevin.kofler@chello.at>
|
+ * Copyright 2011 Kevin Kofler <kevin.kofler@chello.at>
|
||||||
@ -185,11 +165,9 @@ index 0000000..870667f
|
|||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+} // namespace Plasma
|
+} // namespace Plasma
|
||||||
diff --git a/plasma/private/componentinstaller_p.h b/plasma/private/componentinstaller_p.h
|
diff -up kdelibs-4.7.80/plasma/private/componentinstaller_p.h.libplasma-pk-0001 kdelibs-4.7.80/plasma/private/componentinstaller_p.h
|
||||||
new file mode 100644
|
--- kdelibs-4.7.80/plasma/private/componentinstaller_p.h.libplasma-pk-0001 2011-11-18 12:48:37.514008574 +0100
|
||||||
index 0000000..f85cbb6
|
+++ kdelibs-4.7.80/plasma/private/componentinstaller_p.h 2011-11-18 12:48:37.514008574 +0100
|
||||||
--- /dev/null
|
|
||||||
+++ b/plasma/private/componentinstaller_p.h
|
|
||||||
@@ -0,0 +1,94 @@
|
@@ -0,0 +1,94 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright 2011 Kevin Kofler <kevin.kofler@chello.at>
|
+ * Copyright 2011 Kevin Kofler <kevin.kofler@chello.at>
|
||||||
@ -285,10 +263,9 @@ index 0000000..f85cbb6
|
|||||||
+} // namespace Plasma
|
+} // namespace Plasma
|
||||||
+
|
+
|
||||||
+#endif // multiple inclusion guard
|
+#endif // multiple inclusion guard
|
||||||
diff --git a/plasma/scripting/scriptengine.cpp b/plasma/scripting/scriptengine.cpp
|
diff -up kdelibs-4.7.80/plasma/scripting/scriptengine.cpp.libplasma-pk-0001 kdelibs-4.7.80/plasma/scripting/scriptengine.cpp
|
||||||
index fb8cd1a..21f8a9a 100644
|
--- kdelibs-4.7.80/plasma/scripting/scriptengine.cpp.libplasma-pk-0001 2011-09-26 11:41:11.000000000 +0200
|
||||||
--- a/plasma/scripting/scriptengine.cpp
|
+++ kdelibs-4.7.80/plasma/scripting/scriptengine.cpp 2011-11-18 12:48:37.514008574 +0100
|
||||||
+++ b/plasma/scripting/scriptengine.cpp
|
|
||||||
@@ -27,6 +27,7 @@
|
@@ -27,6 +27,7 @@
|
||||||
#include "applet.h"
|
#include "applet.h"
|
||||||
#include "dataengine.h"
|
#include "dataengine.h"
|
||||||
@ -297,7 +274,7 @@ index fb8cd1a..21f8a9a 100644
|
|||||||
#include "scripting/appletscript.h"
|
#include "scripting/appletscript.h"
|
||||||
#include "scripting/dataenginescript.h"
|
#include "scripting/dataenginescript.h"
|
||||||
#include "scripting/runnerscript.h"
|
#include "scripting/runnerscript.h"
|
||||||
@@ -196,6 +197,9 @@ ScriptEngine *loadEngine(const QString &language, ComponentType type, QObject *p
|
@@ -196,6 +197,9 @@ ScriptEngine *loadEngine(const QString &
|
||||||
<< "! error reported: " << error;
|
<< "! error reported: " << error;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -307,6 +284,3 @@ index fb8cd1a..21f8a9a 100644
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
--
|
|
||||||
1.7.4.4
|
|
||||||
|
|
||||||
|
@ -1,59 +0,0 @@
|
|||||||
From abaa32625edfd814320028200831cfedd4a4f9df Mon Sep 17 00:00:00 2001
|
|
||||||
Message-Id: <abaa32625edfd814320028200831cfedd4a4f9df.1313973932.git.kevin.kofler@chello.at>
|
|
||||||
From: Kevin Kofler <kevin.kofler@chello.at>
|
|
||||||
Date: Mon, 22 Aug 2011 01:53:57 +0200
|
|
||||||
Subject: [PATCH] Bugfix: Plasma::PackageMetadata::read: Match the behavior of
|
|
||||||
KService.
|
|
||||||
|
|
||||||
Also delete the duplicate entries in PackageMetadata::write.
|
|
||||||
---
|
|
||||||
plasma/packagemetadata.cpp | 25 +++++++++++++++++++++++--
|
|
||||||
1 files changed, 23 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/plasma/packagemetadata.cpp b/plasma/packagemetadata.cpp
|
|
||||||
index 59163b2..c9ff446 100644
|
|
||||||
--- a/plasma/packagemetadata.cpp
|
|
||||||
+++ b/plasma/packagemetadata.cpp
|
|
||||||
@@ -94,7 +94,9 @@ void PackageMetadata::write(const QString &filename) const
|
|
||||||
config.writeEntry("Icon", d->icon);
|
|
||||||
config.writeEntry("Comment", d->description);
|
|
||||||
config.writeEntry("Keywords", d->keywords);
|
|
||||||
+ config.deleteEntry("X-KDE-Keywords");
|
|
||||||
config.writeEntry("X-KDE-ServiceTypes", d->serviceType);
|
|
||||||
+ config.deleteEntry("ServiceTypes");
|
|
||||||
config.writeEntry("X-KDE-PluginInfo-Name", d->pluginName);
|
|
||||||
config.writeEntry("X-KDE-PluginInfo-Author", d->author);
|
|
||||||
config.writeEntry("X-KDE-PluginInfo-Email", d->email);
|
|
||||||
@@ -120,8 +122,27 @@ void PackageMetadata::read(const QString &filename)
|
|
||||||
d->name = config.readEntry("Name", d->name);
|
|
||||||
d->icon = config.readEntry("Icon", d->icon);
|
|
||||||
d->description = config.readEntry("Comment", d->description);
|
|
||||||
- d->keywords = config.readEntry("Keywords", d->keywords);
|
|
||||||
- d->serviceType = config.readEntry("X-KDE-ServiceTypes", d->serviceType);
|
|
||||||
+ bool hasKeywords = config.hasKey("Keywords");
|
|
||||||
+ bool hasXKdeKeywords = config.hasKey("X-KDE-Keywords");
|
|
||||||
+ if (hasKeywords && hasXKdeKeywords) {
|
|
||||||
+ d->keywords = config.readEntry("Keywords", d->keywords);
|
|
||||||
+ d->keywords.append(config.readEntry("X-KDE-Keywords", d->keywords));
|
|
||||||
+ } else if (hasKeywords) {
|
|
||||||
+ d->keywords = config.readEntry("Keywords", d->keywords);
|
|
||||||
+ } else if (hasXKdeKeywords) {
|
|
||||||
+ d->keywords = config.readEntry("X-KDE-Keywords", d->keywords);
|
|
||||||
+ }
|
|
||||||
+ bool hasServiceTypes = config.hasKey("ServiceTypes");
|
|
||||||
+ bool hasXKdeServiceTypes = config.hasKey("X-KDE-ServiceTypes");
|
|
||||||
+ if (hasServiceTypes && hasXKdeServiceTypes) {
|
|
||||||
+ d->serviceType = config.readEntry("ServiceTypes", d->serviceType);
|
|
||||||
+ d->serviceType.append(',');
|
|
||||||
+ d->serviceType.append(config.readEntry("X-KDE-ServiceTypes", d->serviceType));
|
|
||||||
+ } else if (hasServiceTypes) {
|
|
||||||
+ d->serviceType = config.readEntry("ServiceTypes", d->serviceType);
|
|
||||||
+ } else if (hasXKdeServiceTypes) {
|
|
||||||
+ d->serviceType = config.readEntry("X-KDE-ServiceTypes", d->serviceType);
|
|
||||||
+ }
|
|
||||||
d->pluginName = config.readEntry("X-KDE-PluginInfo-Name", d->pluginName);
|
|
||||||
d->author = config.readEntry("X-KDE-PluginInfo-Author", d->author);
|
|
||||||
d->email = config.readEntry("X-KDE-PluginInfo-Email", d->email);
|
|
||||||
--
|
|
||||||
1.7.4.4
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
|||||||
diff -up kdelibs-4.7.3/khtml/css/cssparser.cpp.orig kdelibs-4.7.3/khtml/css/cssparser.cpp
|
|
||||||
--- kdelibs-4.7.3/khtml/css/cssparser.cpp.orig 2011-11-07 19:14:53.000000000 +0100
|
|
||||||
+++ kdelibs-4.7.3/khtml/css/cssparser.cpp 2011-11-09 16:02:11.000000000 +0100
|
|
||||||
@@ -2275,8 +2275,11 @@ bool CSSParser::parseFontFaceSrc()
|
|
||||||
expectComma = true;
|
|
||||||
} else if (val->unit == Value::Function) {
|
|
||||||
// There are two allowed functions: local() and format().
|
|
||||||
+ // For both we expect a string argument
|
|
||||||
ValueList *args = val->function->args;
|
|
||||||
- if (args && args->size() == 1) {
|
|
||||||
+ if (args && args->size() == 1 &&
|
|
||||||
+ (args->current()->unit == CSSPrimitiveValue::CSS_STRING ||
|
|
||||||
+ args->current()->unit == CSSPrimitiveValue::CSS_IDENT)) {
|
|
||||||
if (!strcasecmp(domString(val->function->name), "local(") && !expectComma) {
|
|
||||||
expectComma = true;
|
|
||||||
allowFormat = false;
|
|
@ -1,15 +0,0 @@
|
|||||||
diff -ur kdelibs-orig/CMakeLists.txt kdelibs-4.7.97/CMakeLists.txt
|
|
||||||
--- kdelibs-orig/CMakeLists.txt 2012-01-04 15:51:22.362740976 +0100
|
|
||||||
+++ kdelibs-4.7.97/CMakeLists.txt 2012-01-04 15:52:14.679630524 +0100
|
|
||||||
@@ -10,9 +10,9 @@
|
|
||||||
|
|
||||||
set (KDE_VERSION_MAJOR 4)
|
|
||||||
set (KDE_VERSION_MINOR 7)
|
|
||||||
-set (KDE_VERSION_RELEASE 97)
|
|
||||||
+set (KDE_VERSION_RELEASE 4)
|
|
||||||
set (KDE_VERSION "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" )
|
|
||||||
-set (KDE_VERSION_STRING "${KDE_VERSION} (4.8 RC2 (4.7.97)")
|
|
||||||
+set (KDE_VERSION_STRING "${KDE_VERSION} (4.7.4 reloaded (aka 4.7.5)")
|
|
||||||
|
|
||||||
set (KDE_DISTRIBUTION_TEXT "compiled sources" CACHE STRING "Indicate the distribution in bug reports" )
|
|
||||||
|
|
22
kdelibs-4.8.0-cmake_cxx_implicit_link_directories.patch
Normal file
22
kdelibs-4.8.0-cmake_cxx_implicit_link_directories.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
|
||||||
|
index 6d65e61..700d265 100644
|
||||||
|
--- a/cmake/modules/FindKDE4Internal.cmake
|
||||||
|
+++ b/cmake/modules/FindKDE4Internal.cmake
|
||||||
|
@@ -1036,12 +1036,13 @@ if (UNIX)
|
||||||
|
set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
|
||||||
|
else (APPLE)
|
||||||
|
# add our LIB_INSTALL_DIR to the RPATH (but only when it is not one of the standard system link
|
||||||
|
- # directories listed in CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES) and use the RPATH figured out by cmake when compiling
|
||||||
|
+ # directories listed in CMAKE_{PLATFORM,CXX}_IMPLICIT_LINK_DIRECTORIES) and use the RPATH figured out by cmake when compiling
|
||||||
|
|
||||||
|
- list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemLibDir)
|
||||||
|
- if("${_isSystemLibDir}" STREQUAL "-1")
|
||||||
|
+ list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
|
||||||
|
+ list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir)
|
||||||
|
+ if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
|
||||||
|
set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
|
||||||
|
- endif("${_isSystemLibDir}" STREQUAL "-1")
|
||||||
|
+ endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
|
||||||
|
|
||||||
|
set(CMAKE_SKIP_BUILD_RPATH FALSE)
|
||||||
|
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
|
@ -1,7 +1,7 @@
|
|||||||
diff -up kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp
|
diff -up kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp
|
||||||
--- kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp.libexecdir 2010-11-19 04:52:23.000000000 -0600
|
--- kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp.libexecdir 2012-01-10 15:17:51.000000000 +0100
|
||||||
+++ kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp 2010-11-20 10:44:54.913612398 -0600
|
+++ kdelibs-4.8.0/kdecore/kernel/kstandarddirs.cpp 2012-01-19 13:38:07.424309462 +0100
|
||||||
@@ -1842,7 +1842,7 @@ void KStandardDirs::addKDEDefaults()
|
@@ -1871,7 +1871,7 @@ void KStandardDirs::addKDEDefaults()
|
||||||
addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);
|
addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);
|
||||||
index+=2;
|
index+=2;
|
||||||
}
|
}
|
||||||
@ -10,9 +10,9 @@ diff -up kdelibs-4.5.80/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.5.
|
|||||||
|
|
||||||
addResourceDir("home", QDir::homePath(), false);
|
addResourceDir("home", QDir::homePath(), false);
|
||||||
|
|
||||||
diff -up kdelibs-4.5.80/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.5.80/kdecore/kernel/kstandarddirs_unix.cpp
|
diff -up kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp
|
||||||
--- kdelibs-4.5.80/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2010-11-05 05:48:28.000000000 -0500
|
--- kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2011-07-27 20:34:33.000000000 +0200
|
||||||
+++ kdelibs-4.5.80/kdecore/kernel/kstandarddirs_unix.cpp 2010-11-20 10:48:44.671378287 -0600
|
+++ kdelibs-4.8.0/kdecore/kernel/kstandarddirs_unix.cpp 2012-01-19 13:38:07.424309462 +0100
|
||||||
@@ -63,7 +63,7 @@ QString KStandardDirs::installPath(const
|
@@ -63,7 +63,7 @@ QString KStandardDirs::installPath(const
|
||||||
if (strcmp("lib", type) == 0)
|
if (strcmp("lib", type) == 0)
|
||||||
return QFile::decodeName(LIB_INSTALL_DIR "/");
|
return QFile::decodeName(LIB_INSTALL_DIR "/");
|
||||||
@ -22,10 +22,10 @@ diff -up kdelibs-4.5.80/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs
|
|||||||
if (strcmp("locale", type) == 0)
|
if (strcmp("locale", type) == 0)
|
||||||
return QFile::decodeName(LOCALE_INSTALL_DIR "/");
|
return QFile::decodeName(LOCALE_INSTALL_DIR "/");
|
||||||
break;
|
break;
|
||||||
diff -up kdelibs-4.5.80/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.5.80/kdecore/tests/kstandarddirstest.cpp
|
diff -up kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp
|
||||||
--- kdelibs-4.5.80/kdecore/tests/kstandarddirstest.cpp.libexecdir 2010-11-11 08:41:42.000000000 -0600
|
--- kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp.libexecdir 2012-01-18 19:06:22.000000000 +0100
|
||||||
+++ kdelibs-4.5.80/kdecore/tests/kstandarddirstest.cpp 2010-11-20 10:44:54.914612189 -0600
|
+++ kdelibs-4.8.0/kdecore/tests/kstandarddirstest.cpp 2012-01-19 13:42:17.955103619 +0100
|
||||||
@@ -94,8 +94,9 @@ void KStandarddirsTest::testFindResource
|
@@ -96,8 +96,9 @@ void KStandarddirsTest::testFindResource
|
||||||
#define KIOSLAVE "bin/kioslave.exe"
|
#define KIOSLAVE "bin/kioslave.exe"
|
||||||
#else
|
#else
|
||||||
#define EXT ""
|
#define EXT ""
|
||||||
@ -36,7 +36,7 @@ diff -up kdelibs-4.5.80/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4
|
|||||||
const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT );
|
const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT );
|
||||||
QVERIFY( !bin.isEmpty() );
|
QVERIFY( !bin.isEmpty() );
|
||||||
QVERIFY( bin.endsWith( KIOSLAVE ) );
|
QVERIFY( bin.endsWith( KIOSLAVE ) );
|
||||||
@@ -221,7 +222,8 @@ void KStandarddirsTest::testFindExe()
|
@@ -231,7 +232,8 @@ void KStandarddirsTest::testFindExe()
|
||||||
// findExe with a result in libexec
|
// findExe with a result in libexec
|
||||||
const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" );
|
const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" );
|
||||||
QVERIFY( !lnusertemp.isEmpty() );
|
QVERIFY( !lnusertemp.isEmpty() );
|
||||||
@ -45,11 +45,11 @@ diff -up kdelibs-4.5.80/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4
|
|||||||
+ || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT, PATH_SENSITIVITY ) );
|
+ || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT, PATH_SENSITIVITY ) );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Check the "exe" resource too
|
#ifndef Q_OS_MAC // kdeinit4 is a bundle on Mac, so the below doesn't work
|
||||||
diff -up kdelibs-4.5.80/kio/tests/krununittest.cpp.libexecdir kdelibs-4.5.80/kio/tests/krununittest.cpp
|
diff -up kdelibs-4.8.0/kio/tests/krununittest.cpp.libexecdir kdelibs-4.8.0/kio/tests/krununittest.cpp
|
||||||
--- kdelibs-4.5.80/kio/tests/krununittest.cpp.libexecdir 2010-11-05 05:48:27.000000000 -0500
|
--- kdelibs-4.8.0/kio/tests/krununittest.cpp.libexecdir 2011-07-27 20:34:37.000000000 +0200
|
||||||
+++ kdelibs-4.5.80/kio/tests/krununittest.cpp 2010-11-20 10:44:54.915612398 -0600
|
+++ kdelibs-4.8.0/kio/tests/krununittest.cpp 2012-01-19 13:38:07.427309472 +0100
|
||||||
@@ -148,7 +148,7 @@ void KRunUnitTest::testProcessDesktopExe
|
@@ -160,7 +160,7 @@ void KRunUnitTest::testProcessDesktopExe
|
||||||
if (kmailservice.isEmpty()) kmailservice = "kmailservice";
|
if (kmailservice.isEmpty()) kmailservice = "kmailservice";
|
||||||
if (!kdeinit.isEmpty()) {
|
if (!kdeinit.isEmpty()) {
|
||||||
QVERIFY(!kmailservice.isEmpty());
|
QVERIFY(!kmailservice.isEmpty());
|
93
kdelibs.spec
93
kdelibs.spec
@ -18,14 +18,9 @@
|
|||||||
%global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
|
%global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
|
||||||
%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
|
%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
|
||||||
|
|
||||||
## exclude libkactivities or not
|
|
||||||
%define no_libkactivities 1
|
|
||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.7.4
|
Version: 4.8.1
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
%define fakeversion 4.7.97
|
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
@ -37,7 +32,13 @@ Provides: kdelibs4 = %{version}-%{release}
|
|||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://www.kde.org/
|
URL: http://www.kde.org/
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{fakeversion}/src/kdelibs-%{fakeversion}%{?alphatag}.tar.bz2
|
%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)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: kde4-macros(api) >= 2
|
BuildRequires: kde4-macros(api) >= 2
|
||||||
@ -86,7 +87,7 @@ Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
|
|||||||
Patch12: kdelibs-4.1.0-xdg-menu.patch
|
Patch12: kdelibs-4.1.0-xdg-menu.patch
|
||||||
|
|
||||||
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
|
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
|
||||||
Patch14: kdelibs-4.5.80-libexecdir.patch
|
Patch14: kdelibs-4.8.0-libexecdir.patch
|
||||||
|
|
||||||
# kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
|
# kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
|
||||||
Patch18: kdelibs-4.6.90-kstandarddirs.patch
|
Patch18: kdelibs-4.6.90-kstandarddirs.patch
|
||||||
@ -113,10 +114,6 @@ Patch41: 0002-Trigger-installation-of-missing-components-when-inst.patch
|
|||||||
# https://git.reviewboard.kde.org/r/102350/
|
# https://git.reviewboard.kde.org/r/102350/
|
||||||
Patch42: 0003-Implement-automatic-scanning-of-source-code-for-requ.patch
|
Patch42: 0003-Implement-automatic-scanning-of-source-code-for-requ.patch
|
||||||
|
|
||||||
# Bugfix: Plasma::PackageMetadata::read: Match the behavior of KService.
|
|
||||||
# https://git.reviewboard.kde.org/r/102404/
|
|
||||||
Patch43: 0004-Bugfix-Plasma-PackageMetadata-read-Match-the-behavio.patch
|
|
||||||
|
|
||||||
## upstreamable
|
## upstreamable
|
||||||
# knewstuff2 variant of:
|
# knewstuff2 variant of:
|
||||||
# https://git.reviewboard.kde.org/r/102439/
|
# https://git.reviewboard.kde.org/r/102439/
|
||||||
@ -129,23 +126,19 @@ Patch51: kdelibs-4.6.2-uri_mimetypes.patch
|
|||||||
# Toggle solid upnp support at runtime via env var SOLID_UPNP=1 (disabled by default)
|
# Toggle solid upnp support at runtime via env var SOLID_UPNP=1 (disabled by default)
|
||||||
Patch52: kdelibs-4.7.4-SOLID_UPNP.patch
|
Patch52: kdelibs-4.7.4-SOLID_UPNP.patch
|
||||||
|
|
||||||
# add s390/s390x support
|
# add s390/s390x support in kjs
|
||||||
Patch53: kdelibs-4.7.2-kjs-s390.patch
|
Patch53: kdelibs-4.7.2-kjs-s390.patch
|
||||||
|
|
||||||
## upstream
|
# don't set rpath on multiarch dirs, https://git.reviewboard.kde.org/r/103422
|
||||||
|
Patch101: kdelibs-4.8.0-cmake_cxx_implicit_link_directories.patch
|
||||||
|
|
||||||
## security fix
|
## security fix
|
||||||
# Not Upstreamed? why not ? -- Rex
|
# Not Upstreamed? why not ? -- Rex
|
||||||
Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
|
Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
|
||||||
# CVE-2010-0046, The Cascading Style Sheets (CSS) implementation in khtml/WebKit
|
|
||||||
# allows remote attackers to execute arbitrary code or cause a denial of service
|
|
||||||
# (memory corruption and application crash) via crafted format arguments.
|
|
||||||
Patch201: kdelibs-4.7.3-CVE-0046.patch
|
|
||||||
|
|
||||||
## Fedora specific patches
|
## Fedora specific patches
|
||||||
# make forcefully hal-free build
|
# make forcefully hal-free build
|
||||||
Patch300: kdelibs-4.7.3-halectomy.patch
|
Patch300: kdelibs-4.7.3-halectomy.patch
|
||||||
Patch301: kdelibs-%{fakeversion}-respin.patch
|
|
||||||
|
|
||||||
# force upgrade of apps using the discontinued KatePart Smart* interfaces to
|
# force upgrade of apps using the discontinued KatePart Smart* interfaces to
|
||||||
# versions using the new Moving* interfaces instead
|
# versions using the new Moving* interfaces instead
|
||||||
@ -251,9 +244,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
|||||||
Obsoletes: kdelibs4-devel < %{version}-%{release}
|
Obsoletes: kdelibs4-devel < %{version}-%{release}
|
||||||
Provides: kdelibs4-devel = %{version}-%{release}
|
Provides: kdelibs4-devel = %{version}-%{release}
|
||||||
%{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}}
|
%{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}}
|
||||||
%if ! 0%{?no_libkactivities}
|
|
||||||
Provides: libkactivities-devel = 5
|
|
||||||
%endif
|
|
||||||
Requires: automoc4 >= 0.9.88
|
Requires: automoc4 >= 0.9.88
|
||||||
Requires: cmake >= 2.6.4
|
Requires: cmake >= 2.6.4
|
||||||
Requires: pkgconfig(libattica) >= %{attica_ver}
|
Requires: pkgconfig(libattica) >= %{attica_ver}
|
||||||
@ -302,7 +292,7 @@ format for use with the Qt 4 Assistant or KDevelop 4.
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n kdelibs-%{fakeversion}
|
%setup -q -n kdelibs-%{version}
|
||||||
|
|
||||||
%patch0 -p1 -b .parallel_devel
|
%patch0 -p1 -b .parallel_devel
|
||||||
%patch2 -p1 -b .kde149705
|
%patch2 -p1 -b .kde149705
|
||||||
@ -321,7 +311,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||||||
%patch40 -p1 -b .libplasma-pk-0001
|
%patch40 -p1 -b .libplasma-pk-0001
|
||||||
%patch41 -p1 -b .libplasma-pk-0002
|
%patch41 -p1 -b .libplasma-pk-0002
|
||||||
%patch42 -p1 -b .libplasma-pk-0003
|
%patch42 -p1 -b .libplasma-pk-0003
|
||||||
%patch43 -p1 -b .libplasma-pk-0004
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# upstreamable patches
|
# upstreamable patches
|
||||||
@ -331,14 +320,13 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||||||
%patch53 -p1 -b .kjs-s390
|
%patch53 -p1 -b .kjs-s390
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
|
%patch101 -p1 -b .cmake_cxx_implicit_link_directories
|
||||||
|
|
||||||
# security fixes
|
# security fixes
|
||||||
%patch200 -p1 -b .CVE-2009-2702
|
%patch200 -p1 -b .CVE-2009-2702
|
||||||
%patch201 -p1 -b .CVE-2010-0046
|
|
||||||
|
|
||||||
# Fedora patches
|
# Fedora patches
|
||||||
%patch300 -p1 -b .halectomy
|
%patch300 -p1 -b .halectomy
|
||||||
%patch301 -p1 -b .kdelibs-respin
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -347,7 +335,6 @@ mkdir -p %{_target_platform}
|
|||||||
pushd %{_target_platform}
|
pushd %{_target_platform}
|
||||||
%{cmake_kde4} \
|
%{cmake_kde4} \
|
||||||
-DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" \
|
-DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" \
|
||||||
%{?no_libkactivities:-DBUILD_libkactivities:BOOL=OFF} \
|
|
||||||
..
|
..
|
||||||
popd
|
popd
|
||||||
|
|
||||||
@ -419,7 +406,7 @@ install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh
|
|||||||
|
|
||||||
%if 0%{?apidocs}
|
%if 0%{?apidocs}
|
||||||
mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en
|
mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en
|
||||||
cp -a kdelibs-%{fakeversion}%{?alphatag}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs
|
cp -a kdelibs-%{version}%{?alphatag}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs
|
||||||
find %{buildroot}%{_kde4_docdir}/HTML/en/ -name 'installdox' -exec rm -fv {} ';'
|
find %{buildroot}%{_kde4_docdir}/HTML/en/ -name 'installdox' -exec rm -fv {} ';'
|
||||||
rm -vf %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*.tmp \
|
rm -vf %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*.tmp \
|
||||||
%{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/index.qhp \
|
%{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/index.qhp \
|
||||||
@ -561,6 +548,8 @@ rm -rf %{buildroot}
|
|||||||
%doc KDE4PORTING.html
|
%doc KDE4PORTING.html
|
||||||
%{_mandir}/man1/kdecmake.1*
|
%{_mandir}/man1/kdecmake.1*
|
||||||
%{_mandir}/man1/makekdewidgets.1*
|
%{_mandir}/man1/makekdewidgets.1*
|
||||||
|
%{_mandir}/man1/kconfig_compiler.1*
|
||||||
|
%{_mandir}/man1/preparetips.1*
|
||||||
%{_kde4_bindir}/kconfig_compiler4
|
%{_kde4_bindir}/kconfig_compiler4
|
||||||
%{_kde4_bindir}/makekdewidgets4
|
%{_kde4_bindir}/makekdewidgets4
|
||||||
%if 0%{?libplasma_pk}
|
%if 0%{?libplasma_pk}
|
||||||
@ -585,16 +574,50 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Jan 03 2012 Lukas Tinkl <ltinkl@redhat.com> - 4.7.4-3
|
* Mon Mar 05 2012 Radek Novacek <rnovacek@redhat.com> 6:4.8.1-1
|
||||||
- update kdelibs to 4.8 RC2 (branded as a 4.7.4 respin)
|
- 4.8.1
|
||||||
|
- Drop upstreamed patches
|
||||||
|
|
||||||
* Tue Dec 06 2011 Than Ngo <than@redhat.com> - 4.7.4-2
|
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6:4.8.0-5
|
||||||
- add s390/s390x support in kjs
|
- Rebuilt for c++ ABI breakage
|
||||||
|
|
||||||
* Thu Dec 01 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.4-1
|
* Sat Feb 18 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.0-4
|
||||||
- 4.7.4
|
- don't set rpath on multiarch dirs (kde review request #103422)
|
||||||
|
|
||||||
|
* Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 6:4.8.0-3
|
||||||
|
- Rebuild against PCRE 8.30
|
||||||
|
|
||||||
|
* Sat Feb 04 2012 Rex Dieter <rdieter@fedoraproject.org> 6:4.8.0-2
|
||||||
|
- fix KDE_VERSION_STRING (kde#293204)
|
||||||
|
|
||||||
|
* Thu Jan 19 2012 Jaroslav Reznik <jreznik@redhat.com> - 6:4.8.0-1
|
||||||
|
- 4.8.0
|
||||||
|
|
||||||
|
* Wed Jan 04 2012 Radek Novacek <rnovacek@redhat.com> - 6:4.7.97-1
|
||||||
|
- 4.7.97
|
||||||
|
|
||||||
|
* Sat Dec 31 2011 Rex Dieter <rdieter@fedoraproject.org> 6:4.7.95-2
|
||||||
|
- rebuild (attica)
|
||||||
|
|
||||||
|
* Wed Dec 21 2011 Radek Novacek <rnovacek@redhat.com> - 6:4.7.95-1
|
||||||
|
- 4.7.95
|
||||||
|
- drop patch for Plasma::PackageMetadata::read: Match the behavior of KService.
|
||||||
|
|
||||||
|
* Tue Dec 06 2011 Than Ngo <than@redhat.com> - 4.7.90-2
|
||||||
|
- add ss390/s390x support in kjs
|
||||||
|
|
||||||
|
* Sat Dec 03 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.90-1
|
||||||
|
- 4.7.90
|
||||||
|
|
||||||
|
* Thu Dec 01 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.80-3
|
||||||
- disable solid/upnp by default, set env SOLID_UPNP=1 to re-enable (#754530, #758008, kde#259472)
|
- disable solid/upnp by default, set env SOLID_UPNP=1 to re-enable (#754530, #758008, kde#259472)
|
||||||
|
|
||||||
|
* Tue Nov 29 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.80-2
|
||||||
|
- drop kactivities conditional
|
||||||
|
|
||||||
|
* Fri Nov 18 2011 Jaroslav Reznik <jreznik@redhat.com> 4.7.80-1
|
||||||
|
- 4.7.80 (beta 1)
|
||||||
|
|
||||||
* Wed Nov 16 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.3-5
|
* Wed Nov 16 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.3-5
|
||||||
- restore halectomy patch (sans fstab-removing pieces)
|
- restore halectomy patch (sans fstab-removing pieces)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user