Accepting request 183690 from home:scorot:branches:science

- version 2.6
 * See http://www.dhondt.de/new_calc.htm for details

OBS-URL: https://build.opensuse.org/request/show/183690
OBS-URL: https://build.opensuse.org/package/show/science/ccx?expand=0&rev=6

ccx-2.6-build.patch

@@ -1,5 +1,5 @@
---- ccx_2.5/src/Makefile.orig	2012-10-06 15:13:07.000000000 +0200
+--- ccx_2.6/src/Makefile.orig	2013-07-09 18:24:33.000000000 +0200
-+++ ccx_2.5/src/Makefile	2012-10-09 20:30:24.049056123 +0200
++++ ccx_2.6/src/Makefile	2013-07-11 22:19:49.515188839 +0200
 @@ -1,6 +1,6 @@
  
 -CFLAGS = -Wall -O3  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
@@ -19,4 +19,4 @@
 +       -larpack -llapack -lblas \
         -lpthread -lm -lc
  
- ccx_2.5: $(OCCXMAIN) ccx_2.5.a  $(LIBS)
+ ccx_2.6: $(OCCXMAIN) ccx_2.6.a  $(LIBS)

ccx-2.6-no-local-compare.patch

@@ -1,9 +1,9 @@
---- ccx_2.5/test/compare.orig	2012-10-09 20:34:02.173061299 +0200
+--- ccx_2.6/test/compare.orig	2013-07-09 18:35:53.000000000 +0200
-+++ ccx_2.5/test/compare	2012-10-09 20:38:46.445068043 +0200
++++ ccx_2.6/test/compare	2013-07-11 21:54:30.000000000 +0200
-@@ -18,12 +18,20 @@
+@@ -19,11 +19,21 @@
- 	rm -f ${i%.inp}.dat
  	rm -f ${i%.inp}.frd
  
+ #
 +#	beamread test? This one is special
 +#
 +	if [ "$i" == "beamread.inp" ]; then
@@ -12,13 +12,14 @@
 +		/usr/bin/ccx_2.5 -i beamwrite
 +		mv beamwrite.rout beamread.rin
 +	fi
- #
++
++#
  #       executing CalculiX and generating the .dat and
  #       the .frd file
  #
  
--        /usr/local/bin/ccx_2.5  ${i%.inp} >> $tempfile 2>&1
+-        /usr/local/bin/ccx_2.6  ${i%.inp} >> $tempfile 2>&1
-+        /usr/bin/ccx_2.5  ${i%.inp} >> $tempfile 2>&1
++        /usr/bin/ccx_2.6  ${i%.inp} >> $tempfile 2>&1
  
  #
  #       check whether the .dat and .dat.ref files exist

ccx.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul 11 20:29:28 UTC 2013 - scorot@free.fr
+
+- version 2.6
+ * See http://www.dhondt.de/new_calc.htm for details 
+
 -------------------------------------------------------------------
 Mon Mar 18 21:59:06 UTC 2013 - scorot@free.fr
 

ccx.spec

@@ -17,7 +17,7 @@
 
 
 Name:           ccx
-Version:        2.5
+Version:        2.6
 Release:        0
 Summary:        An open source finite element package
 License:        GPL-2.0 and BSD-3-Clause and SUSE-Public-Domain
@@ -26,9 +26,9 @@ Url:            http://www.calculix.de/
 Source0:        http://www.dhondt.de/ccx_%{version}.src.tar.bz2
 Source1:        http://www.dhondt.de/ccx_%{version}.doc.tar.bz2
 Source2:        http://www.dhondt.de/ccx_%{version}.test.tar.bz2
-Patch0:         ccx-2.5-build.patch
+Patch0:         ccx-2.6-build.patch
 Patch1:         ccx-1.2-doc-Makefile.patch
-Patch2:         ccx-2.5-no-local-compare.patch
+Patch2:         ccx-2.6-no-local-compare.patch
 Patch3:         ccx-2.0-spooles-dynamic.patch
 Patch4:         ccx-2.5-abaqus-shell-heat-transfer-elements-read.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

ccx_2.5.doc.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3118981763f7dd5f039df4666687eeb978e6ae9a0a4ce240aa769fdd06ac3a17
-size 3638148

ccx_2.5.src.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b695c8dbcf3b7680dad31d2f5403c3115bc48d526815182245ba4d7986b24a5
-size 923149

ccx_2.5.test.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:48e428a483e7d099bd19b5ebb2416c29437bad6e5f12dff5eeb4e0fb791756e7
-size 7630079

ccx_2.6.doc.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5bf630d59fe558b7fdcdb2428eb86913e1ee7c71f495b19b6e041ab0c268fe90
+size 4044102

ccx_2.6.src.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:88c1b44eb620791263522e84e316e09303e145216ceb767d9de6870ba103c4e0
+size 954235

ccx_2.6.test.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e2c24e5a6a6a5b4948b1b7dd27648bc5a3d799bf1d9b48137d2fbd172c7f2af5
+size 8252898