Mailinglist Archive: zypp-commit (149 mails)

< Previous Next >
[zypp-commit] [zypp-svn] r5316 - in /trunk/updater-gnome: CMakeLists.txt VERSION.cmake opensuse-updater-gnome.spec.cmake package/opensuse-updater-gnome.changes
  • From: jkupec@xxxxxxxxxxxxxxxx
  • Date: Tue, 10 Apr 2007 10:00:19 -0000
  • Message-id: <20070410100019.EDBEE6B241@xxxxxxxxxxxxxxxx>
Author: jkupec
Date: Tue Apr 10 12:00:19 2007
New Revision: 5316

URL: http://svn.opensuse.org/viewcvs/zypp?rev=5316&view=rev
Log:
fixed building on 64bit non-bi-archs

Modified:
    trunk/updater-gnome/CMakeLists.txt
    trunk/updater-gnome/VERSION.cmake
    trunk/updater-gnome/opensuse-updater-gnome.spec.cmake
    trunk/updater-gnome/package/opensuse-updater-gnome.changes

Modified: trunk/updater-gnome/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/CMakeLists.txt?rev=5316&r1=5315&r2=5316&view=diff
==============================================================================
--- trunk/updater-gnome/CMakeLists.txt (original)
+++ trunk/updater-gnome/CMakeLists.txt Tue Apr 10 12:00:19 2007
@@ -16,10 +16,15 @@
   SET( DATADIR ${CMAKE_SOURCE_DIR} )
 ENDIF( DEFINED CMAKE_INSTALL_PREFIX )
 
-# detect 64bit arch
-IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
-  SET( LIB_SUFFIX "64" )
-ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+# libdir
+IF( DEFINED LIB )
+  SET( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB}" )
+ELSE( DEFINED  LIB )
+  IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
+    SET( LIB_SUFFIX "64" )
+  ENDIF( CMAKE_SIZEOF_VOID_P MATCHES "8" )
+  SET( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" )
+ENDIF( DEFINED  LIB )
 
 
 # PACKAGE
@@ -126,7 +131,7 @@
   @ONLY)
 INSTALL(
   FILES ${CMAKE_BINARY_DIR}/OpenSUSEUpdaterApplet.server
-  DESTINATION ${INSTALL_PREFIX}/lib${LIB_SUFFIX}/bonobo/servers
+  DESTINATION ${LIB_INSTALL_DIR}/bonobo/servers
 )
 
 # rpm spec file

Modified: trunk/updater-gnome/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/VERSION.cmake?rev=5316&r1=5315&r2=5316&view=diff
==============================================================================
--- trunk/updater-gnome/VERSION.cmake (original)
+++ trunk/updater-gnome/VERSION.cmake Tue Apr 10 12:00:19 2007
@@ -20,5 +20,5 @@
 
 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "2")
-SET(VERSION_PATCH "1")
+SET(VERSION_PATCH "2")
 

Modified: trunk/updater-gnome/opensuse-updater-gnome.spec.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/opensuse-updater-gnome.spec.cmake?rev=5316&r1=5315&r2=5316&view=diff
==============================================================================
--- trunk/updater-gnome/opensuse-updater-gnome.spec.cmake (original)
+++ trunk/updater-gnome/opensuse-updater-gnome.spec.cmake Tue Apr 10 12:00:19 2007
@@ -43,8 +43,14 @@
 %build
 mkdir build
 cd build
-cmake -DCMAKE_INSTALL_PREFIX=%{prefix} -DCMAKE_SKIP_RPATH=1 ..
-CFLAGS="$RPM_OPT_FLAGS" make
+cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \
+      -DLIB=%{_lib} \
+      -DCMAKE_C_FLAGS="%{optflags}" \
+      -DCMAKE_CXX_FLAGS="%{optflags}" \
+      -DCMAKE_BUILD_TYPE=Release \
+      ..
+make
+# make %{?jobs:-j %jobs}
 #make -C po %{?jobs:-j %jobs} translations
 
 %install

Modified: trunk/updater-gnome/package/opensuse-updater-gnome.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/package/opensuse-updater-gnome.changes?rev=5316&r1=5315&r2=5316&view=diff
==============================================================================
--- trunk/updater-gnome/package/opensuse-updater-gnome.changes (original)
+++ trunk/updater-gnome/package/opensuse-updater-gnome.changes Tue Apr 10 12:00:19 2007
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Tue Apr 10 11:57:39 CEST 2007 - jkupec@xxxxxxx
+
+- fixed building on 64bit non-bi-archs
+- r 5316
+- v 0.2.2
+
+-------------------------------------------------------------------
 Mon Apr  9 20:31:42 CEST 2007 - jkupec@xxxxxxx
 
 - fixed some memory management problems

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
List Navigation
This Thread
  • No further messages