diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..4d6e36d --- /dev/null +++ b/build.sh @@ -0,0 +1,47 @@ +engine="docker exec -w $(pwd) --user mersdk aurora-os-build-engine" +targets=`${engine} sb2-config -l|grep -v default` +version=`grep -E "Version" $(pwd)/rpm/harbour-fernschreiber.spec|sed "s/Version: \+//g"` +release=`grep -E "Release:" $(pwd)/rpm/harbour-fernschreiber.spec|sed "s/Release: \+//g"` + +for each in key cert; do + if [ -f `pwd`/regular_${each}.pem ]; then + echo "Found a regular_${each}.pem file: OK" + continue; + fi + echo -n "Downloading regular_${each}.pem for singing RPM for AuroraOS: " + curl https://community.omprussia.ru/documentation/files/doc/regular_${each}.pem -o regular_${each}.pem &> /dev/null + if [ $? -eq 0 ]; then + echo "OK" + else + echo "FAIL" + echo "Cant download regular_${each}.pem: https://community.omprussia.ru/documentation/files/doc/regular_${each}.pem" + exit 1 + fi +done + +for target in ${targets}; do + echo "Build for ${target}" + arch=${target##*-} + echo "Detected arch: ${arch}" + ${engine} mb2 -t ${target} build + [ $? -ne 0 ] && exit 1 + package_name="harbour-fernschreiber-${version}-${release}.${arch}.rpm" + echo -n "Signing RPM ${package_name}: " + temp_output="$(${engine} sb2 -t ${target} rpmsign-external sign --key `pwd`/regular_key.pem --cert `pwd`/regular_cert.pem `pwd`/RPMS/${package_name} 2>&1)" + if [ $? -ne 0 ]; then + echo "FAIL" + echo "${temp_output}" + exit 1 + else + echo "OK" + fi + echo -n "Validate RPM ${package_name}: " + temp_output="$( ${engine} sb2 -t ${target} rpm-validator -p regular `pwd`/RPMS/${package_name} 2>&1 )" + if [ $? -ne 0 ]; then + echo "FAIL" + echo "${temp_output}" + exit 1 + else + echo "OK" + fi +done \ No newline at end of file diff --git a/harbour-fernschreiber.desktop b/harbour-fernschreiber.desktop index b7d9200..30810c6 100644 --- a/harbour-fernschreiber.desktop +++ b/harbour-fernschreiber.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -X-Nemo-Application-Type=generic +X-Nemo-Application-Type=silica-qt5 Icon=harbour-fernschreiber Exec=harbour-fernschreiber Name=Fernschreiber diff --git a/rpm/harbour-fernschreiber.spec b/rpm/harbour-fernschreiber.spec index 4bd4a03..b286114 100644 --- a/rpm/harbour-fernschreiber.spec +++ b/rpm/harbour-fernschreiber.spec @@ -7,7 +7,7 @@ Name: harbour-fernschreiber # >> macros %define __provides_exclude_from ^%{_datadir}/.*$ -%define __requires_exclude ^libtdjson.*$ +%define __requires_exclude ^lib(tdjson|ssl|crypto).*$ # << macros Summary: Fernschreiber is a Telegram client for Sailfish OS @@ -57,8 +57,8 @@ make %{?_smp_mflags} rm -rf %{buildroot} # >> install pre # << install pre -%qmake5_install - +# %qmake5_install +make INSTALL_ROOT=%{buildroot} install # >> install post # << install post @@ -68,9 +68,13 @@ desktop-file-install --delete-original \ %files %defattr(-,root,root,-) -%{_bindir} -%{_datadir}/%{name} +%attr(755,root,root) %{_bindir}/%{name} +%attr(655,root,root) %{_datadir}/%{name}/qml +%{_datadir}/%{name}/lib +%attr(655,root,root) %{_datadir}/%{name}/images +%attr(655,root,root) %{_datadir}/%{name}/db +%attr(655,root,root) %{_datadir}/%{name}/translations %{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.png +%attr(644,root,root) %{_datadir}/icons/hicolor/*/apps/%{name}.png # >> files # << files