mirror of
https://abf.rosa.ru/djam/calamares.git
synced 2025-02-23 23:52:50 +00:00
get back to clang
This commit is contained in:
parent
35927c4bda
commit
a19ddc2cb0
1 changed files with 0 additions and 24 deletions
|
@ -110,9 +110,6 @@ mv -f calamares-partitionmanager-%{partdate} src/modules/partition/partitionmana
|
|||
rm -f src/modules/*/*.conf.default-settings
|
||||
|
||||
%build
|
||||
export CC=gcc
|
||||
export CXX=g++
|
||||
|
||||
%cmake_qt5 -DWITH_PARTITIONMANAGER:BOOL="ON" -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo"
|
||||
|
||||
%make
|
||||
|
@ -128,27 +125,6 @@ touch %{buildroot}%{_datadir}/calamares/branding/auto/branding.desc
|
|||
mkdir -p %{buildroot}%{_sysconfdir}/calamares/modules
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/calamares/branding
|
||||
|
||||
# workaround for install
|
||||
%ifarch x86_64
|
||||
mv -f %{buildroot}/calamares/modules/prepare/libcalamares_viewmodule_prepare.so %{buildroot}%{_datadir}/calamares/modules/prepare/
|
||||
mv -f %{buildroot}/calamares/modules/prepare/module.desc %{buildroot}%{_datadir}/calamares/modules/prepare/
|
||||
mv -f %{buildroot}/calamares/modules/unpackfs/main.py %{buildroot}%{_datadir}/calamares/modules/unpackfs/
|
||||
mv -f %{buildroot}/calamares/modules/unpackfs/module.desc %{buildroot}%{_datadir}/calamares/modules/unpackfs/
|
||||
%endif
|
||||
%ifarch i586
|
||||
mv -f %{buildroot}/calamares/modules/grubcfg/main.py %{buildroot}%{_datadir}/
|
||||
mv -f %{buildroot}/calamares/modules/grubcfg/module.desc %{buildroot}%{_datadir}/
|
||||
mv -f %{buildroot}/cmake/Calamares/CalamaresAddBrandingSubdirectory.cmake %{buildroot}%{_libdir}/cmake/Calamares/
|
||||
mv -f %{buildroot}/cmake/Calamares/CalamaresAddLibrary.cmake %{buildroot}%{_libdir}/cmake/Calamares/
|
||||
mv -f %{buildroot}/cmake/Calamares/CalamaresAddModuleSubdirectory.cmake %{buildroot}%{_libdir}/cmake/Calamares/
|
||||
mv -f %{buildroot}/cmake/Calamares/CalamaresAddPlugin.cmake %{buildroot}%{_libdir}/cmake/Calamares/
|
||||
mv -f %{buildroot}/cmake/Calamares/CalamaresConfig.cmake %{buildroot}%{_libdir}/cmake/Calamares/
|
||||
mv -f %{buildroot}/cmake/Calamares/CalamaresConfigVersion.cmake %{buildroot}%{_libdir}/cmake/Calamares/
|
||||
mv -f %{buildroot}/cmake/Calamares/CalamaresLibraryDepends-relwithdebinfo.cmake %{buildroot}%{_libdir}/cmake/Calamares/
|
||||
mv -f %{buildroot}/cmake/Calamares/CalamaresLibraryDepends.cmake %{buildroot}%{_libdir}/cmake/Calamares/
|
||||
mv -f %{buildroot}/cmake/Calamares/CalamaresUse.cmake %{buildroot}%{_libdir}/cmake/Calamares/
|
||||
%endif
|
||||
|
||||
%post
|
||||
# generate the "auto" branding
|
||||
. %{_sysconfdir}/os-release
|
||||
|
|
Loading…
Add table
Reference in a new issue