Skip to content
This repository has been archived by the owner on Jun 27, 2019. It is now read-only.

Commit

Permalink
Add mqtt deps and roll new soletta release.
Browse files Browse the repository at this point in the history
The bogus builtins.json file will be removed from the package soon,
but we have to package it in the meanwhile.

Signed-off-by: Gustavo Lima Chaves <gustavo.lima.chaves@intel.com>
  • Loading branch information
Gustavo Lima Chaves committed Sep 17, 2015
1 parent bb02873 commit 4977d67
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
3 changes: 3 additions & 0 deletions rpm/config
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ COAP=y
OIC=y
HTTP=y
HTTP_CLIENT=y
MQTT=y

#
# Samples
Expand All @@ -223,6 +224,8 @@ COMMON_SAMPLES=n
LINUX_MICRO_INIT_SAMPLE=n
PLATFORM_SIMPLE_SAMPLE=n
UART_SAMPLE=n
MQTT_SAMPLES=n
MQTT_PUBLISH_SUBSCRIBE_SAMPLES=n
FLOW_SAMPLES=n
FLOW_FBP_GENERATOR_SAMPLES=n
FLOW_BASICS_CMDLINE_ARGS_SAMPLE=n
Expand Down
12 changes: 7 additions & 5 deletions rpm/soletta.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%define soletta_major 0
%define soletta_minor 0
%define soletta_build 1
%define soletta_release beta4
%define soletta_release beta5

%define soletta_duktape_release beta2

Expand All @@ -12,13 +12,14 @@ Release: %{soletta_release}%{?dist}
License: BSD
Group: System Environment/Libraries
URL: http://github.com/solettaproject/soletta
Source0: https://github.com/solettaproject/soletta/archive/v1_%{soletta_release}.tar.gz
Source0: https://github.com/solettaproject/soletta/archive/%{name}-1_%{soletta_release}.tar.gz
Source1: https://github.com/solettaproject/duktape-release/archive/v1_%{soletta_duktape_release}.tar.gz
Source2: config
BuildRequires: gtk3-devel
BuildRequires: libcurl-devel
BuildRequires: libicu-devel
BuildRequires: pcre-devel
BuildRequires: mosquitto-devel
BuildRequires: python3 >= 3.4
BuildRequires: python3-jsonschema

Expand Down Expand Up @@ -510,13 +511,12 @@ using %{name}, you will need to install %{name}-devel.
mv duktape-release-1_%{soletta_duktape_release}/* src/thirdparty/duktape

%build
export LIBDIR=%{_libdir}/
cp %{SOURCE2} .config
make %{?_smp_mflags}
# TODO: should we generate man pages from doxygen tags?
# make doc || :

%install
export LIBDIR=%{_libdir}/
cp %{SOURCE2} .config
make %{?_smp_mflags} DESTDIR=%{buildroot} INSTALL="install -p" CP="cp -p" install

%{?%{name}_debug_package}
Expand All @@ -541,6 +541,7 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} INSTALL="install -p" CP="cp -p" instal
%{_datadir}/gdb/auto-load/*
%{_libdir}/pkgconfig/soletta.pc
%{_datadir}/soletta/flow/schemas/node-type-genspec.schema
%{_datadir}/soletta/flow/descriptions/builtins.json
%{_datadir}/soletta/flow/descriptions/aio.json
%{_datadir}/soletta/flow/descriptions/app.json
%{_datadir}/soletta/flow/descriptions/boolean.json
Expand Down Expand Up @@ -764,6 +765,7 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} INSTALL="install -p" CP="cp -p" instal
* Thu Sep 17 2015 Gustavo Lima Chaves
- make rpmlint quiet for the generated RPMs
- make version/release strings saner
- add mqtt deps and roll new soletta release

* Wed Sep 16 2015 Gustavo Lima Chaves
- make debug package functional
Expand Down

0 comments on commit 4977d67

Please sign in to comment.