diff --git a/.abf.yml b/.abf.yml index 882c21f..fb49b99 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,3 @@ sources: OpenMandriva-adverts.tar.xz: d0833604f1ce5bdcc7a1560cc51f4c392a9ed665 calamares-1.1.4.2.tar.gz: 32c3a6bd38a88f388d8b3c4888c48d1c3ed2f6e5 - openmandriva-install.svg: c048a90f14c7c449606e033bf148a11305fa0f70 diff --git a/calamares-0.17.0-20150112-openmandriva-desktop-file.patch b/calamares-0.17.0-20150112-openmandriva-desktop-file.patch deleted file mode 100644 index e5cc8a7..0000000 --- a/calamares-0.17.0-20150112-openmandriva-desktop-file.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur calamares-0.17.0-20150112/calamares.desktop calamares-0.17.0-20150112.tpg/calamares.desktop ---- calamares-0.17.0-20150112/calamares.desktop 2015-01-11 13:53:23.000000000 +0000 -+++ calamares-0.17.0-20150112.tpg/calamares.desktop 2015-01-12 22:20:54.938394302 +0000 -@@ -1,12 +1,11 @@ - [Desktop Entry] - Type=Application - Version=1.0 --Name=Calamares --GenericName=System Installer -+Name=Install OpenMandriva Lx - TryExec=calamares - Exec=pkexec /usr/bin/calamares --Comment=Calamares — System Installer --Icon=calamares -+Comment=OpenMandriva Lx installer -+Icon=/usr/share/icons/openmandriva-install.svg - Terminal=false - StartupNotify=false - Categories=Qt;System; diff --git a/calamares-1.1.4.2-desktop-file.patch b/calamares-1.1.4.2-desktop-file.patch new file mode 100644 index 0000000..0cf788c --- /dev/null +++ b/calamares-1.1.4.2-desktop-file.patch @@ -0,0 +1,17 @@ +diff -urN calamares-1.1.4.2/calamares.desktop calamares-1.1.4.2-patched/calamares.desktop +--- calamares-1.1.4.2/calamares.desktop 2014-11-05 03:11:57.000000000 +1000 ++++ calamares-1.1.4.2-patched/calamares.desktop 2015-10-21 00:32:05.880968415 +1000 +@@ -1,11 +1,10 @@ + [Desktop Entry] + Type=Application + Version=1.0 +-Name=Calamares +-GenericName=System Installer ++Name=Install ROSA Desktop Fresh + TryExec=calamares + Exec=pkexec /usr/bin/calamares +-Comment=Calamares — System Installer ++Comment=ROSA Desktop Fresh installer + Icon=calamares + Terminal=false + StartupNotify=false diff --git a/calamares.spec b/calamares.spec index 345e6a7..bef2c08 100644 --- a/calamares.spec +++ b/calamares.spec @@ -34,10 +34,9 @@ Source21: rosa-users.conf Source22: rosa-partition.conf Source23: rosa-removeuser.conf Source24: rosa-webview.conf -Source99: openmandriva-install.svg Source100: OpenMandriva-adverts.tar.xz Patch0: calamares-1.1.4.2-polkit-qt5.patch -Patch1: calamares-0.17.0-20150112-openmandriva-desktop-file.patch +Patch1: calamares-1.1.4.2-desktop-file.patch Patch2: calamares-libparted-detection.patch Patch3: 0001-Make-sure-the-FullName-is-not-empty.patch Patch4: 0002-do-not-use-users-group.patch @@ -143,7 +142,6 @@ a graphical installation program based on Qt 5. %ghost %{_sysconfdir}/calamares/branding/auto/branding.desc %{_sysconfdir}/calamares/branding/auto/*.qml %{_sysconfdir}/calamares/branding/auto/*.png -%{_iconsdir}/openmandriva-install.svg %post # generate the "auto" branding @@ -283,7 +281,3 @@ EOF # (tpg) install adverts and slideshow tar xf %{SOURCE100} -C %{buildroot}%{_sysconfdir}/calamares/branding/auto -# (tpg) install icon -mkdir -p %{buildroot}%{_iconsdir} -install -m 644 %{SOURCE99} %{buildroot}%{_iconsdir}/openmandriva-install.svg -