Skip to content

Commit b3a29f5

Browse files
authored
ARROW-17409: [Packaging][RPM][GLib] *-glib-libs should have .typelib and *-glib-devel should have .gir (#13876)
The current configuration is inverted. *-glib-libs have .gir and *-glib-devel have .typelib. Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
1 parent 6e8f0e4 commit b3a29f5

2 files changed

Lines changed: 24 additions & 26 deletions

File tree

‎dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -699,8 +699,8 @@ This package contains the libraries for Apache Arrow GLib.
699699
%defattr(-,root,root,-)
700700
%doc README.md
701701
%license LICENSE.txt NOTICE.txt
702+
%{_libdir}/girepository-1.0/Arrow-*.typelib
702703
%{_libdir}/libarrow-glib.so.*
703-
%{_datadir}/gir-1.0/Arrow-1.0.gir
704704

705705
%package glib-devel
706706
Summary: Libraries and header files for Apache Arrow GLib
@@ -717,14 +717,14 @@ Libraries and header files for Apache Arrow GLib.
717717
%defattr(-,root,root,-)
718718
%doc README.md
719719
%license LICENSE.txt NOTICE.txt
720+
%{_datadir}/arrow-glib/example/
721+
%{_datadir}/gir-1.0/Arrow-*.gir
722+
%{_datadir}/vala/vapi/arrow-glib.*
720723
%{_includedir}/arrow-glib/
721724
%{_libdir}/libarrow-glib.a
722725
%{_libdir}/libarrow-glib.so
723726
%{_libdir}/pkgconfig/arrow-glib.pc
724727
%{_libdir}/pkgconfig/arrow-orc-glib.pc
725-
%{_libdir}/girepository-1.0/Arrow-1.0.typelib
726-
%{_datadir}/arrow-glib/example/
727-
%{_datadir}/vala/vapi/arrow-glib.*
728728

729729
%package glib-doc
730730
Summary: Documentation for Apache Arrow GLib
@@ -753,8 +753,8 @@ This package contains the libraries for Apache Arrow Dataset GLib.
753753
%defattr(-,root,root,-)
754754
%doc README.md
755755
%license LICENSE.txt NOTICE.txt
756+
%{_libdir}/girepository-1.0/ArrowDataset-*.typelib
756757
%{_libdir}/libarrow-dataset-glib.so.*
757-
%{_datadir}/gir-1.0/ArrowDataset-1.0.gir
758758

759759
%package dataset-glib-devel
760760
Summary: Libraries and header files for Apache Arrow Dataset GLib
@@ -770,12 +770,12 @@ Libraries and header files for Apache Arrow Dataset GLib.
770770
%defattr(-,root,root,-)
771771
%doc README.md
772772
%license LICENSE.txt NOTICE.txt
773+
%{_datadir}/gir-1.0/ArrowDataset-*.gir
774+
%{_datadir}/vala/vapi/arrow-dataset-glib.*
773775
%{_includedir}/arrow-dataset-glib/
774776
%{_libdir}/libarrow-dataset-glib.a
775777
%{_libdir}/libarrow-dataset-glib.so
776778
%{_libdir}/pkgconfig/arrow-dataset-glib.pc
777-
%{_libdir}/girepository-1.0/ArrowDataset-1.0.typelib
778-
%{_datadir}/vala/vapi/arrow-dataset-glib.*
779779

780780
%package dataset-glib-doc
781781
Summary: Documentation for Apache Arrow Dataset GLib
@@ -804,8 +804,8 @@ This package contains the libraries for Apache Arrow Flight GLib.
804804
%defattr(-,root,root,-)
805805
%doc README.md
806806
%license LICENSE.txt NOTICE.txt
807+
%{_libdir}/girepository-1.0/ArrowFlight-*.typelib
807808
%{_libdir}/libarrow-flight-glib.so.*
808-
%{_datadir}/gir-1.0/ArrowFlight-1.0.gir
809809

810810
%package flight-glib-devel
811811
Summary: Libraries and header files for Apache Arrow Flight GLib
@@ -821,12 +821,12 @@ Libraries and header files for Apache Arrow Flight GLib.
821821
%defattr(-,root,root,-)
822822
%doc README.md
823823
%license LICENSE.txt NOTICE.txt
824+
%{_datadir}/gir-1.0/ArrowFlight-*.gir
825+
%{_datadir}/vala/vapi/arrow-flight-glib.*
824826
%{_includedir}/arrow-flight-glib/
825827
%{_libdir}/libarrow-flight-glib.a
826828
%{_libdir}/libarrow-flight-glib.so
827829
%{_libdir}/pkgconfig/arrow-flight-glib.pc
828-
%{_libdir}/girepository-1.0/ArrowFlight-1.0.typelib
829-
%{_datadir}/vala/vapi/arrow-flight-glib.*
830830

831831
%package flight-glib-doc
832832
Summary: Documentation for Apache Arrow Flight GLib
@@ -854,8 +854,8 @@ This package contains the libraries for Apache Arrow Flight SQL GLib.
854854
%defattr(-,root,root,-)
855855
%doc README.md
856856
%license LICENSE.txt NOTICE.txt
857+
%{_libdir}/girepository-1.0/ArrowFlightSQL-*.typelib
857858
%{_libdir}/libarrow-flight-sql-glib.so.*
858-
%{_datadir}/gir-1.0/ArrowFlightSQL-1.0.gir
859859

860860
%package flight-sql-glib-devel
861861
Summary: Libraries and header files for Apache Arrow Flight SQL GLib
@@ -871,12 +871,12 @@ Libraries and header files for Apache Arrow Flight SQL GLib.
871871
%defattr(-,root,root,-)
872872
%doc README.md
873873
%license LICENSE.txt NOTICE.txt
874+
%{_datadir}/gir-1.0/ArrowFlightSQL-*.gir
875+
%{_datadir}/vala/vapi/arrow-flight-sql-glib.*
874876
%{_includedir}/arrow-flight-sql-glib/
875877
%{_libdir}/libarrow-flight-sql-glib.a
876878
%{_libdir}/libarrow-flight-sql-glib.so
877879
%{_libdir}/pkgconfig/arrow-flight-sql-glib.pc
878-
%{_libdir}/girepository-1.0/ArrowFlightSQL-1.0.typelib
879-
%{_datadir}/vala/vapi/arrow-flight-sql-glib.*
880880

881881
%package flight-sql-glib-doc
882882
Summary: Documentation for Apache Arrow Flight SQL GLib
@@ -906,8 +906,8 @@ This package contains the libraries for Gandiva GLib.
906906
%defattr(-,root,root,-)
907907
%doc README.md
908908
%license LICENSE.txt NOTICE.txt
909+
%{_libdir}/girepository-1.0/Gandiva-*.typelib
909910
%{_libdir}/libgandiva-glib.so.*
910-
%{_datadir}/gir-1.0/Gandiva-1.0.gir
911911

912912
%package -n gandiva-glib-devel
913913
Summary: Libraries and header files for Gandiva GLib
@@ -923,12 +923,12 @@ Libraries and header files for Gandiva GLib.
923923
%defattr(-,root,root,-)
924924
%doc README.md
925925
%license LICENSE.txt NOTICE.txt
926+
%{_datadir}/gir-1.0/Gandiva-*.gir
927+
%{_datadir}/vala/vapi/gandiva-glib.*
926928
%{_includedir}/gandiva-glib/
927929
%{_libdir}/libgandiva-glib.a
928930
%{_libdir}/libgandiva-glib.so
929931
%{_libdir}/pkgconfig/gandiva-glib.pc
930-
%{_libdir}/girepository-1.0/Gandiva-1.0.typelib
931-
%{_datadir}/vala/vapi/gandiva-glib.*
932932

933933
%package -n gandiva-glib-doc
934934
Summary: Documentation for Gandiva GLib
@@ -957,8 +957,8 @@ This package contains the libraries for Plasma GLib.
957957
%defattr(-,root,root,-)
958958
%doc README.md
959959
%license LICENSE.txt NOTICE.txt
960+
%{_libdir}/girepository-1.0/Plasma-*.typelib
960961
%{_libdir}/libplasma-glib.so.*
961-
%{_datadir}/gir-1.0/Plasma-1.0.gir
962962

963963
%package -n plasma-glib-devel
964964
Summary: Libraries and header files for Plasma GLib
@@ -974,12 +974,12 @@ Libraries and header files for Plasma GLib.
974974
%defattr(-,root,root,-)
975975
%doc README.md
976976
%license LICENSE.txt NOTICE.txt
977+
%{_datadir}/gir-1.0/Plasma-*gir
978+
%{_datadir}/vala/vapi/plasma-glib.*
977979
%{_includedir}/plasma-glib/
978980
%{_libdir}/libplasma-glib.a
979981
%{_libdir}/libplasma-glib.so
980982
%{_libdir}/pkgconfig/plasma-glib.pc
981-
%{_libdir}/girepository-1.0/Plasma-1.0.typelib
982-
%{_datadir}/vala/vapi/plasma-glib.*
983983

984984
%package -n plasma-glib-doc
985985
Summary: Documentation for Plasma GLib
@@ -1007,8 +1007,8 @@ This package contains the libraries for Apache Parquet GLib.
10071007
%defattr(-,root,root,-)
10081008
%doc README.md
10091009
%license LICENSE.txt NOTICE.txt
1010+
%{_libdir}/girepository-1.0/Parquet-*.typelib
10101011
%{_libdir}/libparquet-glib.so.*
1011-
%{_datadir}/gir-1.0/Parquet-1.0.gir
10121012

10131013
%package -n parquet-glib-devel
10141014
Summary: Libraries and header files for Apache Parquet GLib
@@ -1024,12 +1024,12 @@ Libraries and header files for Apache Parquet GLib.
10241024
%defattr(-,root,root,-)
10251025
%doc README.md
10261026
%license LICENSE.txt NOTICE.txt
1027+
%{_datadir}/gir-1.0/Parquet-*.gir
1028+
%{_datadir}/vala/vapi/parquet-glib.*
10271029
%{_includedir}/parquet-glib/
10281030
%{_libdir}/libparquet-glib.a
10291031
%{_libdir}/libparquet-glib.so
10301032
%{_libdir}/pkgconfig/parquet-glib.pc
1031-
%{_libdir}/girepository-1.0/Parquet-1.0.typelib
1032-
%{_datadir}/vala/vapi/parquet-glib.*
10331033

10341034
%package -n parquet-glib-doc
10351035
Summary: Documentation for Apache Parquet GLib

‎dev/tasks/tasks.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -762,9 +762,8 @@ tasks:
762762
- arrow-{no_rc_version}-1.[a-z0-9]+.src.rpm
763763
{% endif %}
764764
- arrow-tools-{no_rc_version}-1.[a-z0-9]+.[a-z0-9_]+.rpm
765-
- arrow-tools-debuginfo-{no_rc_version}-1.[a-z0-9]+.[a-z0-9_]+.rpm
766765
{% if not is_rhel7_based %}
767-
- arrow-tools-debugsource-{no_rc_version}-1.[a-z0-9]+.[a-z0-9_]+.rpm
766+
- arrow-tools-debuginfo-{no_rc_version}-1.[a-z0-9]+.[a-z0-9_]+.rpm
768767
{% endif %}
769768
{% if not is_rhel7_based and architecture == "amd64" %}
770769
- gandiva-devel-{no_rc_version}-1.[a-z0-9]+.[a-z0-9_]+.rpm
@@ -787,9 +786,8 @@ tasks:
787786
{% endif %}
788787
- parquet[0-9]+-libs-{no_rc_version}-1.[a-z0-9]+.[a-z0-9_]+.rpm
789788
- parquet-tools-{no_rc_version}-1.[a-z0-9]+.[a-z0-9_]+.rpm
790-
- parquet-tools-debuginfo-{no_rc_version}-1.[a-z0-9]+.[a-z0-9_]+.rpm
791789
{% if not is_rhel7_based %}
792-
- parquet-tools-debugsource-{no_rc_version}-1.[a-z0-9]+.[a-z0-9_]+.rpm
790+
- parquet-tools-debuginfo-{no_rc_version}-1.[a-z0-9]+.[a-z0-9_]+.rpm
793791
{% endif %}
794792
- plasma-devel-{no_rc_version}-1.[a-z0-9]+.[a-z0-9_]+.rpm
795793
- plasma-glib-devel-{no_rc_version}-1.[a-z0-9]+.[a-z0-9_]+.rpm

0 commit comments

Comments
 (0)