commit 23006f57ccd0a6738142dde473d162471407e5f3
Author: Jan Rękorajski <[email protected]>
Date: Tue Nov 24 01:31:50 2015 +0100
- fix building with pfstools 2.0
- rel 5
gtatool.spec | 6 ++++--
pfstools2.patch | 22 ++++++++++++++++++++++
2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/gtatool.spec b/gtatool.spec
index 389e8ee..13870c6 100644
--- a/gtatool.spec
+++ b/gtatool.spec
@@ -24,7 +24,7 @@ Summary: Tools to manipulate Generic Tagged Array (GTA)
files
Summary(pl.UTF-8): Narzędzia do obróbki plików GTA (ogólnych tablic
etykietowanych)
Name: gtatool
Version: 2.0.1
-Release: 4
+Release: 5
License: GPL v3+
Group: Applications/File
Source0:
http://download.savannah.gnu.org/releases/gta/%{name}-%{version}.tar.xz
@@ -32,6 +32,7 @@ Source0:
http://download.savannah.gnu.org/releases/gta/%{name}-%{version}.tar.xz
Patch0: ffmpeg2.patch
Patch1: %{name}-getopt.patch
Patch2: %{name}-bashcomp.patch
+Patch3: pfstools2.patch
URL: http://gta.nongnu.org/gtatool.html
%{?with_magick:BuildRequires: ImageMagick-c++-devel}
%{?with_openexr:BuildRequires: OpenEXR-devel}
@@ -56,7 +57,7 @@ BuildRequires: libtool >= 2:2.2.6
%{?with_netcdf:BuildRequires: netcdf-devel}
%{?with_netpbm:BuildRequires: netpbm-devel}
%{?with_pcl:BuildRequires: pcl-devel >= 1.7}
-%{?with_pfs:BuildRequires: pfstools-devel >= 1.2}
+%{?with_pfs:BuildRequires: pfstools-devel >= 2.0}
BuildRequires: pkgconfig
%{?with_qt:BuildRequires: qt4-build >= 4.8}
BuildRequires: rpmbuild(macros) >= 1.673
@@ -284,6 +285,7 @@ Bashowe uzupełnianie parametrów programu gtatool.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
diff --git a/pfstools2.patch b/pfstools2.patch
new file mode 100644
index 0000000..c8c2815
--- /dev/null
+++ b/pfstools2.patch
@@ -0,0 +1,22 @@
+--- gtatool-2.0.1/src/conv-pfs/from-pfs.cpp~ 2013-04-28 20:24:13.000000000
+0200
++++ gtatool-2.0.1/src/conv-pfs/from-pfs.cpp 2015-11-24 00:35:33.834608471
+0100
+@@ -23,7 +23,7 @@
+
+ #include <string>
+
+-#include <pfs-1.2/pfs.h>
++#include <pfs/pfs.h>
+
+ #include <gta/gta.hpp>
+
+--- gtatool-2.0.1/src/conv-pfs/to-pfs.cpp~ 2013-04-28 20:24:13.000000000
+0200
++++ gtatool-2.0.1/src/conv-pfs/to-pfs.cpp 2015-11-24 00:35:49.311263517
+0100
+@@ -24,7 +24,7 @@
+ #include <string>
+ #include <limits>
+
+-#include <pfs-1.2/pfs.h>
++#include <pfs/pfs.h>
+
+ #include <gta/gta.hpp>
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtatool.git/commitdiff/23006f57ccd0a6738142dde473d162471407e5f3
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
