Kolab Groupware OBS

Changes of Revision 2

guam.spec Changed

@@ -14,6 +14,8 @@
 %endif
 
 %{!?_unitdir: %global _unitdir /usr/lib/systemd/system}
+%{!?_erldir: %global _erldir /usr/lib64/erlang/}
+%{!?_erllibdir: %global _erllibdir /usr/lib64/erlang/lib}
 
 %define lock_version() %{1}%{?_isa} = %(rpm -q --queryformat "%%{VERSION}" %{1})
 
@@ -29,7 +31,7 @@
 Source0:            guam-%{version}.tar.gz
 Source100:          plesk.sys.config
 
-Patch9991:          nodeps.patch
+#Patch9991:          nodeps.patch
 
 BuildRequires:      erlang >= 17.4
 BuildRequires:      erlang-asn1
@@ -37,18 +39,12 @@
 BuildRequires:      erlang-compiler
 BuildRequires:      erlang-crypto
 BuildRequires:      erlang-debugger
-BuildRequires:      erlang-eimap >= 0.4.0
 BuildRequires:      erlang-erts
 BuildRequires:      erlang-et
-BuildRequires:      erlang-goldrush >= 0.1.8
 BuildRequires:      erlang-kernel
-BuildRequires:      erlang-lager >= 3.1.0
-BuildRequires:      erlang-lager_syslog >= 2.0.3
 BuildRequires:      erlang-mnesia
 BuildRequires:      erlang-observer
 BuildRequires:      erlang-public_key
-BuildRequires:      erlang-rebar3 >= 3.3.2
-BuildRequires:      erlang-rpm-macros
 BuildRequires:      erlang-runtime_tools
 BuildRequires:      erlang-sasl
 BuildRequires:      erlang-snmp
@@ -56,17 +52,12 @@
 BuildRequires:      erlang-ssl
 BuildRequires:      erlang-stdlib
 BuildRequires:      erlang-syntax_tools
-BuildRequires:      erlang-syslog >= 1.0.3
 BuildRequires:      erlang-tools
 BuildRequires:      erlang-wx
 BuildRequires:      erlang-xmerl
+BuildRequires:      git
 
-Requires:           %lock_version erlang
-Requires:           %lock_version erlang-eimap
-Requires:           %lock_version erlang-goldrush
-Requires:           %lock_version erlang-lager
-Requires:           %lock_version erlang-lager_syslog
-
+Requires:           erlang
 Requires:           which
 
 %if 0%{?with_systemd}
@@ -95,8 +86,6 @@
 %prep
 %setup -q
 
-%patch9991 -p1
-
 %build
 
 DEBUG=1
@@ -105,7 +94,10 @@
 HEX_OFFLINE=true
 export HEX_OFFLINE
 
-rebar3 release \
+REBAR_CACHE_DIR=cache/rebar3/
+export REBAR_CACHE_DIR
+
+./rebar3 release \
     --dev-mode false \
     --relname %{name} \
     --relvsn %{version} \
@@ -172,7 +164,7 @@
 
 %check
 # Hopeless on -0.9
-rebar3 eunit -v || :
+#./rebar3 eunit -v || :
 
 %postun
 %if 0%{?with_systemd}

guam-0.9.11.tar.gz Changed