Mailinglist Archive: opensuse-commit (1426 mails)
| < Previous | Next > |
commit libzypp-zmd-backend
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 06 Mar 2007 17:54:13 +0100
- Message-id: <20070306165413.D25A1678186@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package libzypp-zmd-backend
checked in at Tue Mar 6 17:54:13 CET 2007.
--------
--- libzypp-zmd-backend/libzypp-zmd-backend.changes 2007-03-01 18:46:56.000000000 +0100
+++ /mounts/work_src_done/STABLE/libzypp-zmd-backend/libzypp-zmd-backend.changes 2007-03-06 17:03:22.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Mar 6 11:30:18 CET 2007 - dmacvicar@xxxxxxx
+
+- fix lib install dir on 64 bit systems
+- r5167
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp-zmd-backend.spec ++++++
--- /var/tmp/diff_new_pack.A28474/_old 2007-03-06 17:53:51.000000000 +0100
+++ /var/tmp/diff_new_pack.A28474/_new 2007-03-06 17:53:51.000000000 +0100
@@ -12,7 +12,7 @@
Name: libzypp-zmd-backend
Version: 7.1.1.0_1.0
-Release: 1
+Release: 2
License: GNU General Public License (GPL)
Group: System/Management
Summary: ZMD backend for Package, Patch, Pattern, and Product Management
@@ -52,7 +52,7 @@
%build
mkdir build
cd build
-cmake -DCMAKE_INSTALL_PREFIX=%{prefix} -DCMAKE_SKIP_RPATH=1 ..
+cmake -DCMAKE_INSTALL_PREFIX=%{prefix} -DLIB=%{_lib} -DCMAKE_SKIP_RPATH=1 ..
CXXFLAGS="$RPM_OPT_FLAGS" \
make %{?jobs:-j %jobs}
#make check
@@ -79,6 +79,9 @@
/etc/logrotate.d/zmd-backend
%changelog
+* Tue Mar 06 2007 - dmacvicar@xxxxxxx
+- fix lib install dir on 64 bit systems
+- r5167
* Thu Mar 01 2007 - dmacvicar@xxxxxxx
- rug no longer installs multiple packages
(#239347)
++++++ zmd-backend-7.1.1.0_1.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0_1.0/cmake/modules/DefineInstallationPaths.cmake new/zmd-backend-7.1.1.0_1.0/cmake/modules/DefineInstallationPaths.cmake
--- old/zmd-backend-7.1.1.0_1.0/cmake/modules/DefineInstallationPaths.cmake 2007-03-01 16:39:21.000000000 +0100
+++ new/zmd-backend-7.1.1.0_1.0/cmake/modules/DefineInstallationPaths.cmake 1970-01-01 01:00:00.000000000 +0100
@@ -1,124 +0,0 @@
-if (UNIX)
- IF (NOT APPLICATION_NAME)
- MESSAGE(STATUS "${PROJECT_NAME} is used as APPLICATION_NAME")
- SET(APPLICATION_NAME ${PROJECT_NAME})
- ENDIF (NOT APPLICATION_NAME)
-
- # Suffix for Linux
- SET(LIB_SUFFIX
- CACHE STRING "Define suffix of directory name (32/64)"
- )
-
- SET(EXEC_INSTALL_PREFIX
- "${CMAKE_INSTALL_PREFIX}"
- CACHE PATH "Base directory for executables and libraries"
- FORCE
- )
- SET(SHARE_INSTALL_PREFIX
- "${CMAKE_INSTALL_PREFIX}/share"
- CACHE PATH "Base directory for files which go to share/"
- FORCE
- )
- SET(DATA_INSTALL_PREFIX
- "${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}"
- CACHE PATH "The parent directory where applications can install their data" FORCE)
-
- # The following are directories where stuff will be installed to
- SET(BIN_INSTALL_DIR
- "${EXEC_INSTALL_PREFIX}/bin"
- CACHE PATH "The ${APPLICATION_NAME} binary install dir (default prefix/bin)"
- FORCE
- )
- SET(SBIN_INSTALL_DIR
- "${EXEC_INSTALL_PREFIX}/sbin"
- CACHE PATH "The ${APPLICATION_NAME} sbin install dir (default prefix/sbin)"
- FORCE
- )
- SET(LIB_INSTALL_DIR
- "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
- CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/lib)"
- FORCE
- )
- SET(LIBEXEC_INSTALL_DIR
- "${EXEC_INSTALL_PREFIX}/libexec"
- CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/libexec)"
- FORCE
- )
- SET(PLUGIN_INSTALL_DIR
- "${LIB_INSTALL_DIR}/${APPLICATION_NAME}"
- CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is prefix/lib/${APPLICATION_NAME})"
- FORCE
- )
- SET(INCLUDE_INSTALL_DIR
- "${CMAKE_INSTALL_PREFIX}/include"
- CACHE PATH "The subdirectory to the header prefix (default prefix/include)"
- FORCE
- )
-
- SET(DATA_INSTALL_DIR
- "${DATA_INSTALL_PREFIX}"
- CACHE PATH "The parent directory where applications can install their data (default prefix/share/${APPLICATION_NAME})"
- FORCE
- )
- SET(HTML_INSTALL_DIR
- "${DATA_INSTALL_PREFIX}/doc/HTML"
- CACHE PATH "The HTML install dir for documentation (default data/doc/html)"
- FORCE
- )
- SET(ICON_INSTALL_DIR
- "${DATA_INSTALL_PREFIX}/icons"
- CACHE PATH "The icon install dir (default data/icons/)"
- FORCE
- )
- SET(SOUND_INSTALL_DIR
- "${DATA_INSTALL_PREFIX}/sounds"
- CACHE PATH "The install dir for sound files (default data/sounds)"
- FORCE
- )
-
- SET(LOCALE_INSTALL_DIR
- "${SHARE_INSTALL_PREFIX}/locale"
- CACHE PATH "The install dir for translations (default prefix/share/locale)"
- FORCE
- )
-
- SET(XDG_APPS_DIR
- "${SHARE_INSTALL_PREFIX}/applications/"
- CACHE PATH "The XDG apps dir"
- FORCE
- )
- SET(XDG_DIRECTORY_DIR
- "${SHARE_INSTALL_PREFIX}/desktop-directories"
- CACHE PATH "The XDG directory"
- FORCE
- )
-
- SET(SYSCONF_INSTALL_DIR
- "${EXEC_INSTALL_PREFIX}/etc"
- CACHE PATH "The ${APPLICATION_NAME} sysconfig install dir (default prefix/etc)"
- FORCE
- )
- SET(MAN_INSTALL_DIR
- "${SHARE_INSTALL_PREFIX}/man"
- CACHE PATH "The ${APPLICATION_NAME} man install dir (default prefix/man)"
- FORCE
- )
- SET(INFO_INSTALL_DIR
- "${SHARE_INSTALL_PREFIX}/info"
- CACHE PATH "The ${APPLICATION_NAME} info install dir (default prefix/info)"
- FORCE
- )
-endif (UNIX)
-
-if (WIN32)
- # Same same
- SET(BIN_INSTALL_DIR .)
- SET(SBIN_INSTALL_DIR .)
- SET(LIB_INSTALL_DIR .)
- SET(PLUGIN_INSTALL_DIR plugins)
- SET(HTML_INSTALL_DIR doc/HTML)
- SET(ICON_INSTALL_DIR .)
- SET(SOUND_INSTALL_DIR .)
- SET(LOCALE_INSTALL_DIR lang)
-endif (WIN32)
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0_1.0/CMakeLists.txt new/zmd-backend-7.1.1.0_1.0/CMakeLists.txt
--- old/zmd-backend-7.1.1.0_1.0/CMakeLists.txt 2007-03-01 16:39:21.000000000 +0100
+++ new/zmd-backend-7.1.1.0_1.0/CMakeLists.txt 2007-03-06 17:02:40.000000000 +0100
@@ -8,7 +8,22 @@
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
SET(CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules ${CMAKE_MODULE_PATH})
+# Library
+IF ( DEFINED LIB )
+ SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB}" )
+ MESSAGE( STATUS "LIB_INSTALL_DIR set to ${LIB_INSTALL_DIR}" )
+ELSE ( DEFINED LIB )
+ MESSAGE( STATUS "LIB not defined" )
+ IF ( EXISTS "${CMAKE_INSTALL_PREFIX}/lib64" )
+ SET( LIB_SUFFIX "64" )
+ ENDIF ( EXISTS "${CMAKE_INSTALL_PREFIX}/lib64" )
+ SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" )
+ MESSAGE( STATUS "Using ${LIB_INSTALL_DIR}" )
+ENDIF ( DEFINED LIB )
+MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" )
+
INCLUDE(${CMAKE_SOURCE_DIR}/VERSION.cmake)
+SET( PACKAGE "libzypp-zmd-backend" )
SET ( VERSION "${ZMD_VERSION}_${BACKEND_VERSION}" )
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "libzypp backend for ZenWorks daemon")
@@ -36,14 +51,14 @@
INCLUDE(CPack)
-INCLUDE(DefineInstallationPaths)
-
ADD_DEFINITIONS( -DVERSION=\\\"${VERSION}\\\" )
MESSAGE( STATUS "Looking for modules in: ${CMAKE_MODULE_PATH}" )
FIND_PACKAGE(Boost REQUIRED)
FIND_PACKAGE(Sqlite REQUIRED)
FIND_PACKAGE(Zypp REQUIRED)
+INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} ${SQLITE_INCLUDE_DIR} )
+
IF (Boost_FOUND)
MESSAGE( STATUS "boost found: includes in ${Boost_INCLUDE_DIRS}, library in ${Boost_LIBRARY_DIRS}")
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
@@ -72,3 +87,23 @@
####################################################################
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+
+ADD_CUSTOM_TARGET( svncheck
+ COMMAND cd $(CMAKE_SOURCE_DIR) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision'
+)
+
+SET( AUTOBUILD_COMMAND
+ COMMAND ${CMAKE_MAKE_PROGRAM} package_source
+ COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 ${CMAKE_BINARY_DIR}/package
+ COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2
+ COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/package/${PACKAGE}.changes" "${CMAKE_BINARY_DIR}/package/${PACKAGE}.changes"
+)
+
+ADD_CUSTOM_TARGET( autobuild_local
+ ${AUTOBUILD_COMMAND}
+)
+
+ADD_CUSTOM_TARGET( autobuild
+ COMMAND ${CMAKE_MAKE_PROGRAM} svncheck
+ ${AUTOBUILD_COMMAND}
+)
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0_1.0/libzypp-zmd-backend.spec.in.cmake new/zmd-backend-7.1.1.0_1.0/libzypp-zmd-backend.spec.in.cmake
--- old/zmd-backend-7.1.1.0_1.0/libzypp-zmd-backend.spec.in.cmake 2007-03-01 16:39:21.000000000 +0100
+++ new/zmd-backend-7.1.1.0_1.0/libzypp-zmd-backend.spec.in.cmake 2007-03-06 17:02:40.000000000 +0100
@@ -55,7 +55,7 @@
%build
mkdir build
cd build
-cmake -DCMAKE_INSTALL_PREFIX=%{prefix} -DCMAKE_SKIP_RPATH=1 ..
+cmake -DCMAKE_INSTALL_PREFIX=%{prefix} -DLIB=%{_lib} -DCMAKE_SKIP_RPATH=1 ..
CXXFLAGS="$RPM_OPT_FLAGS" \
make %{?jobs:-j %jobs}
#make check
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0_1.0/src/dbsource/CMakeLists.txt new/zmd-backend-7.1.1.0_1.0/src/dbsource/CMakeLists.txt
--- old/zmd-backend-7.1.1.0_1.0/src/dbsource/CMakeLists.txt 2007-03-01 16:39:20.000000000 +0100
+++ new/zmd-backend-7.1.1.0_1.0/src/dbsource/CMakeLists.txt 2007-03-06 17:02:39.000000000 +0100
@@ -16,6 +16,7 @@
)
ADD_LIBRARY(zmd-backend SHARED ${dbsource_SRCS})
+SET_TARGET_PROPERTIES( zmd-backend PROPERTIES VERSION "0.0.0" )
# System libraries
TARGET_LINK_LIBRARIES(zmd-backend ${ZYPP_LIBRARY} )
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |