commit ksystemlog

15 Jan 2008

Hello community,

here is the log from the commit of package ksystemlog
checked in at Tue Jan 15 05:45:40 CET 2008.

--------

--- KDE/ksystemlog/ksystemlog.changes	2006-11-08 10:13:48.000000000 +0100
+++ /mounts/work_src_done/STABLE/ksystemlog/ksystemlog.changes	2008-01-14 18:31:21.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Jan 14 18:31:08 CET 2008 - dmueller@suse.de
+
+- update to 0.4.1:
+  * KDE 4 version, mostly a rewrite
+
+-------------------------------------------------------------------

Old:
----
  fix-build.diff
  ksystemlog-0.3.2.tar.bz2

New:
----
  ksystemlog-0.4.1.tar.bz2
  r747364.diff
  r758238.diff
  r758239.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ksystemlog.spec ++++++
--- /var/tmp/diff_new_pack.r10603/_old	2008-01-15 05:43:59.000000000 +0100
+++ /var/tmp/diff_new_pack.r10603/_new	2008-01-15 05:43:59.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package ksystemlog (Version 0.3.2)
+# spec file for package ksystemlog (Version 0.4.1)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -11,17 +11,19 @@
 # norootforbuild
 
 Name:           ksystemlog
-BuildRequires:  kdelibs3-devel
-URL:            http://annivernet.free.fr/ksystemlog/
-License:        GNU General Public License (GPL) - all versions
+BuildRequires:  cmake libkde4-devel
+Url:            http://annivernet.free.fr/ksystemlog/
+License:        GPL v2 or later
 Group:          System/Monitoring
-Autoreqprov:    on
-Version:        0.3.2
-Release:        39
+AutoReqProv:    on
+Version:        0.4.1
+Release:        1
 Summary:        System Log Viewer Tool
 Source:         ksystemlog-%version.tar.bz2
-Patch:          fix-build.diff
-Requires:       kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
+Patch0:         r747364.diff
+Patch1:         r758238.diff
+Patch2:         r758239.diff
+%kde4_runtime_requires
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -38,42 +40,35 @@
 
 %prep
 %setup -q
-%patch
-. /etc/opt/kde3/common_options
-update_admin
+%patch0
+%patch1
+%patch2
 
 %build
-. /etc/opt/kde3/common_options
-./configure $configkde --disable-final
-do_make %{?jobs:-j %jobs}
+%cmake_kde4 -d build
+%make_jobs
 
 %install
-. /etc/opt/kde3/common_options
-make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
-%suse_update_desktop_file %name System Monitor
+cd build
+%makeinstall
+#%_suse_update_desktop_file %name System Monitor
+%kde_post_install
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-/opt/kde3/bin/ksystemlog
-/opt/kde3/share/applications/kde/ksystemlog.desktop
-%dir /opt/kde3/share/apps/ksystemlog
-/opt/kde3/share/apps/ksystemlog/ksystemlogui.rc
-/opt/kde3/share/config.kcfg/ksystemlog.kcfg
-%dir /opt/kde3/share/icons/hicolor/128x128
-%dir /opt/kde3/share/icons/hicolor/128x128/apps
-%dir /opt/kde3/share/icons/hicolor/16x16/apps
-%dir /opt/kde3/share/icons/hicolor/16x16
-%dir /opt/kde3/share/icons/hicolor/32x32/apps
-%dir /opt/kde3/share/icons/hicolor/32x32
-%dir /opt/kde3/share/icons/hicolor/48x48
-%dir /opt/kde3/share/icons/hicolor/48x48/apps
-%dir /opt/kde3/share/icons/hicolor/64x64
-%dir /opt/kde3/share/icons/hicolor/64x64/apps
-%dir /opt/kde3/share/icons/hicolor/scalable
-%dir /opt/kde3/share/icons/hicolor/scalable/apps
-/opt/kde3/share/icons/*/*/apps/ksystemlog.*
-
-%changelog -n ksystemlog
+/usr/bin/ksystemlog
+/usr/share/icons/hicolor/*/apps/ksystemlog.*
+%_kde_share_dir/apps/ksystemlog
+%_kde_share_dir/services/ksystemlog.desktop
+
+%changelog
+* Mon Jan 14 2008 - dmueller@suse.de
+- update to 0.4.1:
+  * KDE 4 version, mostly a rewrite
 * Wed Nov 08 2006 - stbinner@suse.de
 - try to make build succeed always
 * Wed Jun 14 2006 - dmueller@suse.de

++++++ ksystemlog-0.3.2.tar.bz2 -> ksystemlog-0.4.1.tar.bz2 ++++++
++++ 178158 lines of diff (skipped)

++++++ r747364.diff ++++++
------------------------------------------------------------------------
r747364 | mlaurent | 2007-12-11 21:11:16 +0100 (Tue, 11 Dec 2007) | 3 lines

Fix compile
Fix function signature

------------------------------------------------------------------------
Index: src/mainWindow.cpp
===================================================================
--- src/mainWindow.cpp	(revision 747363)
+++ src/mainWindow.cpp	(revision 747364)
@@ -530,7 +530,7 @@ void MainWindow::changeCurrentTab() {
  * config file.  anything you write here will be available
  * later when this app is restored
  */
-void MainWindow::saveProperties(KConfig* /*configuration*/) {
+void MainWindow::saveProperties(KConfigGroup & /*configuration*/) {
 	logDebug() << "Saving properties..." << endl;
 }
 
@@ -542,7 +542,7 @@ void MainWindow::saveProperties(KConfig*
  * the app is being restored.  read in here whatever you wrote
  * in 'saveProperties'
  */
-void MainWindow::readProperties(KConfig* /*configuration*/) {
+void MainWindow::readProperties( const KConfigGroup& /*configuration*/) {
 	logDebug() << "Reading properties..." << endl;
 }
 
Index: src/modes/base/fileListHelper.cpp
===================================================================
--- src/modes/base/fileListHelper.cpp	(revision 747363)
+++ src/modes/base/fileListHelper.cpp	(revision 747364)
@@ -135,7 +135,7 @@ KUrl FileListHelper::openUrl(const QStri
 QStringList FileListHelper::expandJoker(const KUrl& url) {
 	QDir directory = QDir(url.path().left(url.path().count() - url.fileName().count()));
 	
-	logDebug() << "Dir " << directory << endl;
+	logDebug() << "Dir " << directory.path() << endl;
 	QString filename = url.fileName();
 	
 	if (filename.isEmpty()) {
Index: src/mainWindow.h
===================================================================
--- src/mainWindow.h	(revision 747363)
+++ src/mainWindow.h	(revision 747364)
@@ -75,14 +75,14 @@ class MainWindow : public KXmlGuiWindow
 		 * This function is called when it is time for the app to save its
 		 * properties for session management purposes.
 		 */
-		void saveProperties(KConfig* configuration);
+		void saveProperties(KConfigGroup& configuration);
 		
 		/**
 		 * This function is called when this app is restored.  The KConfig
 		 * object points to the session management config file that was saved
 		 * with @ref saveProperties
 		 */
-		void readProperties(KConfig* configuration);
+		void readProperties(const KConfigGroup& configuration);
 		
 	public slots:
 		void changeStatusBar(const QString& text);
++++++ r758238.diff ++++++
------------------------------------------------------------------------
r758238 | sitter | 2008-01-07 10:52:33 +0100 (Mon, 07 Jan 2008) | 2 lines

cmake styling issue

------------------------------------------------------------------------
Index: tests/CMakeLists.txt
===================================================================
--- tests/CMakeLists.txt	(revision 758237)
+++ tests/CMakeLists.txt	(revision 758238)
@@ -4,7 +4,7 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/../src
 	${CMAKE_CURRENT_SOURCE_DIR}/../src/config
-    ${CMAKE_CURRENT_BINARY_DIR}/../src/config
+	${CMAKE_CURRENT_BINARY_DIR}/../src/config
 	${CMAKE_CURRENT_SOURCE_DIR}/../src/lib
 	${CMAKE_CURRENT_SOURCE_DIR}/../src/modes/system
 	${CMAKE_CURRENT_SOURCE_DIR}/../src/modes/kernel
Index: src/lib/CMakeLists.txt
===================================================================
--- src/lib/CMakeLists.txt	(revision 758237)
+++ src/lib/CMakeLists.txt	(revision 758238)
@@ -51,7 +51,7 @@ set(ksystemlog_lib_sources
 
 )
 
-kde4_add_ui_files(ksystemlog_lib_sources logViewSearchWidgetBase.ui )
+kde4_add_ui_files(ksystemlog_lib_sources logViewSearchWidgetBase.ui)
 
 kde4_add_library(ksystemlog_lib STATIC ${ksystemlog_lib_sources})
 
Index: src/modes/authentication/CMakeLists.txt
===================================================================
--- src/modes/authentication/CMakeLists.txt	(revision 758237)
+++ src/modes/authentication/CMakeLists.txt	(revision 758238)
@@ -26,7 +26,7 @@ add_dependencies(
 )
 
 target_link_libraries(
-    ksystemlog_authentication
+	ksystemlog_authentication
 
 	${QT_AND_KDECORE_LIBS} 
 	${KDE4_KDEUI_LIBS}
Index: src/modes/acpid/CMakeLists.txt
===================================================================
--- src/modes/acpid/CMakeLists.txt	(revision 758237)
+++ src/modes/acpid/CMakeLists.txt	(revision 758238)
@@ -27,7 +27,7 @@ add_dependencies(
 )
 
 target_link_libraries(
-    ksystemlog_acpid
+	ksystemlog_acpid
 
 	${QT_AND_KDECORE_LIBS} 
 	${KDE4_KDEUI_LIBS}
Index: src/modes/apache/CMakeLists.txt
===================================================================
--- src/modes/apache/CMakeLists.txt	(revision 758237)
+++ src/modes/apache/CMakeLists.txt	(revision 758238)
@@ -4,8 +4,8 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/../../lib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../config 
 	${CMAKE_CURRENT_SOURCE_DIR}/../base
-    ${CMAKE_CURRENT_BINARY_DIR}/../../config
-    ${CMAKE_CURRENT_BINARY_DIR}/../base
+	${CMAKE_CURRENT_BINARY_DIR}/../../config
+	${CMAKE_CURRENT_BINARY_DIR}/../base
 )
 
 set(ksystemlog_apache_sources
Index: src/modes/daemon/CMakeLists.txt
===================================================================
--- src/modes/daemon/CMakeLists.txt	(revision 758237)
+++ src/modes/daemon/CMakeLists.txt	(revision 758238)
@@ -25,7 +25,7 @@ add_dependencies(
 )
 
 target_link_libraries(
-    ksystemlog_daemon
+	ksystemlog_daemon
 
 	${QT_AND_KDECORE_LIBS} 
 	${KDE4_KDEUI_LIBS}
Index: src/modes/samba/CMakeLists.txt
===================================================================
--- src/modes/samba/CMakeLists.txt	(revision 758237)
+++ src/modes/samba/CMakeLists.txt	(revision 758238)
@@ -4,8 +4,8 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/../../lib
 	${CMAKE_CURRENT_SOURCE_DIR}/../../config 
 	${CMAKE_CURRENT_SOURCE_DIR}/../base
-    ${CMAKE_CURRENT_BINARY_DIR}/../../config
-    ${CMAKE_CURRENT_BINARY_DIR}/../base
+	${CMAKE_CURRENT_BINARY_DIR}/../../config
+	${CMAKE_CURRENT_BINARY_DIR}/../base
 )
 
 set(ksystemlog_samba_sources
Index: src/CMakeLists.txt
===================================================================
--- src/CMakeLists.txt	(revision 758237)
+++ src/CMakeLists.txt	(revision 758238)
@@ -4,8 +4,8 @@
 include_directories( 
 	${CMAKE_CURRENT_SOURCE_DIR}/config 
 	${CMAKE_CURRENT_SOURCE_DIR}/lib
-    ${CMAKE_CURRENT_BINARY_DIR}/config
-    ${CMAKE_CURRENT_BINARY_DIR}/lib 
+	${CMAKE_CURRENT_BINARY_DIR}/config
+	${CMAKE_CURRENT_BINARY_DIR}/lib 
 	${CMAKE_CURRENT_SOURCE_DIR} 
 	
 	${CMAKE_CURRENT_SOURCE_DIR}/modes/open
@@ -21,16 +21,14 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/modes/cups
 	${CMAKE_CURRENT_SOURCE_DIR}/modes/samba
 	${CMAKE_CURRENT_SOURCE_DIR}/modes/authentication
-	${CMAKE_CURRENT_SOURCE_DIR}/modes/postfix
-	 
+	${CMAKE_CURRENT_SOURCE_DIR}/modes/postfix 
 )
 
-
 set(ksystemlog_sources
 	main.cpp
 	mainWindow.cpp
 
-    logModePluginsLoader.cpp
+	logModePluginsLoader.cpp
 
 	loggerDialog.cpp
 
@@ -46,9 +44,11 @@ set(ksystemlog_sources
 
 )
 
-kde4_add_ui_files(ksystemlog_sources detailDialogBase.ui )
-kde4_add_ui_files(ksystemlog_sources loggerDialogBase.ui )
-kde4_add_ui_files(ksystemlog_sources generalConfigurationWidgetBase.ui )
+kde4_add_ui_files(ksystemlog_sources
+	detailDialogBase.ui
+	loggerDialogBase.ui
+	generalConfigurationWidgetBase.ui
+)
 
 kde4_add_executable(ksystemlog ${ksystemlog_sources})
 
@@ -63,23 +63,23 @@ target_link_libraries(ksystemlog
 	
 	ksystemlog_system
 	ksystemlog_kernel
-    ksystemlog_xorg 
-    ksystemlog_cron 
+	ksystemlog_xorg 
+	ksystemlog_cron 
 	ksystemlog_apache
-    ksystemlog_authentication 
-    ksystemlog_daemon 
+	ksystemlog_authentication 
+	ksystemlog_daemon 
 	ksystemlog_acpid 
-    ksystemlog_xsession
-    ksystemlog_postfix 
-    ksystemlog_cups 
-    ksystemlog_samba 
+	ksystemlog_xsession
+	ksystemlog_postfix 
+	ksystemlog_cups 
+	ksystemlog_samba 
 )
 
 ########### Installation ###############
 
-install( TARGETS ksystemlog DESTINATION ${BIN_INSTALL_DIR} )
+install( TARGETS ksystemlog DESTINATION ${BIN_INSTALL_DIR})
 
-install(FILES   ksystemlog.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install(FILES   ksystemlogui.rc DESTINATION ${DATA_INSTALL_DIR}/ksystemlog )
+install(FILES   ksystemlog.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(FILES   ksystemlogui.rc DESTINATION ${DATA_INSTALL_DIR}/ksystemlog)
 
-kde4_install_icons( ${ICON_INSTALL_DIR} )
+kde4_install_icons( ${ICON_INSTALL_DIR})
Index: src/config/CMakeLists.txt
===================================================================
--- src/config/CMakeLists.txt	(revision 758237)
+++ src/config/CMakeLists.txt	(revision 758238)
@@ -7,7 +7,7 @@ set(ksystemlog_config_SRCS
 	dummyConfig.cpp
 )
 
-kde4_add_kcfg_files(ksystemlog_config_SRCS ksystemlogConfig.kcfgc )
+kde4_add_kcfg_files(ksystemlog_config_SRCS ksystemlogConfig.kcfgc)
 
 kde4_add_library(ksystemlog_config STATIC ${ksystemlog_config_SRCS})
 
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 758237)
+++ CMakeLists.txt	(revision 758238)
@@ -16,7 +16,6 @@ set(KDE_COLOR_DEBUG ON)
 
 #set(KDE4_ENABLE_FINAL ON)
 
-
 find_package(KDE4 REQUIRED)
 
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
@@ -37,8 +36,8 @@ include_directories(
 add_custom_target(  
     package
     COMMAND ./build-package.sh
-
 )
+
 ########### Subfolders ##########
 
 add_subdirectory(src) 
++++++ r758239.diff ++++++
------------------------------------------------------------------------
r758239 | sitter | 2008-01-07 10:53:07 +0100 (Mon, 07 Jan 2008) | 2 lines

fix out-of-source builds

------------------------------------------------------------------------
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 758238)
+++ CMakeLists.txt	(revision 758239)
@@ -1,3 +1,4 @@
+project(KSystemLog)
 
 # Help Eclipse to parse errors more efficiently
 if(CMAKE_COMPILER_IS_GNUCC)
@@ -18,6 +19,8 @@ set(KDE_COLOR_DEBUG ON)
 
 find_package(KDE4 REQUIRED)
 
+include(KDE4Defaults)
+
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 
 link_directories(${KDE4_LIB_DIR})

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit ksystemlog

root＠Hilbert.suse.de