Hello community,
here is the log from the commit of package kdelibs4
checked in at Sun Dec 2 15:00:46 CET 2007.
--------
--- KDE/kdelibs4/kdelibs4.changes 2007-11-21 18:57:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2007-11-28 11:24:02.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 28 11:24:02 CET 2007 - dmueller@suse.de
+
+- update to 3.96.2
+
+-------------------------------------------------------------------
Old:
----
kdelibs-3.96.1.tar.bz2
New:
----
fix-version.diff
kdelibs-3.96.2.tar.bz2
r742999.diff
r743254.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.dHN792/_old 2007-12-02 14:55:37.000000000 +0100
+++ /var/tmp/diff_new_pack.dHN792/_new 2007-12-02 14:55:37.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdelibs4 (Version 3.96.1)
+# spec file for package kdelibs4 (Version 3.96.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -21,9 +21,9 @@
Group: System/GUI/KDE
Summary: KDE Base Libraries
Url: http://www.kde.org
-Version: 3.96.1
+Version: 3.96.2
Release: 1
-%define rversion 3.96.1
+%define rversion 3.96.2
Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`)
Requires: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi`)
Requires: kdelibs4-core >= %version
@@ -32,6 +32,9 @@
Source1: _upstream
Patch0: dotkde4.diff
Patch1: kde3-applications.diff
+Patch2: fix-version.diff
+Patch3: r742999.diff
+Patch4: r743254.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -51,6 +54,9 @@
%setup -q -n kdelibs-%rversion
%patch
%patch1
+%patch2
+%patch3
+%patch4
%build
export CFLAGS="$RPM_OPT_FLAGS"
@@ -313,6 +319,8 @@
%dir /usr/share/kde4/servicetypes
%changelog
+* Wed Nov 28 2007 - dmueller@suse.de
+- update to 3.96.2
* Wed Nov 21 2007 - dmueller@suse.de
- update to 3.96.1
* Wed Nov 14 2007 - dmueller@suse.de
++++++ fix-version.diff ++++++
--- CMakeLists.txt 2007/11/28 22:17:21 1.1
+++ CMakeLists.txt 2007/11/28 22:17:40
@@ -3,9 +3,9 @@
# set version
set (KDE_VERSION_MAJOR 3)
set (KDE_VERSION_MINOR 96)
-set (KDE_VERSION_RELEASE 1)
+set (KDE_VERSION_RELEASE 2)
set (KDE_VERSION "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" )
-set (KDE_VERSION_STRING "${KDE_VERSION} (KDE 4.0 >= 20071120)")
+set (KDE_VERSION_STRING "${KDE_VERSION} (KDE 4.0 >= 20071128)")
# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
++++++ kdelibs-3.96.1.tar.bz2 -> kdelibs-3.96.2.tar.bz2 ++++++
KDE/kdelibs4/kdelibs-3.96.1.tar.bz2 /mounts/work_src_done/STABLE/kdelibs4/kdelibs-3.96.2.tar.bz2 differ: byte 11, line 1
++++++ r742999.diff ++++++
------------------------------------------------------------------------
r742999 | wstephens | 2007-11-29 16:54:38 +0100 (Thu, 29 Nov 2007) | 3 lines
Add PKGCONFIG_VERSION macro that determines the version of a package
using pkg-config too.
------------------------------------------------------------------------
--- cmake/modules/UsePkgConfig.cmake
+++ cmake/modules/UsePkgConfig.cmake
@@ -37,9 +37,9 @@ MACRO(PKGCONFIG _package _include_DIR _l
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags OUTPUT_VARIABLE ${_cflags} )
ELSE( NOT _return_VALUE)
-
- MESSAGE(STATUS "PKGCONFIG macro signal that ${_package} is not installed on your computer.")
- MESSAGE(STATUS "Install package which contains ${_package}.pc if you want to support this feature.")
+
+ MESSAGE(STATUS "KDE CMake PKGCONFIG macro indicates that ${_package} is not installed on your computer.")
+ MESSAGE(STATUS "Install the package which contains ${_package}.pc if you want to support this feature.")
ENDIF(NOT _return_VALUE)
@@ -47,4 +47,19 @@ MACRO(PKGCONFIG _package _include_DIR _l
ENDMACRO(PKGCONFIG _include_DIR _link_DIR _link_FLAGS _cflags)
+MACRO(PKGCONFIG_VERSION _package _include_DIR _link_DIR _link_FLAGS _cflags _found_version)
+ #reset variable
+ SET(${_found_version})
+ IF(PKGCONFIG_EXECUTABLE)
+ #call PKGCONFIG
+ PKGCONFIG(${_package} ${_include_DIR} ${_link_DIR} ${_link_FLAGS} ${_cflags})
+ IF(${_include_DIR})
+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --modversion OUTPUT_VARIABLE ${_found_version})
+ IF(NOT ${_found_version})
+ MESSAGE(FATAL_ERROR "UsePkgConfig.cmake: No version found for ${_package}")
+ ENDIF(NOT ${_found_version})
+ ENDIF(${_include_DIR})
+ ENDIF(PKGCONFIG_EXECUTABLE)
+ENDMACRO(PKGCONFIG_VERSION _package _include_DIR _link_DIR _link_FLAGS _cflags _found_version)
+
MARK_AS_ADVANCED(PKGCONFIG_EXECUTABLE)
++++++ r743254.diff ++++++
------------------------------------------------------------------------
r743254 | mueller | 2007-11-30 11:39:36 +0100 (Fri, 30 Nov 2007) | 3 lines
merge in the whitespace handling fixes from cmake 2.4.7
to make extragear-graphics work
------------------------------------------------------------------------
Index: cmake/modules/FindKexiv2.cmake
===================================================================
--- cmake/modules/FindKexiv2.cmake (revision 743253)
+++ cmake/modules/FindKexiv2.cmake (revision 743254)
@@ -30,7 +30,7 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBR
else (KEXIV2_LOCAL_FOUND_IN_LIBS)
set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkexiv2)
endif (KEXIV2_LOCAL_FOUND_IN_LIBS)
- set(KEXIV2_DEFINITIONS -I${KEXIV2_INCLUDE_DIR})
+ set(KEXIV2_DEFINITIONS "-I${KEXIV2_INCLUDE_DIR}")
set(KEXIV2_LIBRARIES kexiv2)
message(STATUS "Found Kexiv2 library in local sub-folder: ${KEXIV2_INCLUDE_DIR}")
set(KEXIV2_FOUND TRUE)
@@ -66,7 +66,7 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBR
endif(NOT WIN32)
if(KEXIV2_VERSION_GOOD_FOUND)
- set(KEXIV2_DEFINITIONS ${_KEXIV2Cflags})
+ set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}")
FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h
${_KEXIV2IncDir}
Index: cmake/modules/FindKdcraw.cmake
===================================================================
--- cmake/modules/FindKdcraw.cmake (revision 743253)
+++ cmake/modules/FindKdcraw.cmake (revision 743254)
@@ -31,7 +31,7 @@ else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBR
else (KDCRAW_LOCAL_FOUND_IN_LIBS)
set(KDCRAW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkdcraw)
endif (KDCRAW_LOCAL_FOUND_IN_LIBS)
- set(KDCRAW_DEFINITIONS -I${KDCRAW_INCLUDE_DIR})
+ set(KDCRAW_DEFINITIONS "-I${KDCRAW_INCLUDE_DIR}")
set(KDCRAW_LIBRARIES kdcraw)
message(STATUS "Found Kdcraw library in local sub-folder: ${KDCRAW_INCLUDE_DIR}")
set(KDCRAW_FOUND TRUE)
@@ -67,7 +67,7 @@ else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBR
ENDif(NOT WIN32)
if(KDCRAW_VERSION_GOOD_FOUND)
- set(KDCRAW_DEFINITIONS ${_KDCRAWCflags})
+ set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}")
FIND_PATH(KDCRAW_INCLUDE_DIR libkdcraw/version.h
${_KDCRAWIncDir}
Index: cmake/modules/UsePkgConfig.cmake
===================================================================
--- cmake/modules/UsePkgConfig.cmake (revision 743253)
+++ cmake/modules/UsePkgConfig.cmake (revision 743254)
@@ -1,3 +1,6 @@
+
+# THIS IS A SLIGHTLY ENHANCED COPY OVER THE ONE OF CMAKE 2.4.7. DO NOT MODIFY IT FURTHER
+
# - pkg-config module for CMake
#
# Defines the following macros:
@@ -10,9 +13,7 @@
# variable will be empty when the function returns, otherwise they will contain the respective information
#
-
-
-FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config )
+FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/local/bin )
MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
# reset the variables at the beginning
@@ -20,6 +21,7 @@ MACRO(PKGCONFIG _package _include_DIR _l
SET(${_link_DIR})
SET(${_link_FLAGS})
SET(${_cflags})
+
# if pkg-config has been found
IF(PKGCONFIG_EXECUTABLE)
@@ -28,13 +30,22 @@ MACRO(PKGCONFIG _package _include_DIR _l
# and if the package of interest also exists for pkg-config, then get the information
IF(NOT _return_VALUE)
- EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir OUTPUT_VARIABLE ${_include_DIR} )
-
- EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir OUTPUT_VARIABLE ${_link_DIR} )
-
- EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs OUTPUT_VARIABLE ${_link_FLAGS} )
-
- EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags OUTPUT_VARIABLE ${_cflags} )
+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir
+ OUTPUT_VARIABLE ${_include_DIR} )
+ string(REGEX REPLACE "[\r\n]" " " ${_include_DIR} "${${_include_DIR}}")
+
+
+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir
+ OUTPUT_VARIABLE ${_link_DIR} )
+ string(REGEX REPLACE "[\r\n]" " " ${_link_DIR} "${${_link_DIR}}")
+
+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs
+ OUTPUT_VARIABLE ${_link_FLAGS} )
+ string(REGEX REPLACE "[\r\n]" " " ${_link_FLAGS} "${${_link_FLAGS}}")
+
+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags
+ OUTPUT_VARIABLE ${_cflags} )
+ string(REGEX REPLACE "[\r\n]" " " ${_cflags} "${${_cflags}}")
ELSE( NOT _return_VALUE)
@@ -47,19 +58,4 @@ MACRO(PKGCONFIG _package _include_DIR _l
ENDMACRO(PKGCONFIG _include_DIR _link_DIR _link_FLAGS _cflags)
-MACRO(PKGCONFIG_VERSION _package _include_DIR _link_DIR _link_FLAGS _cflags _found_version)
- #reset variable
- SET(${_found_version})
- IF(PKGCONFIG_EXECUTABLE)
- #call PKGCONFIG
- PKGCONFIG(${_package} ${_include_DIR} ${_link_DIR} ${_link_FLAGS} ${_cflags})
- IF(${_include_DIR})
- EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --modversion OUTPUT_VARIABLE ${_found_version})
- IF(NOT ${_found_version})
- MESSAGE(FATAL_ERROR "UsePkgConfig.cmake: No version found for ${_package}")
- ENDIF(NOT ${_found_version})
- ENDIF(${_include_DIR})
- ENDIF(PKGCONFIG_EXECUTABLE)
-ENDMACRO(PKGCONFIG_VERSION _package _include_DIR _link_DIR _link_FLAGS _cflags _found_version)
-
MARK_AS_ADVANCED(PKGCONFIG_EXECUTABLE)
Index: cmake/modules/PkgConfigVersion.cmake
===================================================================
--- cmake/modules/PkgConfigVersion.cmake (revision 0)
+++ cmake/modules/PkgConfigVersion.cmake (revision 743254)
@@ -0,0 +1,34 @@
+# - pkg-config module for CMake
+
+# Copyright (c) 2007 Will Stephenson