Hello community, here is the log from the commit of package AppCSXCAD for openSUSE:Factory checked in at 2016-09-11 00:54:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/AppCSXCAD (Old) and /work/SRC/openSUSE:Factory/.AppCSXCAD.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "AppCSXCAD" Changes: -------- --- /work/SRC/openSUSE:Factory/AppCSXCAD/AppCSXCAD.changes 2015-11-26 17:01:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.AppCSXCAD.new/AppCSXCAD.changes 2016-09-11 00:54:03.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Aug 26 18:50:09 UTC 2016 - dmitr...@opensuse.org + +- Update to version 0.2.1 + * Bugfix release +- Drop obsolete + * AppCSXCAD-vtk.patch + +------------------------------------------------------------------- Old: ---- AppCSXCAD-0.2.0.tar.gz AppCSXCAD-vtk.patch New: ---- AppCSXCAD-0.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ AppCSXCAD.spec ++++++ --- /var/tmp/diff_new_pack.eEP4W2/_old 2016-09-11 00:54:04.000000000 +0200 +++ /var/tmp/diff_new_pack.eEP4W2/_new 2016-09-11 00:54:04.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package AppCSXCAD # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,13 @@ Name: AppCSXCAD -Version: 0.2.0 +Version: 0.2.1 Release: 0 Summary: Minimal GUI Application using the QCSXCAD library License: GPL-3.0 Group: Productivity/Scientific/Other Url: http://openems.de Source0: https://github.com/thliebig/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM AppCSXCAD-vtk.patch -- Fix build with VTK 6.3 -Patch1: AppCSXCAD-vtk.patch BuildRequires: CSXCAD-devel BuildRequires: QCSXCAD-devel BuildRequires: cmake @@ -45,7 +43,6 @@ %prep %setup -q -%patch1 -p1 %build %cmake ++++++ AppCSXCAD-0.2.0.tar.gz -> AppCSXCAD-0.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/AppCSXCAD-0.2.0/AppCSXCAD.pro new/AppCSXCAD-0.2.1/AppCSXCAD.pro --- old/AppCSXCAD-0.2.0/AppCSXCAD.pro 2015-10-10 14:17:33.000000000 +0200 +++ new/AppCSXCAD-0.2.1/AppCSXCAD.pro 1970-01-01 01:00:00.000000000 +0100 @@ -1,111 +0,0 @@ -TEMPLATE = app -TARGET = AppCSXCAD -CONFIG += debug_and_release - -VERSION = 0.2.0 - -# add git revision -GITREV = $$system(git describe --tags) -isEmpty(GITREV):GITREV=$$VERSION -DEFINES += GIT_VERSION=\\\"$$GITREV\\\" - -MOC_DIR = moc -OBJECTS_DIR = obj -QT += core gui xml -greaterThan(QT_MAJOR_VERSION, 4):QT+=widgets - -# remove unnecessary webkit define -DEFINES -= QT_WEBKIT - -exists(localPaths.pri) { - include(localPaths.pri) -} - -win32 { - isEmpty(WIN32_LIB_ROOT) { - WIN32_LIB_ROOT = .. - } - - #CSXCAD - isEmpty(CSXCAD_ROOT) { - CSXCAD_ROOT = $$WIN32_LIB_ROOT/CSXCAD - } - INCLUDEPATH += $$CSXCAD_ROOT/include/CSXCAD - LIBS += -L$$CSXCAD_ROOT/lib -lCSXCAD0 - - #QCSXCAD - isEmpty(QCSXCAD_ROOT) { - QCSXCAD_ROOT = $$WIN32_LIB_ROOT/QCSXCAD - } - INCLUDEPATH += $$QCSXCAD_ROOT/include/QCSXCAD - LIBS += -L$$QCSXCAD_ROOT/lib -lQCSXCAD0 -} - -unix { - #CSXCAD - isEmpty(CSXCAD_ROOT) { - CSXCAD_ROOT = /usr - } else { - QMAKE_LFLAGS += \'-Wl,-rpath,$$CSXCAD_ROOT/lib\' - } - INCLUDEPATH += $$CSXCAD_ROOT/include/CSXCAD - LIBS += -L$$CSXCAD_ROOT/lib -lCSXCAD - - #QCSXCAD - isEmpty(QCSXCAD_ROOT) { - QCSXCAD_ROOT = /usr - } else { - QMAKE_LFLAGS += \'-Wl,-rpath,$$QCSXCAD_ROOT/lib\' - } - INCLUDEPATH += $$QCSXCAD_ROOT/include/QCSXCAD - LIBS += -L$$QCSXCAD_ROOT/lib -lQCSXCAD - - #vtk - isEmpty(VTK_LIBRARYPATH) { - #unnecessary by default - } else { - QMAKE_LFLAGS += \'-Wl,-rpath,$$VTK_LIBRARYPATH\' - } -} - -HEADERS += AppCSXCAD.h -SOURCES += AppCSXCAD.cpp \ - main.cpp -FORMS += -RESOURCES += - -QMAKE_CXXFLAGS_DEBUG = -O0 -g - - - - -# -# create tar file -# -tarball.target = tarball -tarball.commands = git archive --format=tar --prefix=AppCSXCAD-$$VERSION/ HEAD | bzip2 > AppCSXCAD-$${VERSION}.tar.bz2 - -QMAKE_EXTRA_TARGETS += tarball - - -# -# INSTALL -# -isEmpty(PREFIX) { - PREFIX = /usr/local -} -install.target = install -install.commands = mkdir -p \"$$PREFIX/bin\" -unix:!macx:install.commands += && cp -at \"$$PREFIX/bin/\" AppCSXCAD AppCSXCAD.sh -win32:install.commands += && cp -at \"$$PREFIX/bin/\" release/AppCSXCAD.exe -macx:install.commands += && cp -r AppCSXCAD.app AppCSXCAD.sh \"$$PREFIX/bin/\" - -QMAKE_EXTRA_TARGETS += install - - -# -# create .PHONY target -# -phony.target = .PHONY -phony.depends = $$QMAKE_EXTRA_TARGETS -QMAKE_EXTRA_TARGETS += phony diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/AppCSXCAD-0.2.0/CMakeLists.txt new/AppCSXCAD-0.2.1/CMakeLists.txt --- old/AppCSXCAD-0.2.0/CMakeLists.txt 2015-10-10 14:17:33.000000000 +0200 +++ new/AppCSXCAD-0.2.1/CMakeLists.txt 2016-05-12 21:20:59.000000000 +0200 @@ -10,12 +10,16 @@ cmake_minimum_required(VERSION 2.8) +if(POLICY CMP0020) + cmake_policy(SET CMP0020 OLD) +endif() + IF(EXISTS ${PROJECT_SOURCE_DIR}/localConfig.cmake) include(${PROJECT_SOURCE_DIR}/localConfig.cmake) ENDIF() # default -set(VERSION "v0.2.0") +set(VERSION "v0.2.1") # add git revision IF(EXISTS ${PROJECT_SOURCE_DIR}/.git ) @@ -96,7 +100,10 @@ find_package(VTK 6.1 REQUIRED) else() # prefer >=6.1, fallback to >=5.4 - find_package(VTK REQUIRED) + find_package(VTK 6.1 COMPONENTS vtkGUISupportQt NO_MODULE) + IF (NOT ${VTK_FOUND}) + find_package(VTK REQUIRED) + endif() endif() message(STATUS "Found package VTK. Using " ${VTK_VERSION}) @@ -110,24 +117,20 @@ set( vtk_LIBS vtkGUISupportQt) endif() +message(STATUS "vtk libraries " ${vtk_LIBS}) # Qt set(CMAKE_AUTOMOC ON) -if(WIN32 OR "${VTK_MAJOR_VERSION}" EQUAL 5) +if(${VTK_VERSION} VERSION_GREATER "6" AND VTK_QT_VERSION VERSION_GREATER "4") + find_package(Qt5Widgets REQUIRED) + include_directories(${Qt5Widgets_INCLUDE_DIRS}) + find_package(Qt5Xml REQUIRED) + include_directories(${Qt5Xml_INCLUDE_DIRS}) + INCLUDE_DIRECTORIES(${Qt5_INCLUDE_DIRS}) + set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") +else() FIND_PACKAGE(Qt4 REQUIRED QtCore QtGui QtXml) INCLUDE( ${QT_USE_FILE} ) -elseif("${VTK_MAJOR_VERSION}" EQUAL 6) - find_package(Qt5Widgets) - if(Qt5Widgets_FOUND) - include_directories(${Qt5Widgets_INCLUDE_DIRS}) - find_package(Qt5Xml REQUIRED) - include_directories(${Qt5Xml_INCLUDE_DIRS}) - INCLUDE_DIRECTORIES(${Qt5_INCLUDE_DIRS}) - set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") - else() - FIND_PACKAGE(Qt4 REQUIRED QtCore QtGui QtXml) - INCLUDE( ${QT_USE_FILE} ) - endif() endif() message(STATUS "Found package VTK. Using version " ${VTK_VERSION})
