Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-project
Commits
faf35be5
Commit
faf35be5
authored
4 years ago
by
Jenkins
Browse files
Options
Downloads
Plain Diff
submodules: update nightly branch
parents
1ae25f34
81656f6e
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
client-android
+1
-1
1 addition, 1 deletion
client-android
daemon
+1
-1
1 addition, 1 deletion
daemon
packaging/rules/rhel/jami-one-click.spec
+2
-3
2 additions, 3 deletions
packaging/rules/rhel/jami-one-click.spec
packaging/rules/rhel/jami.spec
+2
-3
2 additions, 3 deletions
packaging/rules/rhel/jami.spec
with
6 additions
and
8 deletions
client-android
@
9edf291d
Subproject commit
c1158499d97b9f24843617a44402c148e6bff08e
Subproject commit
9edf291d7af735557dc3843f946600542f87f50b
This diff is collapsed.
Click to expand it.
daemon
@
baf12551
Subproject commit
381d661a7975d8d4abfc5711473ab4d77d7de371
Subproject commit
baf125519ec6ee7c22f3c4a415d4ce528f032147
This diff is collapsed.
Click to expand it.
packaging/rules/rhel/jami-one-click.spec
+
2
−
3
View file @
faf35be5
...
...
@@ -40,8 +40,7 @@ BuildRequires: libuuid-devel
BuildRequires: libXfixes-devel
BuildRequires: gnutls-devel
BuildRequires: nettle-devel
#BuildRequires: jsoncpp-devel
#BuildRequires: json-devel
BuildRequires: jsoncpp-devel
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: gtk3-devel
...
...
@@ -94,7 +93,7 @@ cd %{_builddir}/ring-project/daemon/contrib/native && \
make list && \
make fetch && \
make -j4 V=1 && \
make -j4 V=1 .ffmpeg
make -j4 V=1 .ffmpeg
.gnutls
cd %{_builddir}/ring-project/daemon && \
./autogen.sh && \
...
...
This diff is collapsed.
Click to expand it.
packaging/rules/rhel/jami.spec
+
2
−
3
View file @
faf35be5
...
...
@@ -41,8 +41,7 @@ BuildRequires: libuuid-devel
BuildRequires: libXfixes-devel
BuildRequires: gnutls-devel
BuildRequires: nettle-devel
#BuildRequires: jsoncpp-devel
#BuildRequires: json-devel
BuildRequires: jsoncpp-devel
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: gtk3-devel
...
...
@@ -113,7 +112,7 @@ cd %{_builddir}/ring-project/daemon/contrib/native && \
make list && \
make fetch && \
make -j4 V=1 && \
make -j4 V=1 .ffmpeg
make -j4 V=1 .ffmpeg
.gnutls
cd %{_builddir}/ring-project/daemon && \
./autogen.sh && \
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment