Kolab Groupware OBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Difference Between Revision 6 and Kolab:Winterfell / guam

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} \
@@ -119,7 +111,7 @@
     %{buildroot}%{_sysconfdir}/%{name}/ \
     %{buildroot}%{_sbindir} \
     %{buildroot}%{_erldir}/bin/ \
-    %{buildroot}%{_erllibdir}/%{realname}-%{version}/ \
+    %{buildroot}%{_erllibdir}/ \
 %if 0%{?with_systemd}
     %{buildroot}%{_unitdir}/ \
 %else
@@ -146,9 +138,17 @@
 ln -s ../lib/%{realname}-%{version}/bin/%{binname} %{realname}
 popd
 
-cp -a _build/default/rel/%{name}/bin %{buildroot}%{_erllibdir}/%{realname}-%{version}/
-cp -a _build/default/rel/%{name}/lib/%{realname}-%{version}/ebin/ %{buildroot}%{_erllibdir}/%{realname}-%{version}/
-cp -a _build/default/rel/%{name}/releases/ %{buildroot}%{_erllibdir}/%{realname}-%{version}/
+mkdir -p %{buildroot}%{_erllibdir}/%{realname}-%{version}/bin/
+cp -av _build/default/rel/%{name}/bin/* %{buildroot}%{_erllibdir}/%{realname}-%{version}/bin/
+
+# Remove the sources
+find _build/default/rel/%{name}/lib/ -type d -name "src" -exec rm -Rf {} +
+
+# Copy over all lib dirs
+cp -av _build/default/rel/%{name}/lib/* %{buildroot}%{_erllibdir}/
+
+# Copy over the release directory as well
+cp -av _build/default/rel/%{name}/releases/ %{buildroot}%{_erllibdir}/%{realname}-%{version}/
 
 %if 0%{?plesk}
 install -m 644 -p %{SOURCE100} %{buildroot}%{_sysconfdir}/guam/sys.config
@@ -171,8 +171,18 @@
 EOF
 
 %check
-# Hopeless on -0.9
-rebar3 eunit -v || :
+
+DEBUG=1
+export DEBUG
+
+HEX_OFFLINE=true
+export HEX_OFFLINE
+
+REBAR_CACHE_DIR=cache/rebar3/
+export REBAR_CACHE_DIR
+
+./rebar3 eunit -v
+./rebar3 ct -v
 
 %postun
 %if 0%{?with_systemd}
@@ -214,7 +224,7 @@
 %config(noreplace) %{_sysconfdir}/%{name}/vm.args
 %attr(0750,root,root) %{_sbindir}/%{name}
 %{_libdir}/erlang/bin/%{realname}
-%{_libdir}/erlang/lib/%{realname}-%{version}
+%{_libdir}/erlang/lib/
 %attr(0640,root,root) %{_var}/log/%{name}/
 
 %if 0%{?with_systemd}

guam-0.9.11.tar.gz Changed