Don't depend on lxqt-common, use calamares icon for now

This commit is contained in:
Andrey Bondrov 2015-11-25 02:45:01 +10:00
parent 39af2c8ad6
commit 344c062941

View file

@ -43,6 +43,7 @@ Patch3: 0001-Make-sure-the-FullName-is-not-empty.patch
Patch4: 0002-do-not-use-users-group.patch
BuildRequires: cmake
BuildRequires: extra-cmake-modules
BuildRequires: imagemagick
BuildRequires: boost-devel
BuildRequires: boost-python3-devel
BuildRequires: kf5coreaddons-devel
@ -84,8 +85,6 @@ Requires: grub2
Requires: grub2-efi
%endif
Requires: lvm2
# For rosa.svg only
Requires: lxqt-common
Requires: NetworkManager
Requires: ntfs-3g
# (tpg) needed for calamares-install-setup
@ -138,6 +137,7 @@ a graphical installation program based on Qt 5.
%{_datadir}/calamares/qml/calamares/slideshow/qmldir
%{_datadir}/applications/calamares.desktop
%{_datadir}/polkit-1/actions/com.github.calamares.calamares.policy
%{_iconsdir}/hicolor/*/apps/%{name}.png
%{_sysconfdir}/calamares/*.conf
%{_sysconfdir}/calamares/modules/*.conf
%{_libdir}/calamares/*
@ -168,8 +168,8 @@ strings:
releaseNotesUrl: "http://wiki.rosalab.ru/ru/index.php/ROSA_Desktop_Fresh_R6"
images:
productLogo: "%{_iconsdir}/rosa.svg"
productIcon: "%{_iconsdir}/rosa.svg"
productLogo: "%{_datadir}/calamares/branding/default/squid.png"
productIcon: "%{_datadir}/calamares/branding/default/squid.png"
slideshow: "rosa-ads.qml"
@ -283,3 +283,9 @@ EOF
# (tpg) install adverts and slideshow
tar xf %{SOURCE100} -C %{buildroot}%{_sysconfdir}/calamares/branding/auto
# install menu icons
for N in 16 32 48 64 128 256;
do
convert src/branding/default/squid.png -scale ${N}x${N} $N.png;
install -D -m 0644 $N.png %{buildroot}%{_iconsdir}/hicolor/${N}x${N}/apps/%{name}.png
done