* Sun Dec 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.1.85-2
- tweak parallel_devel patch to get a -L flag for the symlink directory
This commit is contained in:
Kevin Kofler
parent
2c9760b24f
commit
aabfe8bbca
|
|
@ -1,6 +1,6 @@
|
|||
diff -Naurw kdelibs-4.1.82/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.82.parallel_devel/cmake/modules/FindKDE4Internal.cmake
|
||||
--- kdelibs-4.1.82/cmake/modules/FindKDE4Internal.cmake 2008-12-09 14:11:55.000000000 +0100
|
||||
+++ kdelibs-4.1.82.parallel_devel/cmake/modules/FindKDE4Internal.cmake 2008-12-09 14:12:43.000000000 +0100
|
||||
diff -ur kdelibs-4.1.85/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.85-parallel_devel/cmake/modules/FindKDE4Internal.cmake
|
||||
--- kdelibs-4.1.85/cmake/modules/FindKDE4Internal.cmake 2008-12-04 09:35:54.000000000 +0100
|
||||
+++ kdelibs-4.1.85-parallel_devel/cmake/modules/FindKDE4Internal.cmake 2008-12-14 03:24:15.000000000 +0100
|
||||
@@ -15,10 +15,10 @@
|
||||
# The following variables are defined for the various tools required to
|
||||
# compile KDE software:
|
||||
|
|
@ -81,7 +81,7 @@ diff -Naurw kdelibs-4.1.82/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.82.p
|
|||
|
||||
mark_as_advanced(KDE4_KCFGC_EXECUTABLE KDE4_MEINPROC_EXECUTABLE KDE4_MAKEKDEWIDGETS_EXECUTABLE)
|
||||
|
||||
@@ -795,7 +795,8 @@
|
||||
@@ -795,9 +795,12 @@
|
||||
set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
|
||||
"${KDE4_BIN_INSTALL_DIR}" )
|
||||
|
||||
|
|
@ -90,8 +90,12 @@ diff -Naurw kdelibs-4.1.82/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.82.p
|
|||
+ ${CMAKE_SYSTEM_LIBRARY_PATH}
|
||||
"${KDE4_LIB_INSTALL_DIR}" )
|
||||
|
||||
+link_directories("${KDE4_LIB_INSTALL_DIR}/kde4/devel")
|
||||
+
|
||||
# under Windows dlls may be also installed in bin/
|
||||
@@ -1186,9 +1187,9 @@
|
||||
if(WIN32)
|
||||
set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
|
||||
@@ -1185,9 +1188,9 @@
|
||||
endif (NOT _kdeBootStrapping)
|
||||
|
||||
if(KDE4_KCFGC_EXECUTABLE)
|
||||
|
|
@ -103,9 +107,9 @@ diff -Naurw kdelibs-4.1.82/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.82.p
|
|||
endif(KDE4_KCFGC_EXECUTABLE)
|
||||
|
||||
if(AUTOMOC4_EXECUTABLE)
|
||||
diff -Naurw kdelibs-4.1.82/doc/api/doxygen-preprocess-kcfg.sh kdelibs-4.1.82.parallel_devel/doc/api/doxygen-preprocess-kcfg.sh
|
||||
--- kdelibs-4.1.82/doc/api/doxygen-preprocess-kcfg.sh 2008-05-21 13:07:26.000000000 +0200
|
||||
+++ kdelibs-4.1.82.parallel_devel/doc/api/doxygen-preprocess-kcfg.sh 2008-12-09 14:12:43.000000000 +0100
|
||||
diff -ur kdelibs-4.1.85/doc/api/doxygen-preprocess-kcfg.sh kdelibs-4.1.85-parallel_devel/doc/api/doxygen-preprocess-kcfg.sh
|
||||
--- kdelibs-4.1.85/doc/api/doxygen-preprocess-kcfg.sh 2008-05-21 13:07:26.000000000 +0200
|
||||
+++ kdelibs-4.1.85-parallel_devel/doc/api/doxygen-preprocess-kcfg.sh 2008-12-14 03:21:42.000000000 +0100
|
||||
@@ -2,9 +2,9 @@
|
||||
# Generates and cleans KConfigXT source code during a API dox build
|
||||
#
|
||||
|
|
@ -118,9 +122,9 @@ diff -Naurw kdelibs-4.1.82/doc/api/doxygen-preprocess-kcfg.sh kdelibs-4.1.82.par
|
|||
exit 1;
|
||||
fi
|
||||
|
||||
diff -Naurw kdelibs-4.1.82/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-4.1.82.parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl
|
||||
--- kdelibs-4.1.82/kdecore/kconfig_compiler/checkkcfg.pl 2008-05-21 13:09:13.000000000 +0200
|
||||
+++ kdelibs-4.1.82.parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl 2008-12-09 14:12:43.000000000 +0100
|
||||
diff -ur kdelibs-4.1.85/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-4.1.85-parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl
|
||||
--- kdelibs-4.1.85/kdecore/kconfig_compiler/checkkcfg.pl 2008-05-21 13:09:13.000000000 +0200
|
||||
+++ kdelibs-4.1.85-parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl 2008-12-14 03:21:42.000000000 +0100
|
||||
@@ -15,12 +15,12 @@
|
||||
|
||||
$kcfgc = $file . "c";
|
||||
|
|
@ -136,9 +140,9 @@ diff -Naurw kdelibs-4.1.82/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-4.1.82.
|
|||
exit 1;
|
||||
}
|
||||
|
||||
diff -Naurw kdelibs-4.1.82/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-4.1.82.parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-4.1.82/kdecore/kconfig_compiler/CMakeLists.txt 2008-10-30 15:19:14.000000000 +0100
|
||||
+++ kdelibs-4.1.82.parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt 2008-12-09 14:12:43.000000000 +0100
|
||||
diff -ur kdelibs-4.1.85/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-4.1.85-parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-4.1.85/kdecore/kconfig_compiler/CMakeLists.txt 2008-10-30 15:19:14.000000000 +0100
|
||||
+++ kdelibs-4.1.85-parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt 2008-12-14 03:21:42.000000000 +0100
|
||||
@@ -8,11 +8,11 @@
|
||||
set(kconfig_compiler_SRCS kconfig_compiler.cpp)
|
||||
|
||||
|
|
@ -154,9 +158,9 @@ diff -Naurw kdelibs-4.1.82/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-4.1.8
|
|||
|
||||
|
||||
########### install files ###############
|
||||
diff -Naurw kdelibs-4.1.82/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-4.1.82.parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-4.1.82/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-05-21 13:08:30.000000000 +0200
|
||||
+++ kdelibs-4.1.82.parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-12-09 14:12:43.000000000 +0100
|
||||
diff -ur kdelibs-4.1.85/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-4.1.85-parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-4.1.85/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-05-21 13:08:30.000000000 +0200
|
||||
+++ kdelibs-4.1.85-parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-12-14 03:21:42.000000000 +0100
|
||||
@@ -9,7 +9,7 @@
|
||||
add_custom_command(
|
||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
|
||||
|
|
@ -166,9 +170,9 @@ diff -Naurw kdelibs-4.1.82/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-4
|
|||
|
||||
# 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 -Naurw kdelibs-4.1.82/kdewidgets/CMakeLists.txt kdelibs-4.1.82.parallel_devel/kdewidgets/CMakeLists.txt
|
||||
--- kdelibs-4.1.82/kdewidgets/CMakeLists.txt 2008-11-12 17:38:22.000000000 +0100
|
||||
+++ kdelibs-4.1.82.parallel_devel/kdewidgets/CMakeLists.txt 2008-12-09 14:12:43.000000000 +0100
|
||||
diff -ur kdelibs-4.1.85/kdewidgets/CMakeLists.txt kdelibs-4.1.85-parallel_devel/kdewidgets/CMakeLists.txt
|
||||
--- kdelibs-4.1.85/kdewidgets/CMakeLists.txt 2008-11-12 17:38:22.000000000 +0100
|
||||
+++ kdelibs-4.1.85-parallel_devel/kdewidgets/CMakeLists.txt 2008-12-14 03:21:42.000000000 +0100
|
||||
@@ -14,22 +14,22 @@
|
||||
set(makekdewidgets_SRCS makekdewidgets.cpp )
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
Summary: K Desktop Environment 4 - Libraries
|
||||
Version: 4.1.85
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
|
||||
%if 0%{?fedora} > 8
|
||||
Name: kdelibs
|
||||
|
|
@ -46,7 +46,7 @@ Source1: kde4.sh
|
|||
Source2: kde4.csh
|
||||
|
||||
# make -devel packages parallel-installable
|
||||
Patch0: kdelibs-4.1.82-parallel_devel.patch
|
||||
Patch0: kdelibs-4.1.85-parallel_devel.patch
|
||||
# fix kde#149705
|
||||
Patch2: kdelibs-4.1.82-kde149705.patch
|
||||
# Hunspell support for K3Spell
|
||||
|
|
@ -355,6 +355,9 @@ rm -rf %{buildroot}
|
|||
|
||||
|
||||
%changelog
|
||||
* Sun Dec 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.1.85-2
|
||||
- tweak parallel_devel patch to get a -L flag for the symlink directory
|
||||
|
||||
* Thu Dec 11 2008 Than Ngo <than@redhat.com> - 4.1.85-1
|
||||
- 4.2beta2
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue