diff --git a/.files b/.files index dc7a492..7edf7e0 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index d376100..46ce277 100644 --- a/.rev +++ b/.rev @@ -47,4 +47,12 @@ 841936 + + b845f73f5a12819c5c4eef96f01359b5 + 0.2.3 + + dimstar_suse + + 1136040 + diff --git a/AppCSXCAD-0.2.2.tar.gz b/AppCSXCAD-0.2.2.tar.gz deleted file mode 120000 index f38dad0..0000000 --- a/AppCSXCAD-0.2.2.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafkreicxyl4d7dlikfi544atzcqch27xwndew7thp4m76yaos6itn74uya \ No newline at end of file diff --git a/AppCSXCAD-0.2.3.tar.gz b/AppCSXCAD-0.2.3.tar.gz new file mode 120000 index 0000000..3e72482 --- /dev/null +++ b/AppCSXCAD-0.2.3.tar.gz @@ -0,0 +1 @@ +/ipfs/bafkreifrlufbuiqxexocvsgwyjucridwcgb3p3zwailtfqygh53fitj6ve \ No newline at end of file diff --git a/AppCSXCAD-vtk.patch b/AppCSXCAD-vtk.patch deleted file mode 100644 index f68ad00..0000000 --- a/AppCSXCAD-vtk.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/CMakeLists.txt 2018-12-14 23:45:50.112002905 +0100 -+++ b/CMakeLists.txt 2018-12-15 00:01:35.322874327 +0100 -@@ -117,15 +117,14 @@ - if("${VTK_MAJOR_VERSION}" EQUAL 5) - set( vtk_LIBS - QVTK ) --elseif("${VTK_MAJOR_VERSION}" EQUAL 6) -- set( vtk_LIBS -- vtkGUISupportQt) -+else() -+ set( vtk_LIBS ${VTK_LIBRARIES} ) - endif() - message(STATUS "vtk libraries " ${vtk_LIBS}) - - # Qt - set(CMAKE_AUTOMOC ON) --if(${VTK_VERSION} VERSION_GREATER "6" AND VTK_QT_VERSION VERSION_GREATER "4") -+if(${VTK_VERSION} VERSION_GREATER "6" AND ((NOT DEFINED VTK_QT_VERSION) OR ("${VTK_QT_VERSION}" VERSION_GREATER "4"))) - find_package(Qt5Widgets REQUIRED) - include_directories(${Qt5Widgets_INCLUDE_DIRS}) - find_package(Qt5Xml REQUIRED) diff --git a/AppCSXCAD.changes b/AppCSXCAD.changes index 7e2426d..03d1f74 100644 --- a/AppCSXCAD.changes +++ b/AppCSXCAD.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Sun Dec 31 20:50:24 UTC 2023 - Stefan Brüns + +- Update to version 0.2.3 + * Various bug fixes and enhancements, no changelog available. +- Drop obsolete/upstream patches: + * qt5_use_modules.diff + * AppCSXCAD-vtk.patch + +------------------------------------------------------------------- Thu Oct 15 13:02:01 UTC 2020 - Stefan Brüns - Fix build with VTK 9.x, add AppCSXCAD-vtk.patch diff --git a/AppCSXCAD.spec b/AppCSXCAD.spec index 6243add..54300ce 100644 --- a/AppCSXCAD.spec +++ b/AppCSXCAD.spec @@ -1,7 +1,7 @@ # # spec file for package AppCSXCAD # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,13 @@ Name: AppCSXCAD -Version: 0.2.2 +Version: 0.2.3 Release: 0 Summary: Minimal GUI Application using the QCSXCAD library License: GPL-3.0-only Group: Productivity/Scientific/Other URL: https://openems.de Source0: https://github.com/thliebig/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: qt5_use_modules.diff -# PATCH-FIX-OPENSUSE -Patch1: AppCSXCAD-vtk.patch BuildRequires: CSXCAD-devel BuildRequires: QCSXCAD-devel BuildRequires: cmake @@ -48,12 +45,18 @@ Minimal GUI Application using the QCSXCAD library. %autosetup -p1 %build -%cmake +%cmake \ + -DCMAKE_INSTALL_LIBDIR:Path=%{_libdir} \ + -DENABLE_RPATH:Bool=Off %cmake_build +ls -l +cat *install* +readelf -d ./AppCSXCAD %install %cmake_install +readelf -d %{buildroot}/%{_bindir}/AppCSXCAD %files %license COPYING diff --git a/qt5_use_modules.diff b/qt5_use_modules.diff deleted file mode 100644 index 463d84b..0000000 --- a/qt5_use_modules.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d5b6e5a..148ec66 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -143,7 +143,7 @@ SET(SOURCES - ADD_EXECUTABLE( AppCSXCAD ${SOURCES} ) - - if(Qt5Widgets_FOUND) -- qt5_use_modules(AppCSXCAD Widgets Xml) -+ set(QT_LIBRARIES Qt5::Widgets Qt5::Xml) - endif() - - TARGET_LINK_LIBRARIES( AppCSXCAD