diff --git a/.abf.yml b/.abf.yml
index 6cb82c7..6812ecc 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,13 @@
 sources:
-  moneymanagerex-1.5.21.tar.gz: 0d9fbb215b8ac9ad2704823cf70395c3cb7a6a7a
+  apexcharts-2e3dcd08948d6d92517b7b9fec3aa2100ada3a57.tar.gz: c8611d73ce59d3dd6c8860c3ede8bebbdc60b881
+  cgitemplate-e43bec4c0e648a5311aaae4211834cdc085178a4.tar.gz: 3560ddb8907d98d04515d6ba400a7651f92d7ca1
+  chatnew-b9e576fffa368873caed5c5dcdeb1de99637da5f.tar.gz: b1fbfbd57cd7d643ad165ac4533a4419648da6c7
+  database-f2cc1efe4809e379e2e70134e828ec058e3843f6.tar.gz: db20bc9146ecb26aeb138ceb2e67ea1d380ad122
+  fmt-b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9.tar.gz: 120cf07f7ce977c6fabebe71236a00ae2e25430c
+  general-reports-ac8a201a0bc3803ee03bbede032556a4af42b6b8.tar.gz: fdf11e97b518baa2e8728953bd990160eb0f7562
+  lua-d71a548685eb3ac5ea598d6a9e7481389c558808.tar.gz: 1818aadb266e494037f6ffd579cd2236558c4463
+  luaglue-ccffa36799596cc2e9a179fe18d2bf6ce07ff09a.tar.gz: f4643b04fddbc17e1b66122b42dbbe9c8aaa6fd8
+  moneymanagerex-1.6.2.tar.gz: 0e12b13c6b3d94d9368f02e9cc76e0162253c6bb
+  rapidjson-8f4c021fa2f1e001d2376095928fc0532adf2ae6.tar.gz: e195ae52335e7f814ed133958e26463a68f686c8
+  themes-eb904e3b65a49f00cc9aa5124be2759c56cbab6f.tar.gz: b1cbf77377e36b8db6a26153184249ad10dd0e14
+  wxsqlite3-7bbd8a15f9fc0fdb81e3421a0fab90a63a6f0461.tar.gz: 24e94dc1df21f1468ba131b645848cbd085b43e4
diff --git a/moneymanagerex.spec b/moneymanagerex.spec
index 61613ce..7135393 100644
--- a/moneymanagerex.spec
+++ b/moneymanagerex.spec
@@ -1,18 +1,43 @@
-%global oname mmex
+%global     oname               mmex
+%define     database_commit     f2cc1efe4809e379e2e70134e828ec058e3843f6
+%define     gr_commit           ac8a201a0bc3803ee03bbede032556a4af42b6b8
+%define     themes_commit       eb904e3b65a49f00cc9aa5124be2759c56cbab6f
+%define     chatnew_commit      b9e576fffa368873caed5c5dcdeb1de99637da5f
+%define     luaglue_commit      ccffa36799596cc2e9a179fe18d2bf6ce07ff09a
+%define     apexcharts_commit   2e3dcd08948d6d92517b7b9fec3aa2100ada3a57
+%define     cgitemplate_commit  e43bec4c0e648a5311aaae4211834cdc085178a4
+%define     fmt_commit          b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9
+%define     lua_commit          d71a548685eb3ac5ea598d6a9e7481389c558808
+%define     rapidjson_commit    8f4c021fa2f1e001d2376095928fc0532adf2ae6
+%define     wxsqlite3_commit    7bbd8a15f9fc0fdb81e3421a0fab90a63a6f0461
+
 
 Summary:	Easy-to-use personal finance software
 Name:		moneymanagerex
-Version:	1.5.21
+Version:	1.6.2
 Release:	1
 License:	GPLv2+
 Group:		Office
-Url:		http://www.moneymanagerex.org
+URL:		https://www.moneymanagerex.org
 # git clone --recursive -b v{version} --single-branch https://github.com/moneymanagerex/moneymanagerex
 # repack and make tar.gz
-Source0:	moneymanagerex-%{version}.tar.gz
-BuildRequires:	git
+Source0:	https://github.com/moneymanagerex/moneymanagerex/archive/v%{version}/%{name}-%{version}.tar.gz
+Source1:    https://github.com/moneymanagerex/database/archive/%{database_commit}/database-%{database_commit}.tar.gz
+Source2:    https://github.com/moneymanagerex/general-reports/archive/%{gr_commit}/general-reports-%{gr_commit}.tar.gz
+Source3:    https://github.com/moneymanagerex/themes/archive/%{themes_commit}/themes-%{themes_commit}.tar.gz
+Source4:    https://github.com/FVANCOP/ChartNew.js/archive/%{chatnew_commit}/chatnew-%{chatnew_commit}.tar.gz
+Source5:    https://github.com/moneymanagerex/LuaGlue/archive/%{luaglue_commit}/luaglue-%{luaglue_commit}.tar.gz
+Source6:    https://github.com/apexcharts/apexcharts.js/archive/%{apexcharts_commit}/apexcharts-%{apexcharts_commit}.tar.gz
+Source7:    https://github.com/moneymanagerex/html-template/archive/%{cgitemplate_commit}/cgitemplate-%{cgitemplate_commit}.tar.gz
+Source8:    https://github.com/fmtlib/fmt/archive/%{fmt_commit}/fmt-%{fmt_commit}.tar.gz
+Source9:    https://github.com/lua/lua/archive/%{lua_commit}/lua-%{lua_commit}.tar.gz
+Source10:   https://github.com/Tencent/rapidjson/archive/%{rapidjson_commit}/rapidjson-%{rapidjson_commit}.tar.gz
+Source11:   https://github.com/utelle/wxsqlite3/archive/%{wxsqlite3_commit}/wxsqlite3-%{wxsqlite3_commit}.tar.gz
+BuildRequires:	git-core
 BuildRequires:	cmake
-BuildRequires:	wxgtku3.1-devel
+BuildRequires:  clang
+BuildRequires:  ccache
+BuildRequires:	wxgtku3.1-devel >= 3.1.6
 BuildRequires:	lua-devel
 BuildRequires:	lsb-release
 BuildRequires:	pkgconfig(libcurl)
@@ -27,22 +52,52 @@ Money Manager includes all the basic features that 90% of users would want to
 see in a personal finance application. The design goals are to concentrate on
 simplicity and user-friendliness - something one can use everyday.
 
-%files
-%doc %{_docdir}/%{oname}
+%files 
+#-f %{oname}.lang
+%doc README.md LICENSE
 %{_bindir}/%{oname}
 %{_datadir}/applications/%{oname}.desktop
 %dir %{_datadir}/%{oname}
 %{_datadir}/%{oname}/*
 %{_iconsdir}/hicolor/*/apps/%{oname}.*
+%{_docdir}/%{oname}
 
 #----------------------------------------------------------------------------
 
 %prep
-%autosetup -p1
+%setup -q
+mkdir -p tmp
+pushd tmp
+tar -xf %{SOURCE1}
+tar -xf %{SOURCE2}
+tar -xf %{SOURCE3}
+tar -xf %{SOURCE4}
+tar -xf %{SOURCE5}
+tar -xf %{SOURCE6}
+tar -xf %{SOURCE7}
+tar -xf %{SOURCE8}
+tar -xf %{SOURCE9}
+tar -xf %{SOURCE10}
+tar -xf %{SOURCE11}
+
+mv database-%{database_commit}/* ../database
+mv general-reports-%{gr_commit}/* ../general-reports
+mv themes-%{themes_commit}/* ../themes
+mv ChartNew.js-%{chatnew_commit}/* ../3rd/ChartNew.js
+mv LuaGlue-%{luaglue_commit}/* ../3rd/LuaGlue
+mv apexcharts.js-%{apexcharts_commit}/* ../3rd/apexcharts.js
+mv html-template-%{cgitemplate_commit}/* ../3rd/cgitemplate
+mv fmt-%{fmt_commit}/* ../3rd/fmt
+mv lua-%{lua_commit}/* ../3rd/lua
+mv rapidjson-%{rapidjson_commit}/* ../3rd/rapidjson
+mv wxsqlite3-%{wxsqlite3_commit}/* ../3rd//wxsqlite3
+popd
 
 %build
-%cmake
+%cmake -DCMAKE_BUILD_TYPE=Release
 %make
 
 %install
 %makeinstall_std -C build
+
+#find_lang %{oname}
\ No newline at end of file