OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=25

cmake.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec 22 13:58:09 CET 2008 - ro@suse.de
+
+- Fix java detection also for ia64 s390 s390x
+
 -------------------------------------------------------------------
 Mon Oct 13 22:22:01 CEST 2008 - dmueller@suse.de
 

cmake.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cmake (Version 2.6.2)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 
 Name:           cmake
 Version:        2.6.2
-Release:        2
+Release:        3
 License:        BSD 3-Clause
 Group:          Development/Tools/Building
 %define tar_version %version
@@ -130,7 +130,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
-* Tue Oct 14 2008 dmueller@suse.de
+* Mon Dec 22 2008 ro@suse.de
+- Fix java detection also for ia64 s390 s390x
+* Mon Oct 13 2008 dmueller@suse.de
 - Fix Detection of IBM Java (needed for PPC build of Java modules)
 * Tue Sep 30 2008 puzel@suse.cz
 - update to 2.6.2:
@@ -156,7 +158,7 @@ rm -rf %{buildroot}
   - Add new policy CMP0009 - GLOB_RECURSE should not follow symlinks by
   default
   - many other bugfixes - see changelog
-* Mon Aug 04 2008 dmueller@suse.de
+* Sun Aug 03 2008 dmueller@suse.de
 - update to 2.6.1:
   * Fix for bug 7427, preinstall target name hard coded
 * Wed Jul 23 2008 dmueller@suse.de
@@ -210,13 +212,13 @@ rm -rf %{buildroot}
 - SLES 9 does not build, but its a compile failure
 * Fri May 09 2008 dmueller@suse.de
 - fix ctest reporting (kitware#6988), patch by Andreas Schneider
-* Wed May 07 2008 dmueller@suse.de
+* Tue May 06 2008 dmueller@suse.de
 - update to 2.6.0:
   * Fix links in generated documentation
   * Fix for FindQt and some mac frameworks
   * Fix for ctest to report more than 2 gigs system memory on windows
   * Fix CTest build name for vs 9, and fix memory size on windows
-* Sat May 03 2008 dmueller@suse.de
+* Fri May 02 2008 dmueller@suse.de
 - update to 2.6.0 RC10:
  - Do not duplicate .so libraries on the link line
  - Add more system library paths to sun builds
@@ -232,9 +234,9 @@ rm -rf %{buildroot}
  - Add context information when a source file cannot be found.
  - Report the directory-level context even if no list file
   is currently being processed.
-* Tue Apr 29 2008 dmueller@suse.de
+* Mon Apr 28 2008 dmueller@suse.de
 - fix curses detection (readds previously lost ccmake)
-* Fri Apr 25 2008 dmueller@suse.de
+* Thu Apr 24 2008 dmueller@suse.de
 - update to 2.6.0 RC9:
   - Fix for fortran mod:: support
   - Fix bug in install command with BUNDLE DESTINATION
@@ -265,7 +267,7 @@ rm -rf %{buildroot}
   - Some Qt GUI style changes
 * Sat Apr 19 2008 dmueller@suse.de
 - fix python lib detection again
-* Tue Apr 15 2008 dmueller@suse.de
+* Mon Apr 14 2008 dmueller@suse.de
 - update to 2.6.0 RC8:
   * Fix sun make very poor performance
   * Fix includes for automoc in FindQt4
@@ -361,7 +363,7 @@ rm -rf %{buildroot}
 - detect shared python library instead of static variant
 * Tue Sep 26 2006 dmueller@suse.de
 - add python 2.5 support
-* Sun Sep 10 2006 dmueller@suse.de
+* Sat Sep 09 2006 dmueller@suse.de
 - build against system zlib / libcurl
 * Mon Aug 28 2006 coolo@suse.de
 - fix Qt3 configure check for lib64
@@ -369,7 +371,7 @@ rm -rf %{buildroot}
 - respect DESTDIR on installing kde3 icons
 * Mon Aug 14 2006 coolo@suse.de
 - add SUSE default paths for Qt3
-* Tue Aug 01 2006 dmueller@suse.de
+* Mon Jul 31 2006 dmueller@suse.de
 - 2.4.3 update:
   * progress is now reported with makefiles
   * Fix relative path problems in ADD_SUBDIRECTORY
@@ -377,7 +379,7 @@ rm -rf %{buildroot}
   * make sure try compile files have a newline at the end
   * add rxvt-unicode, cygwin, and screen terminal support for color
   output
-* Thu May 18 2006 dmueller@suse.de
+* Wed May 17 2006 dmueller@suse.de
 - 2.4.2 update:
   * Run symlink command from correct directory for executable versions
   * Fix for universal binaries and Xcode depend problem
@@ -418,7 +420,7 @@ rm -rf %{buildroot}
 * Wed Apr 19 2006 dmueller@suse.de
 - update to 2.4.0, fixes -L/-I compiler flag ordering
   needed for building KDE 4 trunk.
-* Fri Apr 14 2006 dmueller@suse.de
+* Thu Apr 13 2006 dmueller@suse.de
 - fix --help-modules / --help-module <module>
 * Mon Mar 27 2006 dmueller@suse.de
 - compile with RPM_OPT_FLAGS (#160857)

ibm-java-paths.diff

@@ -1,15 +1,28 @@
 --- Modules/FindJNI.cmake
 +++ Modules/FindJNI.cmake
-@@ -22,6 +22,8 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES
+@@ -22,6 +22,13 @@
    $ENV{JAVA_HOME}/jre/lib/i386
    $ENV{JAVA_HOME}/jre/lib/amd64
    $ENV{JAVA_HOME}/jre/lib/ppc
 +  $ENV{JAVA_HOME}/jre/lib/ppc/classic
 +  $ENV{JAVA_HOME}/jre/lib/ppc64/classic
++  $ENV{JAVA_HOME}/jre/lib/ia64
++  $ENV{JAVA_HOME}/jre/lib/s390
++  $ENV{JAVA_HOME}/jre/lib/s390/classic
++  $ENV{JAVA_HOME}/jre/lib/s390x
++  $ENV{JAVA_HOME}/jre/lib/s390x/classic
    /usr/lib
    /usr/local/lib
    /usr/lib/jvm/java/lib
-@@ -166,7 +168,12 @@ SET(JNI_LIBRARIES
+@@ -51,6 +58,7 @@
+     "${dir}"
+     "${dir}/client"
+     "${dir}/server"
++    "${dir}/jrockit"
+     )
+ ENDFOREACH(dir)
+ 
+@@ -166,7 +174,12 @@
  
  SET(JNI_INCLUDE_DIRS
    ${JAVA_INCLUDE_PATH}