move 'systemCheck' to toplevel directory

and add it to the packages filelist.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e411851..f89a5f4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,9 +134,18 @@ MESSAGE(STATUS "FindZypp.cmake will be installed in ${CMAKE_INSTALL_PREFIX}/shar
 INSTALL( FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindZypp.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules )
 INSTALL( FILES ${CMAKE_SOURCE_DIR}/cmake/modules/ZyppCommon.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules )
 
+####################################################################
+# config templates
+# (don't forget to mention them in the .spec file)
+####################################################################
+
 MESSAGE(STATUS "zypp.conf will be installed in ${SYSCONFDIR}/zypp")
 INSTALL( FILES ${CMAKE_SOURCE_DIR}/zypp.conf DESTINATION ${SYSCONFDIR}/zypp )
 
+#install systemCheck
+MESSAGE(STATUS "systemCheck will be installed in ${SYSCONFDIR}/zypp")
+INSTALL( FILES ${CMAKE_SOURCE_DIR}/systemCheck DESTINATION ${SYSCONFDIR}/zypp )
+
 ####################################################################
 # SUBDIRECTORIES                                                   #
 ####################################################################

diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake
index 18ccbbf..cc853a8 100644 (file)
--- a/libzypp.spec.cmake
+++ b/libzypp.spec.cmake
@@ -203,6 +203,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %dir               /etc/zypp/repos.d
 %dir               /etc/zypp/products.d
 %config(noreplace) /etc/zypp/zypp.conf
+%config(noreplace) /etc/zypp/systemCheck
 %{prefix}/lib/zypp
 %{prefix}/share/zypp
 %{prefix}/share/applications/package-manager.desktop

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 3711408..ef6ace3 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,23 +1,16 @@
 -------------------------------------------------------------------
 Mon Jul 14 13:36:26 CEST 2008 - ma@suse.de
 
-- Also report the name of the locking process in ZYppFactoryException 
+- Also report the name of the locking process in ZYppFactoryException
   (bnc #280537)
 - revision 10572
 
 -------------------------------------------------------------------
-Mon Jul 14 13:31:28 CEST 2008 - ma@suse.de
-
-- Provide also the name of the locking process in
-  ZYppFactoryException ()
-- revision 10571
-
--------------------------------------------------------------------
 Mon Jul 14 11:26:30 CEST 2008 - schubi@suse.de
 
-- corrected logging onf solver settings
+- corrected logging of solver settings
 - regard locking while doUpdate (bnc #405427)
-- revision 10564 
+- revision 10564
 
 -------------------------------------------------------------------
 Sat Jul 12 22:14:32 CEST 2008 - jkupec@suse.cz
@@ -36,7 +29,7 @@ Sat Jul 12 11:19:56 CEST 2008 - jkupec@suse.cz
 Wed Jul  9 18:13:58 CEST 2008 - ma@suse.de
 
 - Provide Package::url() if available in solv file. (bnc #402434)
-- A missing cookie file must not be treated as an error. Simply 
+- A missing cookie file must not be treated as an error. Simply
   rebuild the cache (bnc #405867)
 - Add 22x22 and 24x24 icons (bnc #329635)
 - revision 10528

diff --git a/zypp/solver/detail/systemCheck b/systemCheck
similarity index 100%
rename from zypp/solver/detail/systemCheck
rename to systemCheck

diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt
index acb3b8e..689329c 100644 (file)
--- a/zypp/CMakeLists.txt
+++ b/zypp/CMakeLists.txt
@@ -941,8 +941,3 @@ INSTALL(TARGETS zypp LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
 # install XML schemas
 FILE( GLOB YUM_SCHEMA_FILES ${CMAKE_SOURCE_DIR}/zypp/parser/yum/schema/*.rng )
 INSTALL(FILES ${YUM_SCHEMA_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/zypp/schema/yum" )
-
-#install systemCheck
-MESSAGE(STATUS "systemCheck will be installed in ${SYSCONFDIR}/zypp")
-INSTALL( FILES ${CMAKE_SOURCE_DIR}/zypp/solver/detail/systemCheck DESTINATION ${SYSCONFDIR}/zypp )
-