Skip to content
Snippets Groups Projects
Commit 548d2d46 authored by Jenkins's avatar Jenkins
Browse files

submodules: update nightly branch

parents 904d538e f9dffa3d
Branches
Tags
No related merge requests found
...@@ -125,7 +125,10 @@ $(RELEASE_TARBALL_FILENAME): tarballs.manifest ...@@ -125,7 +125,10 @@ $(RELEASE_TARBALL_FILENAME): tarballs.manifest
rm -f "$@" rm -f "$@"
mkdir $(TMPDIR)/jami-project mkdir $(TMPDIR)/jami-project
git archive HEAD | tar xf - -C $(TMPDIR)/jami-project git archive HEAD | tar xf - -C $(TMPDIR)/jami-project
for m in daemon lrc client-qt; do \ for m in \
daemon \
client-qt \
client-qt/3rdparty/SortFilterProxyModel; do \
(cd "$$m" && git archive --prefix "$$m/" HEAD \ (cd "$$m" && git archive --prefix "$$m/" HEAD \
| tar xf - -C $(TMPDIR)/jami-project); \ | tar xf - -C $(TMPDIR)/jami-project); \
done done
...@@ -138,6 +141,7 @@ $(RELEASE_TARBALL_FILENAME): tarballs.manifest ...@@ -138,6 +141,7 @@ $(RELEASE_TARBALL_FILENAME): tarballs.manifest
--files-from $< \ --files-from $< \
--transform 's,^.*/,jami-project/daemon/contrib/tarballs/,' \ --transform 's,^.*/,jami-project/daemon/contrib/tarballs/,' \
$(TAR_REPRODUCIBILITY_OPTIONS) $(TAR_REPRODUCIBILITY_OPTIONS)
# Compress the tarball and move it into place.
gzip --no-name $(TMPDIR)/jami-project.tar gzip --no-name $(TMPDIR)/jami-project.tar
mv $(TMPDIR)/jami-project.tar.gz "$@" mv $(TMPDIR)/jami-project.tar.gz "$@"
rm -rf $(TMPDIR) rm -rf $(TMPDIR)
......
client-android @ bd54250e
Subproject commit 24c832d8e9d9d89cbf21f3d3a60e6b3125091f8b Subproject commit bd54250eb86881a1849194b36f031e455b2a97cc
client-ios @ 3ea9a218
Subproject commit d5008dfdf4ac9048d841ca884e4ff19613fee3b1 Subproject commit 3ea9a21897a535a7aa7a877d1169d160dbebea0b
client-qt @ b2c7fc04
Subproject commit 730b00bd5d5c5744b460a0ff259b4629e8e07fc0 Subproject commit b2c7fc04145cae3aed572a04c69d8dc3a16b77cd
daemon @ 03f2da36
Subproject commit b16308eaf2c3ad9a68016a516f4f92bc0c57e46d Subproject commit 03f2da36746b49845c95af9067cbea3b9dc8b789
FROM opensuse/leap:15.3 FROM opensuse/leap:15.3
RUN zypper refresh
RUN zypper --non-interactive install -y \ RUN zypper --non-interactive install -y \
dnf \ dnf \
dnf-command\(builddep\) \ dnf-command\(builddep\) \
......
FROM opensuse/leap:15.4 FROM opensuse/leap:15.4
RUN zypper refresh
RUN zypper --non-interactive install -y \ RUN zypper --non-interactive install -y \
dnf \ dnf \
dnf-command\(builddep\) \ dnf-command\(builddep\) \
......
...@@ -102,7 +102,8 @@ rm -rfv %{buildroot}/%{_libdir}/*.la ...@@ -102,7 +102,8 @@ rm -rfv %{buildroot}/%{_libdir}/*.la
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/libring.so* %{_libdir}/libjami.so*
%{_libdir}/pkgconfig/jami.pc
# XXX: Use %%{_libexecdir}/jamid after there's no more OpenSUSE Leap # XXX: Use %%{_libexecdir}/jamid after there's no more OpenSUSE Leap
# < 16 (see https://en.opensuse.org/openSUSE:Specfile_guidelines). # < 16 (see https://en.opensuse.org/openSUSE:Specfile_guidelines).
/usr/libexec/jamid /usr/libexec/jamid
......
plugins @ bd75c211
Subproject commit c74ddc2d49e0e7ef4e6ccf4bca0e13c9e6e971ce Subproject commit bd75c21144aeae2f79c32337db7481eefe801d60
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment