Accepting request 511723 from science:unstable

version update

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

ccx-2.5-abaqus-shell-heat-transfer-elements-read.patch

@@ -1,6 +1,7 @@
-diff -aruN ccx_2.5.orig/src/elements.f ccx_2.5/src/elements.f
+Index: ccx-2.12/CalculiX/ccx_2.12/src/elements.f
---- ccx_2.5.orig/src/elements.f	2012-10-06 15:13:06.000000000 +0200
+===================================================================
-+++ ccx_2.5/src/elements.f	2012-10-09 21:07:13.733108555 +0200
+--- ccx-2.12.orig/CalculiX/ccx_2.12/src/elements.f
++++ ccx-2.12/CalculiX/ccx_2.12/src/elements.f
 @@ -120,7 +120,8 @@
  !
  !           removing the ABAQUS label for heat transfer elements

ccx-2.8-build.patch

@@ -1,16 +1,17 @@
-diff -U 3 -H -d -r -N -- CalculiX.orig/ccx_2.8p2/src/Makefile CalculiX/ccx_2.8p2/src/Makefile
+Index: ccx-2.12/CalculiX/ccx_2.12/src/Makefile
---- ccx_2.8p2.orig/src/Makefile	2015-03-04 21:46:08.000000000 +0300
+===================================================================
-+++ ccx_2.8p2/src/Makefile	2015-05-31 19:04:44.335112575 +0300
+--- ccx-2.12.orig/CalculiX/ccx_2.12/src/Makefile
++++ ccx-2.12/CalculiX/ccx_2.12/src/Makefile
 @@ -1,6 +1,6 @@
  
--CFLAGS = -Wall -O3  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
+-CFLAGS = -Wall -O3 -fopenmp -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
 -FFLAGS = -Wall -O3 -fopenmp
 +CFLAGS = -Wall $(GLOBAL_OFLAGS) -g -DARCH="Linux" -DUSE_MT -DSPOOLES -DARPACK -DMATRIXSTORAGE -Wno-unused
 +FFLAGS = -Wall $(GLOBAL_OFLAGS) -g -Wno-unused -fopenmp
  
  CC=cc
  FC=gfortran
-@@ -21,8 +21,8 @@
+@@ -21,8 +21,8 @@ OCCXMAIN = $(SCCXMAIN:.c=.o)
  DIR=../../../SPOOLES.2.2
  
  LIBS = \
@@ -20,4 +21,39 @@ diff -U 3 -H -d -r -N -- CalculiX.orig/ccx_2.8p2/src/Makefile CalculiX/ccx_2.8p2
 +       -larpack -llapack -lblas \
         -lpthread -lm -lc
  
- ccx_2.8p2: $(OCCXMAIN) ccx_2.8p2.a  $(LIBS)
+ ccx_2.12: $(OCCXMAIN) ccx_2.12.a  $(LIBS)
+--- ccx-2.12/CalculiX/ccx_2.12/src/mafilltcompmain.c.orig	2017-07-20 01:40:53.300552079 +0200
++++ ccx-2.12/CalculiX/ccx_2.12/src/mafilltcompmain.c	2017-07-20 01:42:31.516556093 +0200
+@@ -150,7 +150,7 @@
+ 			 body1,volume1,ielfa1,lakonf1,ifabou1,
+ 			 nbody1,neq1,dtimef1,velo1,veloo1,cvfa1,hcfa1,cvel1,
+ 			 gradvel1,xload1,gammat1,xrlfa1,xxj1,nactdohinv1,
+-			 a11,a21,a31,flux1,&nefa,&nefb,iau61,xxni1,xxnj1));
++			 a11,a21,a31,flux1,&nefa,&nefb,(void*)iau61,xxni1,xxnj1));
+ 
+     return NULL;
+ }
+--- ccx-2.12/CalculiX/ccx_2.12/src/steadystate.c.orig	2017-07-20 01:45:15.689465570 +0200
++++ ccx-2.12/CalculiX/ccx_2.12/src/steadystate.c	2017-07-20 01:46:12.869467908 +0200
+@@ -1777,8 +1777,8 @@
+ 		      xforc,nforc,thicke,shcon,nshcon,
+ 		      sideload,xload,xloadold,&icfd,inomat,pslavsurf,pmastsurf,
+ 		      &mortar,islavact,cdn,islavnode,nslavnode,&ntie,clearini,
+-                      islavsurf,ielprop,prop,energyini,energy,&iit,iponoel,
+-                      inoel,nener,orname,network);}
++                      islavsurf,ielprop,prop,energyini,energy,&iit,iponoel,
++                      inoel,nener,orname,(void*)network);}
+ 	  else{ 
+       
+               /* calculating displacements/temperatures */
+@@ -2808,8 +2808,8 @@
+ 		      thicke,shcon,nshcon,
+ 		      sideload,xload,xloadold,&icfd,inomat,pslavsurf,pmastsurf,
+ 		      &mortar,islavact,cdn,islavnode,nslavnode,&ntie,clearini,
+-                      islavsurf,ielprop,prop,energyini,energy,&iit,iponoel,
+-                      inoel,nener,orname,network);
++                      islavsurf,ielprop,prop,energyini,energy,&iit,iponoel,
++                      inoel,nener,orname,(void*)network);
+ 	  
+ 	      (*kode)++;
+ 	      mode=-1;

ccx-2.8-spooles-dynamic.patch

@@ -1,6 +1,7 @@
-diff -U 3 -H -d -r -N -- CalculiX.orig/ccx_2.8p2/src/cascade.c CalculiX/ccx_2.8p2/src/cascade.c
+Index: ccx-2.12/CalculiX/ccx_2.12/src/cascade.c
---- ccx_2.8p2.orig/src/cascade.c	2015-03-04 21:46:07.000000000 +0300
+===================================================================
-+++ ccx_2.8p2/src/cascade.c	2015-05-31 16:37:59.522092453 +0300
+--- ccx-2.12.orig/CalculiX/ccx_2.12/src/cascade.c
++++ ccx-2.12/CalculiX/ccx_2.12/src/cascade.c
 @@ -21,9 +21,9 @@
  #include <string.h>
  
@@ -14,9 +15,10 @@ diff -U 3 -H -d -r -N -- CalculiX.orig/ccx_2.8p2/src/cascade.c CalculiX/ccx_2.8p
  #endif
  
  #include "CalculiX.h"
-diff -U 3 -H -d -r -N -- CalculiX.orig/ccx_2.8p2/src/spooles.h CalculiX/ccx_2.8p2/src/spooles.h
+Index: ccx-2.12/CalculiX/ccx_2.12/src/spooles.h
---- ccx_2.8p2.orig/src/spooles.h	2015-03-04 21:46:07.000000000 +0300
+===================================================================
-+++ ccx_2.8p2/src/spooles.h	2015-05-31 16:39:15.982564896 +0300
+--- ccx-2.12.orig/CalculiX/ccx_2.12/src/spooles.h
++++ ccx-2.12/CalculiX/ccx_2.12/src/spooles.h
 @@ -23,11 +23,11 @@
   */
  

ccx.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul 19 23:23:47 UTC 2017 - adrian@suse.de
+
+- update to 2.12
+
 -------------------------------------------------------------------
 Sun May 31 16:27:13 UTC 2015 - avvissu@yandex.ru
 

ccx.spec

@@ -17,7 +17,7 @@
 
 
 Name:           ccx
-Version:        2.8p2
+Version:        2.12
 Release:        0
 Summary:        An open source finite element package
 License:        GPL-2.0 and BSD-3-Clause and SUSE-Public-Domain
@@ -28,7 +28,6 @@ Source1:        http://www.dhondt.de/ccx_%{version}.doc.tar.bz2
 Source2:        http://www.dhondt.de/ccx_%{version}.test.tar.bz2
 Patch0:         ccx-2.8-build.patch
 Patch1:         ccx-1.2-doc-Makefile.patch
-Patch2:         ccx-2.8-no-local-compare.patch
 Patch3:         ccx-2.8-spooles-dynamic.patch
 Patch4:         ccx-2.5-abaqus-shell-heat-transfer-elements-read.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -66,24 +65,22 @@ to check your installation.
 
 %prep
 %setup -c -q
+%patch0 -p1
 %setup -D -T -a 1 -q
 %setup -D -T -a 2 -q
+%patch1 -p1
+%patch3 -p1
+%patch4 -p1
 
 # fixup dirs: very deep directory structure, not suitable for patching
 cd ${RPM_BUILD_DIR}/%{name}-%{version}
-mv CalculiX/ccx_%{version}/doc .
+mv CalculiX/ccx_%{version}/doc/* doc/
 mv CalculiX/ccx_%{version}/src .
 mv CalculiX/ccx_%{version}/test .
+rmdir CalculiX/ccx_%{version}/doc
 rmdir CalculiX/ccx_%{version}
 rmdir CalculiX
 
-cd ${RPM_BUILD_DIR}/%{name}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
 %build
 cd ${RPM_BUILD_DIR}/%{name}-%{version}
 # use rpm's proposal for CFLAGS
@@ -112,6 +109,8 @@ rm -rf $RPM_BUILD_ROOT/*
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 cp src/ccx_%{version} $RPM_BUILD_ROOT/%{_bindir}
 chmod 755 $RPM_BUILD_ROOT/%{_bindir}/ccx_%{version}
+# symlink needed or apps like FreeCAD won't find it
+ln -s ccx_%{version} $RPM_BUILD_ROOT/%{_bindir}/ccx
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}-examples-%{version}
 cp test/* $RPM_BUILD_ROOT/%{_datadir}/%{name}-examples-%{version}
@@ -122,11 +121,9 @@ chmod 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}-examples-%{version}/frdcheck.pl
 
 %fdupes $RPM_BUILD_ROOT/%{_datadir}/%{name}-examples-%{version}
 
-%clean
-rm -Rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
+%{_bindir}/ccx
 %{_bindir}/ccx_%{version}
 %doc BUGS
 %doc LOGBOOK

ccx_2.12.doc.tar.bz2

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

ccx_2.12.src.tar.bz2

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

ccx_2.12.test.tar.bz2

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

ccx_2.8p2.doc.tar.bz2

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

ccx_2.8p2.src.tar.bz2

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

ccx_2.8p2.test.tar.bz2

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