You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2018/10/02 14:49:54 UTC
[arrow] branch master updated: ARROW-3400: [Packaging] Add support
for Parquet GLib deb/rpm
This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new fa4c1aa ARROW-3400: [Packaging] Add support for Parquet GLib deb/rpm
fa4c1aa is described below
commit fa4c1aa8e6bba506e6f5fcc2dbe5ea6538d46ff4
Author: Kouhei Sutou <ko...@clear-code.com>
AuthorDate: Tue Oct 2 23:49:40 2018 +0900
ARROW-3400: [Packaging] Add support for Parquet GLib deb/rpm
Author: Kouhei Sutou <ko...@clear-code.com>
Closes #2682 from kou/packaging-parquet-glib-linux-packages and squashes the following commits:
e6dfd51e <Kouhei Sutou> Remove needless "apt install"
9b56c931 <Kouhei Sutou> Fix path
1dcc11dd <Kouhei Sutou> Add missing .install file
e492f302 <Kouhei Sutou> Remove needless LD_LIBRARY_PATH
6ead4af3 <Kouhei Sutou> Fix gtk-doc build error
2d29b181 <Kouhei Sutou> Fix build error on Ubuntu xenial and bionic
ca41b3fb <Kouhei Sutou> Add support for Parquet GLib deb/rpm
---
c_glib/doc/parquet-glib/Makefile.am | 4 +-
c_glib/doc/parquet-glib/meson.build | 1 +
dev/release/rat_exclude_files.txt | 12 ++++
.../linux-packages/debian.ubuntu-trusty/control | 55 ++++++++++++++++++-
.../debian.ubuntu-trusty/gir1.2-arrow-1.0.install | 2 +-
.../gir1.2-parquet-1.0.install | 1 +
.../debian.ubuntu-trusty/libarrow-glib-dev.install | 2 +-
.../libarrow-glib-doc.doc-base | 6 +-
.../libparquet-glib-dev.install | 5 ++
.../libparquet-glib-doc.doc-base | 9 +++
.../libparquet-glib-doc.install | 1 +
.../debian.ubuntu-trusty/libparquet-glib-doc.links | 3 +
.../debian.ubuntu-trusty/libparquet-glib11.install | 1 +
dev/tasks/linux-packages/debian/control | 55 ++++++++++++++++++-
.../debian/gir1.2-parquet-1.0.install | 1 +
.../debian/libarrow-glib-doc.doc-base | 6 +-
.../debian/libparquet-glib-dev.install | 5 ++
.../debian/libparquet-glib-doc.doc-base | 9 +++
.../debian/libparquet-glib-doc.install | 1 +
.../debian/libparquet-glib-doc.links | 3 +
.../debian/libparquet-glib11.install | 1 +
dev/tasks/linux-packages/travis.linux.yml | 23 --------
dev/tasks/linux-packages/yum/arrow.spec.in | 64 ++++++++++++++++++----
dev/tasks/tasks.yml | 20 +++++++
24 files changed, 243 insertions(+), 47 deletions(-)
diff --git a/c_glib/doc/parquet-glib/Makefile.am b/c_glib/doc/parquet-glib/Makefile.am
index 71459a8..d125be1 100644
--- a/c_glib/doc/parquet-glib/Makefile.am
+++ b/c_glib/doc/parquet-glib/Makefile.am
@@ -49,8 +49,8 @@ AM_CFLAGS = \
$(PARQUET_CFLAGS)
GTKDOC_LIBS = \
- $(top_builddir)/arrow-glib/libarrow-glib.la \
- $(top_builddir)/parquet-glib/libparquet-glib.la
+ $(top_builddir)/parquet-glib/libparquet-glib.la \
+ $(top_builddir)/arrow-glib/libarrow-glib.la
include $(top_srcdir)/gtk-doc.make
diff --git a/c_glib/doc/parquet-glib/meson.build b/c_glib/doc/parquet-glib/meson.build
index 7f6f8ab..e6e2b01 100644
--- a/c_glib/doc/parquet-glib/meson.build
+++ b/c_glib/doc/parquet-glib/meson.build
@@ -54,6 +54,7 @@ source_directories = [
]
dependencies = [
parquet_glib,
+ arrow_glib,
]
ignore_headers = []
gnome.gtkdoc(project_name,
diff --git a/dev/release/rat_exclude_files.txt b/dev/release/rat_exclude_files.txt
index 2948b01..7afbd0d 100644
--- a/dev/release/rat_exclude_files.txt
+++ b/dev/release/rat_exclude_files.txt
@@ -46,6 +46,7 @@ dev/release/rat_exclude_files.txt
dev/tasks/linux-packages/debian.ubuntu-trusty/compat
dev/tasks/linux-packages/debian.ubuntu-trusty/control
dev/tasks/linux-packages/debian.ubuntu-trusty/gir1.2-arrow-1.0.install
+dev/tasks/linux-packages/debian.ubuntu-trusty/gir1.2-parquet-1.0.install
dev/tasks/linux-packages/debian.ubuntu-trusty/libarrow-dev.install
dev/tasks/linux-packages/debian.ubuntu-trusty/libarrow-glib-dev.install
dev/tasks/linux-packages/debian.ubuntu-trusty/libarrow-glib-doc.doc-base
@@ -55,6 +56,11 @@ dev/tasks/linux-packages/debian.ubuntu-trusty/libarrow-glib11.install
dev/tasks/linux-packages/debian.ubuntu-trusty/libarrow-python11.install
dev/tasks/linux-packages/debian.ubuntu-trusty/libarrow11.install
dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-dev.install
+dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib-dev.install
+dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib-doc.doc-base
+dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib-doc.install
+dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib-doc.links
+dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib11.install
dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet11.install
dev/tasks/linux-packages/debian.ubuntu-trusty/patches/series
dev/tasks/linux-packages/debian.ubuntu-trusty/rules
@@ -64,6 +70,7 @@ dev/tasks/linux-packages/debian/compat
dev/tasks/linux-packages/debian/control
dev/tasks/linux-packages/debian/gir1.2-arrow-1.0.install
dev/tasks/linux-packages/debian/gir1.2-arrow-gpu-1.0.install
+dev/tasks/linux-packages/debian/gir1.2-parquet-1.0.install
dev/tasks/linux-packages/debian/libarrow-dev.install
dev/tasks/linux-packages/debian/libarrow-glib-dev.install
dev/tasks/linux-packages/debian/libarrow-glib-doc.doc-base
@@ -78,6 +85,11 @@ dev/tasks/linux-packages/debian/libarrow-python-dev.install
dev/tasks/linux-packages/debian/libarrow-python11.install
dev/tasks/linux-packages/debian/libarrow11.install
dev/tasks/linux-packages/debian/libparquet-dev.install
+dev/tasks/linux-packages/debian/libparquet-glib-dev.install
+dev/tasks/linux-packages/debian/libparquet-glib-doc.doc-base
+dev/tasks/linux-packages/debian/libparquet-glib-doc.install
+dev/tasks/linux-packages/debian/libparquet-glib-doc.links
+dev/tasks/linux-packages/debian/libparquet-glib11.install
dev/tasks/linux-packages/debian/libparquet11.install
dev/tasks/linux-packages/debian/patches/series
dev/tasks/linux-packages/debian/rules
diff --git a/dev/tasks/linux-packages/debian.ubuntu-trusty/control b/dev/tasks/linux-packages/debian.ubuntu-trusty/control
index c4b16ac..69e194f 100644
--- a/dev/tasks/linux-packages/debian.ubuntu-trusty/control
+++ b/dev/tasks/linux-packages/debian.ubuntu-trusty/control
@@ -54,7 +54,7 @@ Depends:
${shlibs:Depends}
Description: Apache Parquet is a columnar storage format
.
- This package provides library files to process Apache Parquet format.
+ This package provides C++ library files to process Apache Parquet format.
Package: libparquet-dev
Section: libdevel
@@ -66,7 +66,7 @@ Depends:
libparquet11 (= ${binary:Version})
Description: Apache Parquet is a columnar storage format
.
- This package provides header files.
+ This package provides C++ header files.
Package: libarrow-glib11
Section: libs
@@ -117,3 +117,54 @@ Recommends: libglib2.0-doc
Description: Apache Arrow is a data processing library for analysis
.
This package provides documentations.
+
+Package: libparquet-glib11
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ libarrow-glib11 (= ${binary:Version}),
+ libparquet11 (= ${binary:Version})
+Description: Apache Parquet is a columnar storage format
+ .
+ This package provides GLib based library files.
+
+Package: gir1.2-parquet-1.0
+Section: introspection
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${gir:Depends},
+ ${misc:Depends}
+Description: Apache Parquet is a columnar storage format
+ .
+ This package provides GObject Introspection typelib files.
+
+Package: libparquet-glib-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+ libarrow-glib-dev (= ${binary:Version}),
+ libparquet-dev (= ${binary:Version}),
+ libparquet-glib11 (= ${binary:Version}),
+ gir1.2-parquet-1.0 (= ${binary:Version})
+Suggests: libparquet-glib-doc
+Description: Apache Parquet is a columnar storage format
+ .
+ This package provides GLib based header files.
+
+Package: libparquet-glib-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends:
+ ${misc:Depends}
+Recommends: libglib2.0-doc
+Description: Apache Parquet is a columnar storage format
+ .
+ This package provides documentations.
diff --git a/dev/tasks/linux-packages/debian.ubuntu-trusty/gir1.2-arrow-1.0.install b/dev/tasks/linux-packages/debian.ubuntu-trusty/gir1.2-arrow-1.0.install
index c395f7a..97cc14e 100644
--- a/dev/tasks/linux-packages/debian.ubuntu-trusty/gir1.2-arrow-1.0.install
+++ b/dev/tasks/linux-packages/debian.ubuntu-trusty/gir1.2-arrow-1.0.install
@@ -1 +1 @@
-usr/lib/girepository-1.0/
+usr/lib/girepository-1.0/Arrow-1.0.typelib
diff --git a/dev/tasks/linux-packages/debian.ubuntu-trusty/gir1.2-parquet-1.0.install b/dev/tasks/linux-packages/debian.ubuntu-trusty/gir1.2-parquet-1.0.install
new file mode 100644
index 0000000..e12f74b
--- /dev/null
+++ b/dev/tasks/linux-packages/debian.ubuntu-trusty/gir1.2-parquet-1.0.install
@@ -0,0 +1 @@
+usr/lib/girepository-1.0/Parquet-1.0.typelib
diff --git a/dev/tasks/linux-packages/debian.ubuntu-trusty/libarrow-glib-dev.install b/dev/tasks/linux-packages/debian.ubuntu-trusty/libarrow-glib-dev.install
index 827e4cf..e59a1f9 100644
--- a/dev/tasks/linux-packages/debian.ubuntu-trusty/libarrow-glib-dev.install
+++ b/dev/tasks/linux-packages/debian.ubuntu-trusty/libarrow-glib-dev.install
@@ -2,5 +2,5 @@ usr/include/arrow-glib/
usr/lib/*/libarrow-glib.a
usr/lib/*/libarrow-glib.so
usr/lib/*/pkgconfig/arrow-glib.pc
-usr/share/gir-1.0/
+usr/share/gir-1.0/Arrow-1.0.gir
usr/share/arrow-glib/example/
diff --git a/dev/tasks/linux-packages/debian.ubuntu-trusty/libarrow-glib-doc.doc-base b/dev/tasks/linux-packages/debian.ubuntu-trusty/libarrow-glib-doc.doc-base
index 42bcf3e..4f0c5ac 100644
--- a/dev/tasks/linux-packages/debian.ubuntu-trusty/libarrow-glib-doc.doc-base
+++ b/dev/tasks/linux-packages/debian.ubuntu-trusty/libarrow-glib-doc.doc-base
@@ -1,7 +1,7 @@
Document: arrow-glib
-Title: arrow-glib Reference Manual
-Author: Kouhei Sutou
-Abstract: Apache Arrow is a data processing library for analysis.
+Title: Apache Arrow GLib Reference Manual
+Author: The Apache Software Foundation
+Abstract: Apache Arrow GLib is a data processing library for analysis that uses GLib.
Section: Programming
Format: HTML
diff --git a/dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib-dev.install b/dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib-dev.install
new file mode 100644
index 0000000..a8f1802
--- /dev/null
+++ b/dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib-dev.install
@@ -0,0 +1,5 @@
+usr/include/parquet-glib/
+usr/lib/*/libparquet-glib.a
+usr/lib/*/libparquet-glib.so
+usr/lib/*/pkgconfig/parquet-glib.pc
+usr/share/gir-1.0/Parquet-1.0.gir
diff --git a/dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib-doc.doc-base b/dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib-doc.doc-base
new file mode 100644
index 0000000..2a4616a
--- /dev/null
+++ b/dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib-doc.doc-base
@@ -0,0 +1,9 @@
+Document: parquet-glib
+Title: Apache Parquet GLib Reference Manual
+Author: The Apache Software Foundation
+Abstract: Apache Parquet GLib is a columnar storage format processing library that uses GLib.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libarrow-glib-doc/parquet-glib/index.html
+Files: /usr/share/doc/libarrow-glib-doc/parquet-glib/*.html
diff --git a/dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib-doc.install b/dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib-doc.install
new file mode 100644
index 0000000..3b27b5e
--- /dev/null
+++ b/dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib-doc.install
@@ -0,0 +1 @@
+usr/share/doc/libarrow-glib-doc/parquet-glib/
diff --git a/dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib-doc.links b/dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib-doc.links
new file mode 100644
index 0000000..3f84e47
--- /dev/null
+++ b/dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib-doc.links
@@ -0,0 +1,3 @@
+usr/share/doc/libglib2.0-doc/glib usr/share/doc/libparquet-glib-doc/glib
+usr/share/doc/libglib2.0-doc/gobject usr/share/doc/libparquet-glib-doc/gobject
+usr/share/doc/libarrow-glib-doc/parquet-glib usr/share/gtk-doc/html/parquet-glib
diff --git a/dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib11.install b/dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib11.install
new file mode 100644
index 0000000..1c0e441
--- /dev/null
+++ b/dev/tasks/linux-packages/debian.ubuntu-trusty/libparquet-glib11.install
@@ -0,0 +1 @@
+usr/lib/*/libparquet-glib.so.*
diff --git a/dev/tasks/linux-packages/debian/control b/dev/tasks/linux-packages/debian/control
index 4391e1c..49c6e28 100644
--- a/dev/tasks/linux-packages/debian/control
+++ b/dev/tasks/linux-packages/debian/control
@@ -113,7 +113,7 @@ Depends:
${shlibs:Depends}
Description: Apache Parquet is a columnar storage format
.
- This package provides library files to process Apache Parquet format.
+ This package provides C++ library files to process Apache Parquet format.
Package: libparquet-dev
Section: libdevel
@@ -125,7 +125,7 @@ Depends:
libparquet11 (= ${binary:Version})
Description: Apache Parquet is a columnar storage format
.
- This package provides header files.
+ This package provides C++ header files.
Package: libarrow-glib11
Section: libs
@@ -216,3 +216,54 @@ Depends:
Description: Apache Arrow is a data processing library for analysis
.
This package provides header files for GPU support.
+
+Package: libparquet-glib11
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ libarrow-glib11 (= ${binary:Version}),
+ libparquet11 (= ${binary:Version})
+Description: Apache Parquet is a columnar storage format
+ .
+ This package provides GLib based library files.
+
+Package: gir1.2-parquet-1.0
+Section: introspection
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${gir:Depends},
+ ${misc:Depends}
+Description: Apache Parquet is a columnar storage format
+ .
+ This package provides GObject Introspection typelib files.
+
+Package: libparquet-glib-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+ libarrow-glib-dev (= ${binary:Version}),
+ libparquet-dev (= ${binary:Version}),
+ libparquet-glib11 (= ${binary:Version}),
+ gir1.2-parquet-1.0 (= ${binary:Version})
+Suggests: libparquet-glib-doc
+Description: Apache Parquet is a columnar storage format
+ .
+ This package provides GLib based header files.
+
+Package: libparquet-glib-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends:
+ ${misc:Depends}
+Recommends: libglib2.0-doc
+Description: Apache Parquet is a columnar storage format
+ .
+ This package provides documentations.
diff --git a/dev/tasks/linux-packages/debian/gir1.2-parquet-1.0.install b/dev/tasks/linux-packages/debian/gir1.2-parquet-1.0.install
new file mode 100644
index 0000000..13fde66
--- /dev/null
+++ b/dev/tasks/linux-packages/debian/gir1.2-parquet-1.0.install
@@ -0,0 +1 @@
+usr/lib/*/girepository-1.0/Parquet-1.0.typelib
diff --git a/dev/tasks/linux-packages/debian/libarrow-glib-doc.doc-base b/dev/tasks/linux-packages/debian/libarrow-glib-doc.doc-base
index 42bcf3e..4f0c5ac 100644
--- a/dev/tasks/linux-packages/debian/libarrow-glib-doc.doc-base
+++ b/dev/tasks/linux-packages/debian/libarrow-glib-doc.doc-base
@@ -1,7 +1,7 @@
Document: arrow-glib
-Title: arrow-glib Reference Manual
-Author: Kouhei Sutou
-Abstract: Apache Arrow is a data processing library for analysis.
+Title: Apache Arrow GLib Reference Manual
+Author: The Apache Software Foundation
+Abstract: Apache Arrow GLib is a data processing library for analysis that uses GLib.
Section: Programming
Format: HTML
diff --git a/dev/tasks/linux-packages/debian/libparquet-glib-dev.install b/dev/tasks/linux-packages/debian/libparquet-glib-dev.install
new file mode 100644
index 0000000..a8f1802
--- /dev/null
+++ b/dev/tasks/linux-packages/debian/libparquet-glib-dev.install
@@ -0,0 +1,5 @@
+usr/include/parquet-glib/
+usr/lib/*/libparquet-glib.a
+usr/lib/*/libparquet-glib.so
+usr/lib/*/pkgconfig/parquet-glib.pc
+usr/share/gir-1.0/Parquet-1.0.gir
diff --git a/dev/tasks/linux-packages/debian/libparquet-glib-doc.doc-base b/dev/tasks/linux-packages/debian/libparquet-glib-doc.doc-base
new file mode 100644
index 0000000..2a4616a
--- /dev/null
+++ b/dev/tasks/linux-packages/debian/libparquet-glib-doc.doc-base
@@ -0,0 +1,9 @@
+Document: parquet-glib
+Title: Apache Parquet GLib Reference Manual
+Author: The Apache Software Foundation
+Abstract: Apache Parquet GLib is a columnar storage format processing library that uses GLib.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libarrow-glib-doc/parquet-glib/index.html
+Files: /usr/share/doc/libarrow-glib-doc/parquet-glib/*.html
diff --git a/dev/tasks/linux-packages/debian/libparquet-glib-doc.install b/dev/tasks/linux-packages/debian/libparquet-glib-doc.install
new file mode 100644
index 0000000..3b27b5e
--- /dev/null
+++ b/dev/tasks/linux-packages/debian/libparquet-glib-doc.install
@@ -0,0 +1 @@
+usr/share/doc/libarrow-glib-doc/parquet-glib/
diff --git a/dev/tasks/linux-packages/debian/libparquet-glib-doc.links b/dev/tasks/linux-packages/debian/libparquet-glib-doc.links
new file mode 100644
index 0000000..3f84e47
--- /dev/null
+++ b/dev/tasks/linux-packages/debian/libparquet-glib-doc.links
@@ -0,0 +1,3 @@
+usr/share/doc/libglib2.0-doc/glib usr/share/doc/libparquet-glib-doc/glib
+usr/share/doc/libglib2.0-doc/gobject usr/share/doc/libparquet-glib-doc/gobject
+usr/share/doc/libarrow-glib-doc/parquet-glib usr/share/gtk-doc/html/parquet-glib
diff --git a/dev/tasks/linux-packages/debian/libparquet-glib11.install b/dev/tasks/linux-packages/debian/libparquet-glib11.install
new file mode 100644
index 0000000..1c0e441
--- /dev/null
+++ b/dev/tasks/linux-packages/debian/libparquet-glib11.install
@@ -0,0 +1 @@
+usr/lib/*/libparquet-glib.so.*
diff --git a/dev/tasks/linux-packages/travis.linux.yml b/dev/tasks/linux-packages/travis.linux.yml
index 346353c..d76fd1c 100644
--- a/dev/tasks/linux-packages/travis.linux.yml
+++ b/dev/tasks/linux-packages/travis.linux.yml
@@ -30,29 +30,6 @@ env:
- BUILD_REF={{ arrow.head }}
- ARROW_VERSION={{ arrow.version }}
-before_install:
- - sudo apt update -y -qq
- - |
- sudo apt install -y -qq \
- autoconf-archive \
- build-essential \
- cmake \
- debhelper \
- devscripts \
- git \
- gtk-doc-tools \
- libboost-filesystem-dev \
- libboost-regex-dev \
- libboost-system-dev \
- libgirepository1.0-dev \
- libglib2.0-doc \
- libjemalloc-dev \
- lsb-release \
- nvidia-cuda-toolkit \
- pkg-config \
- python3-dev \
- python3-numpy
-
before_script:
- git clone -b {{ arrow.branch }} {{ arrow.remote }} arrow
- git -C arrow checkout {{ arrow.head }}
diff --git a/dev/tasks/linux-packages/yum/arrow.spec.in b/dev/tasks/linux-packages/yum/arrow.spec.in
index d42c39e..5a4d248 100644
--- a/dev/tasks/linux-packages/yum/arrow.spec.in
+++ b/dev/tasks/linux-packages/yum/arrow.spec.in
@@ -89,7 +89,7 @@ cd c_glib
--enable-gtk-doc
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-LD_LIBRARY_PATH=$PWD/arrow-glib/.libs/:$PWD/../cpp/build/$build_type \
+LD_LIBRARY_PATH=$PWD/arrow-glib/.libs/:$PWD/parquet-glib/.libs/:$PWD/../cpp/build/$build_type \
make %{?_smp_mflags}
cd -
%endif
@@ -175,7 +175,7 @@ Libraries and header files for Apache Arrow CPython extensions.
%if %{use_parquet}
%package -n parquet-libs
-Summary: Runtime libraries for Apache Parquet
+Summary: Runtime libraries for Apache Parquet C++
License: Apache-2.0
Requires: boost-system
Requires: boost-filesystem
@@ -192,7 +192,7 @@ This package contains the libraries for Apache Parquet
%{_libdir}/libparquet.so.*
%package -n parquet-devel
-Summary: Libraries and header files for Apache Parquet
+Summary: Libraries and header files for Apache Parquet C++
License: Apache-2.0
Requires: parquet-libs = %{version}-%{release}
Requires: zlib-devel
@@ -213,7 +213,7 @@ Libraries and header files for Apache Parquet.
%package glib-libs
Summary: Runtime libraries for Apache Arrow GLib
License: Apache-2.0
-Requires: arrow-libs = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
Requires: glib2
%description glib-libs
@@ -223,13 +223,12 @@ This package contains the libraries for Apache Arrow GLib.
%defattr(-,root,root,-)
%doc README.md LICENSE.txt NOTICE.txt
%{_libdir}/libarrow-glib.so.*
-%{_datadir}/gir-1.0/*.gir
+%{_datadir}/gir-1.0/Arrow-1.0.gir
%package glib-devel
Summary: Libraries and header files for Apache Arrow GLib
License: Apache-2.0
-Requires: arrow-devel = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
Requires: glib2-devel
Requires: gobject-introspection-devel
@@ -244,14 +243,12 @@ Libraries and header files for Apache Arrow GLib.
%{_libdir}/libarrow-glib.so
%{_libdir}/pkgconfig/arrow-glib.pc
%{_libdir}/pkgconfig/arrow-orc-glib.pc
-%{_libdir}/girepository-1.0/*.typelib
+%{_libdir}/girepository-1.0/Arrow-1.0.typelib
%{_datadir}/arrow-glib/example/
%package glib-doc
Summary: Documentation for Apache Arrow GLib
License: Apache-2.0
-Requires: arrow-devel = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
%description glib-doc
Documentation for Apache Arrow GLib.
@@ -263,6 +260,53 @@ Documentation for Apache Arrow GLib.
%{_datadir}/gtk-doc/html/arrow-glib/
%endif
+%if %{use_parquet} && %{use_glib}
+%package -n parquet-glib-libs
+Summary: Runtime libraries for Apache Parquet GLib
+License: Apache-2.0
+Requires: parquet-libs = %{version}-%{release}
+Requires: %{name}-glib-libs = %{version}-%{release}
+
+%description -n parquet-glib-libs
+This package contains the libraries for Apache Parquet GLib.
+
+%files -n parquet-glib-libs
+%defattr(-,root,root,-)
+%doc README.md LICENSE.txt NOTICE.txt
+%{_libdir}/libparquet-glib.so.*
+%{_datadir}/gir-1.0/Parquet-1.0.gir
+
+%package -n parquet-glib-devel
+Summary: Libraries and header files for Apache Parquet GLib
+License: Apache-2.0
+Requires: parquet-devel = %{version}-%{release}
+Requires: %{name}-glib-devel = %{version}-%{release}
+
+%description -n parquet-glib-devel
+Libraries and header files for Apache Parquet GLib.
+
+%files -n parquet-glib-devel
+%defattr(-,root,root,-)
+%doc README.md LICENSE.txt NOTICE.txt
+%{_includedir}/parquet-glib/
+%{_libdir}/libparquet-glib.a
+%{_libdir}/libparquet-glib.so
+%{_libdir}/pkgconfig/parquet-glib.pc
+%{_libdir}/girepository-1.0/Parquet-1.0.typelib
+
+%package -n parquet-glib-doc
+Summary: Documentation for Apache Parquet GLib
+License: Apache-2.0
+
+%description -n parquet-glib-doc
+Documentation for Apache Parquet GLib.
+
+%files -n parquet-glib-doc
+%defattr(-,root,root,-)
+%doc README.md LICENSE.txt NOTICE.txt
+%{_datadir}/gtk-doc/html/parquet-glib/
+%endif
+
%changelog
* Thu Aug 02 2018 Phillip Cloud <cp...@gmail.com> - 0.10.0-1
- New upstream release.
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 96958e3..0789eea 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -244,6 +244,7 @@ tasks:
- apache-arrow_{version}.orig.tar.gz
- gir1.2-arrow-1.0_{version}-1_amd64.deb
- gir1.2-arrow-gpu-1.0_{version}-1_amd64.deb
+ - gir1.2-parquet-1.0_{version}-1_amd64.deb
- libarrow-dev_{version}-1_amd64.deb
- libarrow-glib-dev_{version}-1_amd64.deb
- libarrow-glib-doc_{version}-1_all.deb
@@ -261,6 +262,10 @@ tasks:
- libarrow11-dbgsym_{version}-1_amd64.deb
- libarrow11_{version}-1_amd64.deb
- libparquet-dev_{version}-1_amd64.deb
+ - libparquet-glib-dev_{version}-1_amd64.deb
+ - libparquet-glib-doc_{version}-1_all.deb
+ - libparquet-glib11-dbgsym_{version}-1_amd64.deb
+ - libparquet-glib11_{version}-1_amd64.deb
- libparquet11-dbgsym_{version}-1_amd64.deb
- libparquet11_{version}-1_amd64.deb
@@ -279,12 +284,16 @@ tasks:
- apache-arrow_{version}-1.dsc
- apache-arrow_{version}.orig.tar.gz
- gir1.2-arrow-1.0_{version}-1_amd64.deb
+ - gir1.2-parquet-1.0_{version}-1_amd64.deb
- libarrow-dev_{version}-1_amd64.deb
- libarrow-glib-dev_{version}-1_amd64.deb
- libarrow-glib-doc_{version}-1_all.deb
- libarrow-glib11_{version}-1_amd64.deb
- libarrow11_{version}-1_amd64.deb
- libparquet-dev_{version}-1_amd64.deb
+ - libparquet-glib-dev_{version}-1_amd64.deb
+ - libparquet-glib-doc_{version}-1_all.deb
+ - libparquet-glib11_{version}-1_amd64.deb
- libparquet11_{version}-1_amd64.deb
ubuntu-xenial:
@@ -303,6 +312,7 @@ tasks:
- apache-arrow_{version}.orig.tar.gz
- gir1.2-arrow-1.0_{version}-1_amd64.deb
- gir1.2-arrow-gpu-1.0_{version}-1_amd64.deb
+ - gir1.2-parquet-1.0_{version}-1_amd64.deb
- libarrow-dev_{version}-1_amd64.deb
- libarrow-glib-dev_{version}-1_amd64.deb
- libarrow-glib-doc_{version}-1_all.deb
@@ -315,6 +325,9 @@ tasks:
- libarrow-python11_{version}-1_amd64.deb
- libarrow11_{version}-1_amd64.deb
- libparquet-dev_{version}-1_amd64.deb
+ - libparquet-glib-dev_{version}-1_amd64.deb
+ - libparquet-glib-doc_{version}-1_all.deb
+ - libparquet-glib11_{version}-1_amd64.deb
- libparquet11_{version}-1_amd64.deb
ubuntu-bionic:
@@ -333,6 +346,7 @@ tasks:
- apache-arrow_{version}.orig.tar.gz
- gir1.2-arrow-1.0_{version}-1_amd64.deb
- gir1.2-arrow-gpu-1.0_{version}-1_amd64.deb
+ - gir1.2-parquet-1.0_{version}-1_amd64.deb
- libarrow-dev_{version}-1_amd64.deb
- libarrow-glib-dev_{version}-1_amd64.deb
- libarrow-glib-doc_{version}-1_all.deb
@@ -345,6 +359,9 @@ tasks:
- libarrow-python11_{version}-1_amd64.deb
- libarrow11_{version}-1_amd64.deb
- libparquet-dev_{version}-1_amd64.deb
+ - libparquet-glib-dev_{version}-1_amd64.deb
+ - libparquet-glib-doc_{version}-1_all.deb
+ - libparquet-glib11_{version}-1_amd64.deb
- libparquet11_{version}-1_amd64.deb
centos-6:
@@ -380,4 +397,7 @@ tasks:
- arrow-python-devel-{version}-1.el7.x86_64.rpm
- arrow-python-libs-{version}-1.el7.x86_64.rpm
- parquet-devel-{version}-1.el7.x86_64.rpm
+ - parquet-glib-devel-{version}-1.el7.x86_64.rpm
+ - parquet-glib-doc-{version}-1.el7.x86_64.rpm
+ - parquet-glib-libs-{version}-1.el7.x86_64.rpm
- parquet-libs-{version}-1.el7.x86_64.rpm