diff --git a/uefitool.spec b/uefitool.spec index a75305e..fd2d609 100644 --- a/uefitool.spec +++ b/uefitool.spec @@ -2,7 +2,7 @@ Name: uefitool Version: A68 -Release: 1 +Release: 2 Summary: UEFI firmware image viewer and editor URL: https://github.com/LongSoft/%{oname} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz @@ -11,7 +11,8 @@ Group: Development/Other Provides: %{oname} Provides: UEFIExtract Provides: UEFIFind -BuildRequires: cmake +BuildRequires: cmake >= 3.22 +BuildRequires: qmake5 BuildRequires: zip BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) @@ -19,6 +20,10 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(xext) +BuildRequires: meson +BuildRequires: ninja +BuildRequires: stdc++-devel +BuildRequires: qt515 %description %{summary} @@ -26,35 +31,45 @@ BuildRequires: pkgconfig(xext) %prep %setup -qn %{oname}-%{version} -sed -i 's/qmake/qmake-qt5/g' unixbuild.sh +#sed -i 's/qmake/qmake-qt5/g' unixbuild.sh +sed -i 's/Qt6/Qt5/' UEFITool/CMakeLists.txt %build +#export Qt5_DIR=/opt/qt5/5.15/ +%meson +%meson_build -pushd UEFIExtract -%cmake -%make -popd +#pushd UEFIExtract +#cmake +#make +#popd -pushd UEFIFind -%cmake -%make -popd +#pushd UEFIFind +#cmake +#make +#popd pushd UEFITool -%qmake_qt5 +#qmake_qt5 +%cmake %make popd %install -install -Dm0755 UEFITool/%{oname} %{buildroot}%{_bindir}/%{oname} -install -Dm0755 UEFIFind/build/UEFIFind %{buildroot}%{_bindir}/UEFIFind -install -Dm0755 UEFIExtract/build/UEFIExtract %{buildroot}%{_bindir}/UEFIExtract +%meson_install +#makeinstall -C build -pushd %{buildroot}%{_bindir} -ln -s %{oname} %{name} -popd +#install -Dm0755 UEFITool/%{oname} %{buildroot}%{_bindir}/%{oname} +#install -Dm0755 UEFIFind/build/UEFIFind %{buildroot}%{_bindir}/UEFIFind +#install -Dm0755 UEFIExtract/build/UEFIExtract %{buildroot}%{_bindir}/UEFIExtract + +#pushd %{buildroot}%{_bindir} +#ln -s %{oname} %{name} +#popd install -Dm0644 %{oname}/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop +# LD_LIBRARY_PATH=/opt/qt5/5.15/lib/;$LD_LIBRARY_PATH ./uefitool # добавить в desctop или в скрипт + # install icons pushd %{oname}/icons @@ -63,7 +78,6 @@ install -Dm0644 %{name}_"$i"x"$i".png %{buildroot}%{_iconsdir}/hicolor/"$i"x"$i" done popd - %files %doc README.md LICENSE.md %{_bindir}/*