rpms/kdelibs4/devel kde4.csh, NONE, 1.1 kde4.sh, NONE, 1.1 kdelibs-3.93.0-colorscheme-hack.diff, NONE, 1.1 kdelibs-3.93.0-kde149703.diff, NONE, 1.1 kdelibs-3.93.0-kde149704.diff, NONE, 1.1 kdelibs-3.93.0-kde149705.diff, NONE, 1.1 kdelibs-3.93.0-parallel-devel.diff, NONE, 1.1 kdelibs4.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Fri Sep 21 14:22:47 UTC 2007
- Previous message: rpms/foomatic/devel foomatic.spec,1.164,1.165
- Next message: rpms/kdelibs4/F-7 kde4.csh, NONE, 1.1 kde4.sh, NONE, 1.1 kdelibs-3.93.0-colorscheme-hack.diff, NONE, 1.1 kdelibs-3.93.0-kde149703.diff, NONE, 1.1 kdelibs-3.93.0-kde149704.diff, NONE, 1.1 kdelibs-3.93.0-kde149705.diff, NONE, 1.1 kdelibs-3.93.0-parallel-devel.diff, NONE, 1.1 kdelibs4.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/kdelibs4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3191/devel
Modified Files:
.cvsignore sources
Added Files:
kde4.csh kde4.sh kdelibs-3.93.0-colorscheme-hack.diff
kdelibs-3.93.0-kde149703.diff kdelibs-3.93.0-kde149704.diff
kdelibs-3.93.0-kde149705.diff
kdelibs-3.93.0-parallel-devel.diff kdelibs4.spec
Log Message:
New package kdelibs4 - K Desktop Environment 4 - Libraries
(copied from kdelibs-kde4-branch, kdelibs.spec renamed to kdelibs4.spec to match guidelines)
--- NEW FILE kde4.csh ---
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
## for possible entries here
## Make sure KDEDIRS is set
if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
## When/if using prelinking, avoids use of kdeinit
if ( -f /etc/sysconfig/prelink ) then
set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
if ( "$PRELINKING" == "yes" ) then
if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
endif
endif
if ( ! $?QT_PLUGIN_PATH ) then
set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}`
setenv QT_PLUGIN_PATH ${KDE4_LIBDIR}/kde4/plugins
endif
--- NEW FILE kde4.sh ---
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
## for possible entries here
## Make sure KDEDIRS is set
[ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
## When/if using prelinking, avoids (some) use of kdeinit
if [ -f /etc/sysconfig/prelink ]; then
if [ `grep '^PRELINKING=yes' /etc/sysconfig/prelink` ] ; then
[ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
fi
fi
if [ -z "$QT_PLUGIN_PATH" ]; then
KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null`
QT_PLUGIN_PATH=${KDE4_LIBDIR}/kde4/plugins && export QT_PLUGIN_PATH
fi
kdelibs-3.93.0-colorscheme-hack.diff:
--- NEW FILE kdelibs-3.93.0-colorscheme-hack.diff ---
diff -ur kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp
--- kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp 2007-08-29 23:53:42.000000000 +0200
+++ kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp 2007-09-12 10:22:34.000000000 +0200
@@ -114,8 +114,8 @@
_colors.deco[1] = cfg.readEntry( "DecorationFocus", QColor(239,132,65) );
// apply state adjustments
- if (state != QPalette::Active) {
- // TODO - now tweak all the colors based on the state!
+ if (state == QPalette::Disabled) {
+ _colors.fg[0] = _colors.fg[1];
}
// calculated backgrounds
@@ -238,11 +238,7 @@
d = new KColorSchemePrivate(config, state, "Colors:Button", defaultButtonColors);
break;
case Selection:
- // inactiver/disabled uses Window colors instead, ala gtk
- if (state == QPalette::Active)
- d = new KColorSchemePrivate(config, state, "Colors:Selection", defaultSelectionColors);
- else
- d = new KColorSchemePrivate(config, state, "Colors:Window", defaultSelectionColors);
+ d = new KColorSchemePrivate(config, QPalette::Active, "Colors:Selection", defaultSelectionColors);
break;
case Tooltip:
d = new KColorSchemePrivate(config, state, "Colors:Tooltip", defaultTooltipColors);
kdelibs-3.93.0-kde149703.diff:
--- NEW FILE kdelibs-3.93.0-kde149703.diff ---
diff -ur kdelibs-3.93.0/kdecore/services/kservicetypeprofile.cpp kdelibs-3.93.0-kde149703/kdecore/services/kservicetypeprofile.cpp
--- kdelibs-3.93.0/kdecore/services/kservicetypeprofile.cpp 2007-08-29 23:53:54.000000000 +0200
+++ kdelibs-3.93.0-kde149703/kdecore/services/kservicetypeprofile.cpp 2007-09-10 05:44:50.000000000 +0200
@@ -133,7 +133,7 @@
// appId = pService->storageId();
const QString type = config.readEntry( "ServiceType" );
- const QString type2 = config.readEntry( "GenericServiceType" );
+ const QString type2 = config.readEntry( "GenericServiceType", "Application" );
int pref = config.readEntry( "Preference", 0 );
if ( !type.isEmpty() /* && pref >= 0*/ ) // Don't test for pref here. We want those in the list, to mark them as forbidden
kdelibs-3.93.0-kde149704.diff:
--- NEW FILE kdelibs-3.93.0-kde149704.diff ---
Index: xmlgui/kxmlguiclient.cpp
===================================================================
--- xmlgui/kxmlguiclient.cpp (revision 709581)
+++ xmlgui/kxmlguiclient.cpp (working copy)
@@ -785,11 +785,11 @@
allDocuments.append( d );
}
- QList<DocStruct>::Iterator best = allDocuments.end();
+ QList<DocStruct>::const_iterator best = allDocuments.end();
uint bestVersion = 0;
- QList<DocStruct>::Iterator docIt = allDocuments.begin();
- QList<DocStruct>::Iterator docEnd = allDocuments.end();
+ QList<DocStruct>::const_iterator docIt = allDocuments.begin();
+ const QList<DocStruct>::const_iterator docEnd = allDocuments.end();
for (; docIt != docEnd; ++docIt )
{
QString versionStr = findVersionNumber( (*docIt).data );
@@ -814,19 +814,19 @@
{
if ( best != allDocuments.begin() )
{
- QList<DocStruct>::Iterator local = allDocuments.begin();
+ QList<DocStruct>::iterator local = allDocuments.begin();
+ if ( (*local).file.startsWith(KGlobal::dirs()->localkdedir()) ) {
- // load the local document and extract the action properties
- QDomDocument document;
- document.setContent( (*local).data );
+ // load the local document and extract the action properties
+ QDomDocument document;
+ document.setContent( (*local).data );
- ActionPropertiesMap properties = extractActionProperties( document );
+ ActionPropertiesMap properties = extractActionProperties( document );
- // in case the document has a ActionProperties section
- // we must not delete it but copy over the global doc
- // to the local and insert the ActionProperties section
- if ( !properties.isEmpty() )
- {
+ // in case the document has a ActionProperties section
+ // we must not delete it but copy over the global doc
+ // to the local and insert the ActionProperties section
+ if ( !properties.isEmpty() ) {
// now load the global one with the higher version number
// into memory
document.setContent( (*best).data );
@@ -845,14 +845,14 @@
f.write( utf8data.constData(), utf8data.length() );
f.close();
}
+ }
+ else
+ {
+ QString f = (*local).file;
+ QString backup = f + QLatin1String( ".backup" );
+ QFile::rename( f, backup );
+ }
}
- else
- {
- QString f = (*local).file;
- QString backup = f + QLatin1String( ".backup" );
- QDir dir;
- dir.rename( f, backup );
- }
}
doc = (*best).data;
return (*best).file;
kdelibs-3.93.0-kde149705.diff:
--- NEW FILE kdelibs-3.93.0-kde149705.diff ---
diff -ur kdelibs-3.93.0/kdeui/icons/kicontheme.cpp kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp
--- kdelibs-3.93.0/kdeui/icons/kicontheme.cpp 2007-07-26 12:43:19.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp 2007-09-10 06:13:41.000000000 +0200
@@ -504,7 +504,7 @@
return *_theme;
KConfigGroup cg(KGlobal::config(), "Icons");
- *_theme = cg.readEntry("Theme", defaultThemeName());
+ *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName();
/* if (_theme->isEmpty())
{
diff -ur kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp
--- kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp 2007-08-29 23:53:34.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp 2007-09-10 06:10:35.000000000 +0200
@@ -856,7 +856,7 @@
#ifdef Q_WS_X11
KConfigGroup pConfig (KGlobal::config(), "General");
QString defaultStyle = QLatin1String("plastique");// = KStyle::defaultStyle(); ### wait for KStyle4
- QString styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
+ QString styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
if (kde_overrideStyle.isEmpty()) {
// ### add check whether we already use the correct style to return then
diff -ur kdelibs-3.93.0/kutils/kdeglobals.kcfg kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg
--- kdelibs-3.93.0/kutils/kdeglobals.kcfg 2007-06-27 12:53:42.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg 2007-09-10 06:18:45.000000000 +0200
@@ -24,6 +24,10 @@
<whatsthis>The name of the widget style, for example "keramik" or "plastik". Without quotes.</whatsthis>
<default>keramik</default>
</entry>
+ <entry key="widgetStyle4" type="String" >
+ <label>Widget style to use for KDE 4</label>
+ <whatsthis>The name of the widget style, for example "oxygen". Without quotes. Defaults to widgetStyle.</whatsthis>
+ </entry>
<entry key="windowBackground" type="String" />
<entry key="windowForeground" type="String" />
<entry key="UseSystemBell" type="Bool" >
kdelibs-3.93.0-parallel-devel.diff:
--- NEW FILE kdelibs-3.93.0-parallel-devel.diff ---
diff -ur kdelibs-3.93.0/cmake/modules/FindKDE4Internal.cmake kdelibs-3.93.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-3.93.0/cmake/modules/FindKDE4Internal.cmake 2007-08-29 23:52:38.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/cmake/modules/FindKDE4Internal.cmake 2007-09-09 09:38:58.000000000 +0200
@@ -15,10 +15,10 @@
# The following variables are defined for the various tools required to
# compile KDE software:
#
-# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable
+# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable
# KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable
# KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
-# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
+# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
#
# The following variables point to the location of the KDE libraries,
# but shouldn't be used directly:
@@ -125,7 +125,7 @@
# Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
#
# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
-# Use this to add widget description files for the makekdewidgets code generator
+# Use this to add widget description files for the makekdewidgets4 code generator
# for Qt Designer plugins.
#
# KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
@@ -265,24 +265,24 @@
if (WIN32)
set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} )
# CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
+ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
set(KDE4_AUTOMOC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc )
set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
+ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
else (WIN32)
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib )
- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
+ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
set(KDE4_AUTOMOC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc.shell )
set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
+ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
endif (WIN32)
set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
# when building kdelibs, make the kcfg rules depend on the binaries...
- set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
+ set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
set( _KDE4_AUTOMOC_EXECUTABLE_DEP kde4automoc)
- set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+ set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -321,83 +321,83 @@
# this file contains all dependencies of all libraries of kdelibs, Alex
include(${kde_cmake_module_dir}/KDELibsDependencies.cmake)
- find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} )
- find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} )
- find_library(KDE4_KDEFX_LIBRARY NAMES kdefx PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KDEFX_LIBRARY NAMES kdefx PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KDEFX_LIBS ${kdefx_LIB_DEPENDS} ${KDE4_KDEFX_LIBRARY} )
- find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} )
- find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} )
- find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} )
- find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} )
- find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} )
- find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} )
- find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} )
- find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} )
- find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} )
- find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KDEPRINT_LIBS ${kdeprint_LIB_DEPENDS} ${KDE4_KDEPRINT_LIBRARY} )
if (UNIX)
- find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} )
endif (UNIX)
- find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} )
- find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_PHONON_LIBS ${phonon_LIB_DEPENDS} ${KDE4_PHONON_LIBRARY} )
- find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KAUDIODEVICELIST_LIBS ${kaudiodevicelist_LIB_DEPENDS} ${KDE4_KAUDIODEVICELIST_LIBRARY} )
- find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} )
- find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} )
- find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} )
- find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} )
- find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} )
- find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} )
# Can't do that, it's not always compiled.
- #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
#set(KDE4_KNEPOMUK_LIBS ${knepomuk_LIB_DEPENDS} ${KDE4_KNEPOMUK_LIBRARY} )
# Can't do that, it's not always compiled. See FindKMetaData.cmake
- #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
#set(KDE4_KMETADATA_LIBS ${kmetadata_LIB_DEPENDS} ${KDE4_KMETADATA_LIBRARY} )
get_filename_component(KDE4_LIB_DIR ${KDE4_KDECORE_LIBRARY} PATH )
@@ -408,8 +408,8 @@
# at first look in LIBEXEC_INSTALL_DIR and no default paths,
# if this didn't succeed, the second call makes cmake search again, but in the standard paths
- find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
- find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler )
+ find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 )
find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc )
@@ -417,8 +417,8 @@
find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 )
- find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
- find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets )
+ find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 )
# allow searching cmake modules in all given kde install locations (KDEDIRS based)
execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -569,7 +569,8 @@
"${_CMAKE_INSTALL_DIR}/bin"
"${CMAKE_INSTALL_PREFIX}/bin" )
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
+ ${CMAKE_SYSTEM_LIBRARY_PATH}
"${KDE4_LIB_INSTALL_DIR}"
"${_CMAKE_INSTALL_DIR}/lib"
"${CMAKE_INSTALL_PREFIX}/lib" )
@@ -908,9 +909,9 @@
endif (NOT _kdeBootStrapping)
if(KDE4_KCFGC_EXECUTABLE)
- message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+ message(STATUS "Found KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
else(KDE4_KCFGC_EXECUTABLE)
- message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
+ message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
endif(KDE4_KCFGC_EXECUTABLE)
if(KDE4_AUTOMOC_EXECUTABLE)
diff -ur kdelibs-3.93.0/doc/api/doxygen-preprocess-kcfg.sh kdelibs-3.93.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-3.93.0/doc/api/doxygen-preprocess-kcfg.sh 2007-07-26 12:40:17.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/doc/api/doxygen-preprocess-kcfg.sh 2007-09-09 09:09:44.000000000 +0200
@@ -2,9 +2,9 @@
# Generates and cleans KConfigXT source code during a API dox build
#
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
if test -z "$kcfg_compiler"; then
- echo "kconfig_compiler not found!"
+ echo "kconfig_compiler4 not found!"
exit 1;
fi
diff -ur kdelibs-3.93.0/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-3.93.0/kdecore/kconfig_compiler/checkkcfg.pl 2006-10-26 04:25:48.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/checkkcfg.pl 2007-09-09 09:11:00.000000000 +0200
@@ -15,12 +15,12 @@
$kcfgc = $file . "c";
-$cmd = "./kconfig_compiler $file $kcfgc";
+$cmd = "./kconfig_compiler4 $file $kcfgc";
#print "CMD $cmd\n";
if ( system( $cmd ) != 0 ) {
- print STDERR "Unable to run kconfig_compiler\n";
+ print STDERR "Unable to run kconfig_compiler4\n";
exit 1;
}
diff -ur kdelibs-3.93.0/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-3.93.0/kdecore/kconfig_compiler/CMakeLists.txt 2007-07-26 12:41:18.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdecore/kconfig_compiler/CMakeLists.txt 2007-09-09 09:11:24.000000000 +0200
@@ -8,11 +8,11 @@
set(kconfig_compiler_SRCS kconfig_compiler.cpp)
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
-target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
+target_link_libraries(kconfig_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
-install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} )
########### install files ###############
diff -ur kdelibs-3.93.0/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-3.93.0/kdeui/tests/kconfig_compiler/CMakeLists.txt 2007-07-26 12:43:04.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdeui/tests/kconfig_compiler/CMakeLists.txt 2007-09-09 09:17:02.000000000 +0200
@@ -8,7 +8,7 @@
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
# set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
diff -ur kdelibs-3.93.0/kdewidgets/CMakeLists.txt kdelibs-3.93.0-parallel-devel/kdewidgets/CMakeLists.txt
--- kdelibs-3.93.0/kdewidgets/CMakeLists.txt 2007-07-26 12:40:43.000000000 +0200
+++ kdelibs-3.93.0-parallel-devel/kdewidgets/CMakeLists.txt 2007-09-09 09:19:15.000000000 +0200
@@ -16,22 +16,22 @@
set(makekdewidgets_SRCS makekdewidgets.cpp )
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
-target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} )
+target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} )
-install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} )
########### next target ###############
# get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
- MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
+ MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
set(kdewidgets_PART_SRCS
classpreviews.cpp
--- NEW FILE kdelibs4.spec ---
# TODO:
# 1. package some noarch bits separately: apidocs.
Summary: K Desktop Environment 4 - Libraries
Version: 3.93.0
Release: 9%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
Epoch: 6
Obsoletes: kdelibs4 < %{version}-%{release}
Provides: kdelibs4 = %{version}-%{release}
%else
Name: kdelibs4
%endif
# LGPLv2: everything, except (see below)
# BSD: kdoctools/
# GFDL: kdoctools/customization ?
License: LGPLv2 and BSD
URL: http://www.kde.org/
Group: System Environment/Libraries
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# for macros.kde4
BuildRequires: kde-filesystem
Requires: hicolor-icon-theme
Requires: kde-filesystem
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
Requires: shared-mime-info
#Requires: kde4-settings
Source1: kde4.sh
Source2: kde4.csh
# make -devel packages parallel-installable
Patch0: kdelibs-3.93.0-parallel-devel.diff
# fix kde#149703
Patch1: kdelibs-3.93.0-kde149703.diff
# fix kde#149704
Patch2: kdelibs-3.93.0-kde149704.diff
# fix kde#149705
Patch3: kdelibs-3.93.0-kde149705.diff
# KColorScheme was in a state of transition when Beta 2 was released, so
# disabled text isn't handled properly. This hack restores the August 27
# behavior (while keeping the August 29 API).
Patch4: kdelibs-3.93.0-colorscheme-hack.diff
BuildRequires: qt4-devel >= 4.3.0
%global qt4_ver %(pkg-config QtCore --modversion 2>/dev/null || echo 4.3.0)
Requires: qt4 >= %{qt4_ver}
Requires: xdg-utils
Requires(post): /sbin/ldconfig xdg-utils
Requires(postun): /sbin/ldconfig xdg-utils
BuildRequires: alsa-lib-devel
BuildRequires: aspell-devel
BuildRequires: avahi-devel
BuildRequires: bzip2-devel
BuildRequires: cmake
BuildRequires: cups-devel cups
BuildRequires: enchant-devel
BuildRequires: gamin-devel
BuildRequires: gettext-devel
BuildRequires: giflib-devel
BuildRequires: krb5-devel
BuildRequires: libacl-devel libattr-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
BuildRequires: libxslt-devel libxml2-devel
BuildRequires: OpenEXR-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: shared-mime-info
BuildRequires: soprano-devel
BuildRequires: strigi-devel >= 0.5.5
BuildRequires: zlib-devel
%description
Libraries for the K Desktop Environment 4.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).
%package devel
Group: Development/Libraries
Summary: Header files for compiling KDE 4 applications
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{name}" == "kdelibs4"
%else
Obsoletes: kdelibs4-devel < %{version}-%{release}
Provides: kdelibs4-devel = %{version}-%{release}
%endif
Requires: qt4-devel
Requires: openssl-devel
Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
## FIXME/TODO: trim these down -- Rex
#Requires: libxslt-devel aspell-devel giflib-devel
#Requires: libpng-devel gettext-devel
#Requires: libtiff-devel pcre-devel libxml2-devel cups-devel libjpeg-devel
#Requires: krb5-devel
#Requires: alsa-lib-devel avahi-devel
%description devel
This package includes the header files you will need to compile
applications for KDE 4.
WARNING: This is a beta version. It probably has many bugs left.
Also, the API and ABI are NOT fully stable yet (soft freeze only).
%prep
%setup -q -n kdelibs-%{version}
%patch0 -p1
%patch1 -p1
pushd kdeui
%patch2 -p0
popd
%patch3 -p1
%patch4 -p1
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd
make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
# FIXME/TODO: apidocs
# doc/api/doxygen.sh --doxdatadir=doc/common .
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} -C %{_target_platform}
# see also use-of/patching of XDG_MENU_PREFIX in kdebase
mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
%{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
# fix file conflict with mozilla's js (kde#149840)
mv -f %{buildroot}%{_kde4_bindir}/js %{buildroot}%{_kde4_bindir}/kjs
# remove files which conflict with KDE 3
rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
%{buildroot}%{_kde4_bindir}/kunittestmodrunner
rm -f %{buildroot}%{_kde4_configdir}/kdebug.areas %{buildroot}%{_kde4_configdir}/kdebugrc \
%{buildroot}%{_kde4_configdir}/kdeprintrc %{buildroot}%{_kde4_configdir}/ui/ui_standards.rc
rm -f %{buildroot}%{_kde4_docdir}/HTML/en/common/*
rm -f %{buildroot}%{_kde4_sharedir}/locale/all_languages
# move devel symlinks
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
pushd %{buildroot}%{_kde4_libdir}
for i in lib*.so
do
case "$i" in
libkdeinit4_*.so)
;;
*)
linktarget=`readlink "$i"`
rm -f "$i"
ln -sf "../../$linktarget" "kde4/devel/$i"
;;
esac
done
popd
install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde4.sh
install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde4.csh
%post
/sbin/ldconfig ||:
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :
%postun
/sbin/ldconfig ||:
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc AUTHORS README TODO
%doc COPYING COPYING-DOCS COPYING.LIB
%config(noreplace) %{_sysconfdir}/profile.d/*
%{_kde4_bindir}/*
%exclude %{_kde4_bindir}/kconfig_compiler4
%{_kde4_appsdir}/*
# kdewidgets
%exclude %{_kde4_bindir}/makekdewidgets4
%exclude %{_kde4_appsdir}/kdewidgets/
%exclude %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
# ksgmltools2
%exclude %{_kde4_appsdir}/ksgmltools2/
%{_kde4_configdir}/*
%{_datadir}/dbus-1/interfaces/*
%{_kde4_datadir}/mime/packages/*
%{_kde4_sharedir}/kde4/services/*
%{_kde4_sharedir}/kde4/servicetypes/*
%{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
%{_kde4_docdir}/HTML/en/*
%{_kde4_libdir}/lib*.so.*
%{_kde4_libdir}/libkdeinit4_*.so
%{_kde4_libdir}/kde4/
%exclude %{_kde4_libdir}/kde4/devel/
%{_kde4_sysconfdir}/xdg/menus/*.menu
%files devel
%defattr(-,root,root,-)
%doc KDE4PORTING.html
%{_kde4_bindir}/kconfig_compiler4
%{_kde4_bindir}/makekdewidgets4
%{_kde4_appsdir}/kdewidgets/
%dir %{_kde4_libdir}/kde4/plugins/designer
%{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
%{_kde4_appsdir}/ksgmltools2/
%{_kde4_includedir}/*
%{_kde4_libdir}/kde4/devel/
%changelog
* Thu Sep 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-9
- -devel: (re)add Requires: bzip2-devel gamin-devel libacl-devel strigi-devel zlib-devel
- update sources
- sync kde4.(sh|csh) changes wrt KDE_IS_PRELINKED w/ devel/ branch
* Fri Sep 14 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-8
- rename js to kjs because of file conflict (kde#149840)
* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-7
- actually install kde4.sh and kde4.csh
- sync KDE_IS_PRELINKED setting in kde4.sh and kde4.csh with kdelibs 3
(workaround for #244065 no longer needed, fixed in 3.93.0)
* Thu Sep 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-6
- set QT_PLUGIN_PATH in kde4.sh and kde4.csh
* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-5
- fix strange coloring due to incomplete changes to KColorScheme
* Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
- use upstream fix (by David Faure) for kde#149704
* Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-3
- fix kde#149703, kde#149704, kde#149705
* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-2
- remove files which conflict with KDE 3
- rename kconfig_compiler and makekdewidgets to *4
- move devel symlinks to %%{_kde4_libdir}/kde4/devel/
- drop Conflicts: kdelibs-devel
* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
- update to 3.93.0
- drop kde4home patch (no longer applied)
- drop kdeprint soversion conflict patch (fixed upstream)
- remove icon-related code, pics/ is now in kdebase-runtime
- BR strigi-devel >= 0.5.5 due to API changes
- package hicolor presence_* icons which are not in hicolor-icon-theme
- don't list non-existing ksvgtopng in devel binaries (now in kdebase-runtime)
* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
- -devel: omit most (hopefully) extraneous Requires:
- use macros.kde4
- -devel: Conflicts: kdelibs-devel (in %%_bindir,%%_libdir)
- License clarification
* Fri Aug 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-3
- name kdelibs4, don't mess with %%_prefix (for now)
- move to -devel: checkXML, kconfig_compiler, (make)kdewidgets, ksgmltools2,
ksvgtopng, kunittestmodrunner
- set KDE_IS_PRELINKED unconditionally (#244065)
- License: LGPLv2
- Requires: shared-mime-info
* Mon Jul 30 2007 Than Ngo <than at redhat.com> 3.92.0-2
- fix conlict with kde3
- add -DSYSCONF_INSTALL_DIR
* Sat Jul 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-1
- kde-3.92.0 (kde4-beta1)
* Thu Jul 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.91.0-6
- add missing epoch to main package Requires for -devel if name is kdelibs
* Tue Jul 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-5
- BR: soprano-devel
- prefix=/usr cleanups
* Wed Jul 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.91.0-4
- apply upstream bugfix for KatePart syntax highlighting (kde #145571)
* Thu Jun 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-3
- fix %%_sysconfdir for %%_prefix != /usr case.
* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-2
- updated kde4home.diff
- CMAKE_BUILD_TYPE=RelWithDebInfo (we're already using %%optflags)
* Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
- kde-3.91.0
- CMAKE_BUILD_TYPE=debug
* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-3
- specfile cleanup (%%prefix issues mostly)
* Wed May 30 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.90.1-2
- add missing BR shared-mime-info
* Sun May 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.90.1-1
- update to 3.90.1
- drop backported upstream fixes already in 3.90.1
- bump cmake BR to 2.4.5 as required upstream now
- add BR strigi-devel, alsa-lib-devel, avahi-devel
- don't set execute bits by hand anymore, cmake has been fixed
- use multilibs in /opt/kde4
* Mon Mar 26 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-5
- apply upstream fixes to build with Qt 4.3 Beta
* Sat Mar 24 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-4
- restore minimum version requirements for cmake and qt4-devel
- drop visibility hack (no longer needed with latest qt4 package)
- don't set QT4DIR and PATH anymore, qdbuscpp2xml has been fixed
- apply upstream bugfixes:
- * khtml segfault fix
- * message box cancel button fix
- * kprocio received buffer truncation fix (backported)
- * KatePart keyboard shortcut (Ctrl+Right, Shift+Right) fix
* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.80.3-3
- +eXecute perms for %%{_prefix}/lib/*
* Fri Feb 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-2
- apply upstream patch to fix klauncher crash
- hack around Qt 4 being built with no visibility support
- install Qt Designer plugin
* Wed Feb 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-1
- update to 3.80.3
- update and improve parallel-installability patch
- set QT4DIR and PATH so CMake's direct $QT4DIR/qdbuscpp2xml calls work
- move libkdeinit_*.so from -devel to main package
- symlink kde4-config into /usr/bin so it can be used for path setting
* Wed Nov 29 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.4.20061003svn
- dropped -DCMAKE_SKIP_RPATH=TRUE from cmake
- compiling with QA_RPATHS=0x0003; export QA_RPATHS
* Sun Nov 26 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.3.20061003svn
- Added foolishly dropped libjpeg-devel, zlib-devel, krb5-devel, libattr-devel again as BR
* Thu Nov 23 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.2.20061003svn
- parallel build support
- added -DCMAKE_SKIP_RPATH=TRUE to cmake to skip rpath
- dropped libjpeg-devel, zlib-devel, krb5-devel, libattr-devel as BR
- dropped duplicate libattr-devel in BR
- spec file cleanups and added clean up in %%install
- fixed missing dependency : libkdeinit_knotify.so
* Sat Oct 07 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.2-0.1.20061003svn
- first Fedora RPM (parts borrowed from the OpenSUSE kdelibs 4 RPM and the Fedora kdelibs 3 RPM)
- apply parallel-installability patch
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 21 Sep 2007 02:29:45 -0000 1.1
+++ .cvsignore 21 Sep 2007 14:22:15 -0000 1.2
@@ -0,0 +1,3 @@
+clog
+kdelibs-3.92.0.tar.bz2
+kdelibs-3.93.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 21 Sep 2007 02:29:45 -0000 1.1
+++ sources 21 Sep 2007 14:22:15 -0000 1.2
@@ -0,0 +1 @@
+dac92cdd69bd08d5877e288e7371499d kdelibs-3.93.0.tar.bz2
- Previous message: rpms/foomatic/devel foomatic.spec,1.164,1.165
- Next message: rpms/kdelibs4/F-7 kde4.csh, NONE, 1.1 kde4.sh, NONE, 1.1 kdelibs-3.93.0-colorscheme-hack.diff, NONE, 1.1 kdelibs-3.93.0-kde149703.diff, NONE, 1.1 kdelibs-3.93.0-kde149704.diff, NONE, 1.1 kdelibs-3.93.0-kde149705.diff, NONE, 1.1 kdelibs-3.93.0-parallel-devel.diff, NONE, 1.1 kdelibs4.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list