diff --git a/pre_checkin.sh b/pre_checkin.sh index 9a4f91c..e4d942a 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -1,5 +1,4 @@ #!/bin/sh sed 's|%define compat_gl 0|%define compat_gl 1|' vtk.spec > vtk-compat_gl.spec -cp vtk-rpmlintrc vtk-compat_gl-rpmlintrc cp vtk.changes vtk-compat_gl.changes diff --git a/vtk-compat_gl-rpmlintrc b/vtk-compat_gl-rpmlintrc deleted file mode 100644 index c61c3ec..0000000 --- a/vtk-compat_gl-rpmlintrc +++ /dev/null @@ -1,11 +0,0 @@ -# FIXME: See if packaging can be tweaked to avoid these warnings later -# python-vtk needs these devel files to work -addFilter("python3-vtk* devel-file-in-non-devel-package") - -# Upstream does not supply manuals for any binary, suppress warnings -addFilter(".* no-manual-page-for-binary") - -# This is not a versioned shared lib, and not used by anything other than -# vtk's java bindings, simply package it with the vtk-java subpackage -addFilter("vtk-java.* shlib-policy-name-error") -addFilter("vtk-compat_gl-java.* shlib-policy-name-error") diff --git a/vtk-compat_gl.changes b/vtk-compat_gl.changes index b0556fe..c51c783 100644 --- a/vtk-compat_gl.changes +++ b/vtk-compat_gl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 28 10:43:27 UTC 2017 - badshah400@gmail.com + +- Drop vtk-compat_gl-rpmlintrc: openSUSE:Factory bots don't accept + conditional sources and one rpmlintrc file is sufficient for + both main and linked packages anyway. + ------------------------------------------------------------------- Tue Sep 19 10:46:40 UTC 2017 - kkhere.geo@gmail.com @@ -9,13 +16,14 @@ Tue Sep 19 10:46:40 UTC 2017 - kkhere.geo@gmail.com not exist ------------------------------------------------------------------- -Thu Sep 14 19:50:52 UTC 2017 - stefan.bruens@rwth-aachen.de +Thu Sep 14 20:54:34 UTC 2017 - stefan.bruens@rwth-aachen.de - Remove the various subpackage Requires from the devel package again. The qt subpackage contains a Qt Designer plugin and no dependency at all. Package the vtkWrap{Tcl,Java,Python} wrapper generators in the devel package, as these are useless without the vtk headers files. +- Fix description/summary of vtk-qt subpackage ------------------------------------------------------------------- Tue Sep 12 12:33:38 UTC 2017 - kkhere.geo@gmail.com diff --git a/vtk-compat_gl.spec b/vtk-compat_gl.spec index e701966..66cf04e 100644 --- a/vtk-compat_gl.spec +++ b/vtk-compat_gl.spec @@ -45,11 +45,7 @@ Url: http://vtk.org/ Source: http://www.vtk.org/files/release/%{series}/VTK-%{version}.tar.gz # FIXME See if packaging can be tweaked to accommodate python-vtk's devel files in a devel package later # We need to use the compat conditionals here to avoid Factory's source validator from tripping up -%if %{compat_gl} -Source1: vtk-compat_gl-rpmlintrc -%else Source1: vtk-rpmlintrc -%endif # PATCH-FIX-UPSTREAM vtk-fix-file-contains-date-time.patch badshah400@gmail.com -- Fix file containing DATE and TIME Patch1: vtk-fix-file-contains-date-time.patch # PATCH-FIX-UPSTREAM vtk-Rinterface-uintptr_t.patch boo#985386 badshah400@gmail.com -- Fix issues with uintptr_t redefinition by defining the HAVE_UINTPTR_T macro using cmake functions to avoid redefinition of uintptr_t, which is already defined in stdint.h called earlier; patch sent upstream @@ -218,7 +214,7 @@ rendering and visualization. This package provides python bindings for VTK. %package qt -Summary: Qt VTK widget +Summary: Qt Designer plugin for QVTKWidget Group: Development/Libraries/C and C++ Requires: %{shlib} = %{version} %if %{compat_gl} @@ -232,7 +228,7 @@ Conflicts: vtk-compat_gl-qt VTK is a software system for image processing, 3D graphics, volume rendering and visualization. -This package provides Qt bindings for VTK. +This package provides a Qt Designer plugin for the QVTKWidget. %package tcl Summary: Tcl bindings for VTK diff --git a/vtk.changes b/vtk.changes index b6ff494..c51c783 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 28 10:43:27 UTC 2017 - badshah400@gmail.com + +- Drop vtk-compat_gl-rpmlintrc: openSUSE:Factory bots don't accept + conditional sources and one rpmlintrc file is sufficient for + both main and linked packages anyway. + ------------------------------------------------------------------- Tue Sep 19 10:46:40 UTC 2017 - kkhere.geo@gmail.com diff --git a/vtk.spec b/vtk.spec index a753ef3..73a8e80 100644 --- a/vtk.spec +++ b/vtk.spec @@ -45,11 +45,7 @@ Url: http://vtk.org/ Source: http://www.vtk.org/files/release/%{series}/VTK-%{version}.tar.gz # FIXME See if packaging can be tweaked to accommodate python-vtk's devel files in a devel package later # We need to use the compat conditionals here to avoid Factory's source validator from tripping up -%if %{compat_gl} -Source1: vtk-compat_gl-rpmlintrc -%else Source1: vtk-rpmlintrc -%endif # PATCH-FIX-UPSTREAM vtk-fix-file-contains-date-time.patch badshah400@gmail.com -- Fix file containing DATE and TIME Patch1: vtk-fix-file-contains-date-time.patch # PATCH-FIX-UPSTREAM vtk-Rinterface-uintptr_t.patch boo#985386 badshah400@gmail.com -- Fix issues with uintptr_t redefinition by defining the HAVE_UINTPTR_T macro using cmake functions to avoid redefinition of uintptr_t, which is already defined in stdint.h called earlier; patch sent upstream