[gtatool] New release 2.1.0

Thu Dec 25 18:23:29 UTC 2014

commit 5a57812b1279faad7abd78749c1a3901efde37d5
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Thu Dec 25 19:22:51 2014 +0100

    New release 2.1.0
    
    - Temporarily disable the dcmtk sub-package, due to BZ #922937
    - Temporarily disable the pcd sub-package, due to BZ #1177244

 .gitignore                  |    2 +
 gtatool-1.5.2-pcl-1.7.patch |   48 ---------------------
 gtatool.spec                |   97 ++++++++++++++++++++++---------------------
 sources                     |    2 +-
 4 files changed, 53 insertions(+), 96 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index a742077..4e67228 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /gtatool-1.5.1.tar.xz
 /gtatool-1.5.2.tar.xz
+/gtatool-2.0.1.tar.xz
+/gtatool-2.1.0.tar.xz
diff --git a/gtatool.spec b/gtatool.spec
index c559d7b..2132106 100644
--- a/gtatool.spec
+++ b/gtatool.spec
@@ -1,26 +1,21 @@
 %global completion_path %(pkg-config --variable=completionsdir bash-completion)
 
 Name:      gtatool
-Version:   1.5.2
-Release:   14%{?dist}
+Version:   2.1.0
+Release:   1%{?dist}
 Summary:   Commandline tool to manipulate GTAs
 Group:     Applications/Engineering
 License:   GPLv3+
 URL:       http://gta.nongnu.org/gtatool.html
 Source0:   http://download.savannah.nongnu.org/releases/gta/%{name}-%{version}.tar.xz
 
-# Response to the failing ImageMagick test
-# Doesn't solve the problem
-# http://git.savannah.gnu.org/cgit/gta.git/patch/?id=8a4cba71a35fa19eb58c111d6a376e181f642ae0
-#Patch1:    %{name}-1.5.0-imagemagick-test.patch
-Patch2:   %{name}-1.5.2-pcl-1.7.patch
-
-BuildRequires: libtool automake autoconf
 BuildRequires: gettext-devel
 BuildRequires: bash-completion
-BuildRequires: dcmtk-devel
+#BuildRequires: dcmtk-devel
+# https://bugzilla.redhat.com/show_bug.cgi?id=922937
 BuildRequires: desktop-file-utils
 BuildRequires: gdal-devel
+BuildRequires: glew-devel
 BuildRequires: ImageMagick-c++-devel
 BuildRequires: libgta-devel
 BuildRequires: libsndfile-devel
@@ -30,13 +25,20 @@ BuildRequires: netcdf-devel
 BuildRequires: netpbm-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openjpeg-devel
-%if 0%{?fedora} > 17
-BuildRequires: pcl-devel
-%endif
+#BuildRequires: pcl-devel
+#TODO: Remove libquadmath later!
+BuildRequires: libquadmath-devel
+# https://bugzilla.redhat.com/show_bug.cgi?id=1177244
 BuildRequires: pkgconfig
 BuildRequires: pfstools-devel
 BuildRequires: qt4-devel
 
+# Optional new BRs, when available in Fedora: libgls, libequalizer, libteem
+# http://teem.sourceforge.net/
+# http://libgls.sourceforge.net/
+# https://github.com/Eyescale/Equalizer
+# https://bugzilla.redhat.com/show_bug.cgi?id=758472
+
 Requires(post): info
 Requires(preun): info
 
@@ -62,14 +64,14 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 This sub-package contains the graphical interface of %{name}.
 
 
-%package dcmtk
-Summary:        Module to import/export via dcmtk
-Group:          Applications/Engineering
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-
-%description dcmtk
-This sub-package contains the necessary module to import and export
-medical image data in DICOM format via dcmtk.
+#%package dcmtk
+#Summary:        Module to import/export via dcmtk
+#Group:          Applications/Engineering
+#Requires:       %{name}%{?_isa} = %{version}-%{release}
+#
+#%description dcmtk
+#This sub-package contains the necessary module to import and export
+#medical image data in DICOM format via dcmtk.
 
 
 %package gdal
@@ -122,16 +124,14 @@ This sub-package contains the necessary module to import and export
 netcdf files, including HDF4 and 5.
 
 
-%if 0%{?fedora} > 17
-%package pcd
-Summary:        Module to import/export point cloud data
-Group:          Applications/Engineering
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-
-%description pcd
-This sub-package contains the necessary module to import and export
-point cloud data via pcl.
-%endif
+#%package pcd
+#Summary:        Module to import/export point cloud data
+#Group:          Applications/Engineering
+#Requires:       %{name}%{?_isa} = %{version}-%{release}
+#
+#%description pcd
+#This sub-package contains the necessary module to import and export
+#point cloud data via pcl.
 
 
 %package sndfile
@@ -146,20 +146,19 @@ sound data via libsndfile.
 
 %prep
 %setup -q
-#%patch1 -p2 -b .~imagemagick-test
-%patch2 -p2 -b .~pcl
 
 %build
-autoreconf -fi
 # Stupid way to avoid overwriting the original LDFLAGS.
 # __global_ldflags might do instead
-export LDFLAGS_ADD="-L%{_libdir}/dcmtk"
 export CFLAGS="%{optflags} -I%{_includedir}/netpbm"
 export CXXFLAGS="%{optflags} -I%{_includedir}/netpbm"
+export BASHCOMPLETIONDIR="%{completion_path}"
 
 # 1994 ply files are bundled; rply could take over, but the API is different
 # pvm uses files from vvv; No package is currently available in Fedora
-%configure LDFLAGS="$LDFLAGS $LDFLAGS_ADD" \
+#TODO: Consider to switch to GraphicsMagick, as that's the default or even supply both
+%configure LDFLAGS="$LDFLAGS" \
+    --with-magick-flavor=ImageMagick \
     --without-ffmpeg \
     --without-ply \
     --without-pvm
@@ -176,10 +175,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/gta_gui.desktop
 rm -rf %{buildroot}%{_infodir}/dir
 
 # Completion scripts are loaded on demand from bash-completion 1.99 on
-#TODO: Upstream
-
-mkdir -p %{buildroot}%{completion_path}
-mv %{buildroot}%{_sysconfdir}/bash_completion.d/gta-completion.bash %{buildroot}%{completion_path}/gta
 
 
 %check
@@ -224,9 +219,10 @@ fi
 %dir %{_libdir}/%{name}/
 %{_libdir}/%{name}/component-compute.so
 %{_libdir}/%{name}/conv-csv.so
-%{_libdir}/%{name}/conv-jpeg.so
 %{_libdir}/%{name}/conv-datraw.so
+%{_libdir}/%{name}/conv-jpeg.so
 %{_libdir}/%{name}/conv-netpbm.so
+%{_libdir}/%{name}/conv-png.so
 %{_libdir}/%{name}/conv-rat.so
 %{_libdir}/%{name}/conv-raw.so
 %{_infodir}/gta.info*
@@ -237,11 +233,12 @@ fi
 
 %files gui
 %{_libdir}/%{name}/gui.so
+%{_libdir}/%{name}/view.so
 %{_datadir}/applications/gta_gui.desktop
 %{_datadir}/icons/hicolor/*/*
 
-%files dcmtk
-%{_libdir}/%{name}/conv-dcmtk.so
+#%files dcmtk
+#%{_libdir}/%{name}/conv-dcmtk.so
 
 %files gdal
 %{_libdir}/%{name}/conv-gdal.so
@@ -259,16 +256,22 @@ fi
 %files netcdf
 %{_libdir}/%{name}/conv-netcdf.so
 
-%if 0%{?fedora} > 17
-%files pcd
-%{_libdir}/%{name}/conv-pcd.so
-%endif
+#%files pcd
+#%{_libdir}/%{name}/conv-pcd.so
 
 %files sndfile
 %{_libdir}/%{name}/conv-sndfile.so
 
 
 %changelog
+* Thu Dec 18 2014 Volker Fröhlich <volker27 at gmx.at> - 2.1.0-1
+- New upstream release
+- Remove F17 conditionals
+- Don't require bash-completion
+- Let the build system install the BASH completion file
+- Temporarily disable the dcmtk sub-package, due to BZ #922937
+- Temporarily disable the pcd sub-package, due to BZ #1177244
+
 * Wed Nov 26 2014 Rex Dieter <rdieter at fedoraproject.org> 1.5.2-14
 - rebuild (openexr)
 
diff --git a/sources b/sources
index e15d15f..8d6b807 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f899e0872d0d706878844bb7f48bc7e  gtatool-1.5.2.tar.xz
+b7edc32131be6f82a501b9af851cef25  gtatool-2.1.0.tar.xz
