admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #364 from tianrenz2/fix-dist-make

Browse Source 
Add some files into the dist tarball necessary for rpm generation
This commit is contained in:
Bart Van Assche
2021-09-12 15:06:42 -07:00
committed by GitHub
parent b781b21d50 2b8905b4f9
commit d592e2e01e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@@ -15,12 +15,13 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
AM_CPPFLAGS=-I. -I$(srcdir)/include AM_CPPFLAGS=-I. -I$(srcdir)/include
AM_CFLAGS=$(WARN_CFLAGS) AM_CFLAGS=$(WARN_CFLAGS)
EXTRA_DIST = autogen.sh COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt \ EXTRA_DIST = autogen.sh COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt README.md \
packaging/RPM/libiscsi.spec.in packaging/RPM/makerpms.sh \ packaging/RPM/libiscsi.spec.in packaging/RPM/makerpms.sh \
aros/aros_compat.c aros/aros_compat.h aros/iscsi-ls.c \ aros/aros_compat.c aros/aros_compat.h aros/iscsi-ls.c \
aros/Makefile.AROS test-tool/iscsi-multipath.h \ aros/Makefile.AROS test-tool/iscsi-multipath.h \
win32/win32_compat.c win32/win32_compat.h \ win32/win32_compat.c win32/win32_compat.h \
patches/mtx-iscsi.diff patches/README patches/sg3_utils-1.32.patch patches/mtx-iscsi.diff patches/README patches/sg3_utils-1.32.patch \
lib/libiscsi.syms.in
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libiscsi.pc pkgconfig_DATA = libiscsi.pc

6
packaging/RPM/libiscsi.spec.in
View File

@@ -57,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING LICENCE-LGPL-2.1.txt README TODO %doc COPYING LICENCE-LGPL-2.1.txt README.md TODO
%{_libdir}/libiscsi.so.* %{_libdir}/libiscsi.so.*
%package utils %package utils
@@ -69,7 +69,7 @@ The libiscsi-utils package provides a set of assorted utilities to connect
to iSCSI servers without having to set up the Linux iSCSI initiator. to iSCSI servers without having to set up the Linux iSCSI initiator.
%files utils %files utils
%doc COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt README TODO %doc COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt README.md TODO
%{_bindir}/iscsi-ls %{_bindir}/iscsi-ls
%{_bindir}/iscsi-inq %{_bindir}/iscsi-inq
%{_bindir}/iscsi-perf %{_bindir}/iscsi-perf
@@ -89,7 +89,7 @@ The libiscsi-devel package includes the header files for libiscsi.
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING LICENCE-LGPL-2.1.txt README TODO %doc COPYING LICENCE-LGPL-2.1.txt README.md TODO
%{_includedir}/iscsi/iscsi.h %{_includedir}/iscsi/iscsi.h
%{_includedir}/iscsi/scsi-lowlevel.h %{_includedir}/iscsi/scsi-lowlevel.h
%{_libdir}/libiscsi.so %{_libdir}/libiscsi.so