Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f330d45b7f91cf3ce7391c6dfd47089799eee302
commit f330d45b7f91cf3ce7391c6dfd47089799eee302
Author: crazy <cr...@frugalware.org>
Date: Tue Sep 12 20:19:32 2017 +0200
calamares-frugalware-3.1.4-3-x86_64
* remove desktop file we have one in fvbe ..
* pull in my fix for brfs for LUKS from my github branch
diff --git a/source/kde5-extra/calamares-frugalware/FrugalBuild
b/source/kde5-extra/calamares-frugalware/FrugalBuild
index 49c62bf..7edd788 100644
--- a/source/kde5-extra/calamares-frugalware/FrugalBuild
+++ b/source/kde5-extra/calamares-frugalware/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=calamares-frugalware
pkgver=3.1.4
-pkgrel=2
+pkgrel=3
pkgdesc="Distribution-independent installer framework"
archs=("x86_64")
groups=('kde5-extra')
@@ -13,12 +13,12 @@ _F_kde_defaults=0
Finclude kf5 github
source+=(calamares-locale.service \
calamares-locale-setup \
- calamares-frugalware.desktop \
calamares-frugalware.svg \
49-nopasswd_calamares.rules \
0001-packages-virtualbox-and-pacman-flags-workarounds.patch \
0002-workaround-vbox-with-efi.patch \
- do-not-force-any-autologin-group.patch)
+ do-not-force-any-autologin-group.patch \
+
https://github.com/abucodonosor/calamares/commit/457fa9fab88b7b0bed83ff94c4084ce1b669b94d.patch)
depends=('kpmcore>=3.1.2' 'qt5-webengine>=5.9.1' 'pyqt5-python3>=5.9'
'libboost' \
"kcoreaddons>=$_F_kf5_full" "kconfig>=$_F_kf5_full" \
"ki18n>=$_F_kf5_full" "kiconthemes>=$_F_kf5_full" \
@@ -29,12 +29,12 @@ _F_cd_path="calamares-$pkgver"
sha1sums=('500f7913f556eb60f706e865f4bf3d245b1c3cb2' \
'a496ee65a14fad4c96fe2a51d59f5769a9286411' \
'abd9098e0b3f988182a4b0f3173bffb9f0f7c215' \
- '10a6590d410507c48ed84876ff2ebd380c793034' \
'134ca1a53f3b628ba459ec450e84ea0b4f0c11f2' \
'02e4c49a4ff57712ffa94dbb79abc1dd701692c7' \
'67fead29419ba303c096a0473d23b701e321e760' \
'8ea80c581ca29a49e685c4809bac03e8c607e555' \
- '66a3cb2ffca37cd1da59d7ce747b1f33290e5f5d')
+ '66a3cb2ffca37cd1da59d7ce747b1f33290e5f5d' \
+ 'd0699563bd84792db1df64c38c03ffa912ad11f1')
## don't install stuff we never need..
## - dummy* -- no need to be installed
@@ -59,7 +59,6 @@ build() {
Frm usr/share/applications/calamares.desktop
## E is special need to Fsed in fvbe .. grmpf
- Finstall 0644 usr/share/applications/calamares-frugalware.desktop
Finstall 0644 usr/share/icons/hicolor/scalable/apps/calamares-frugalware.svg
## sudo to exec cala
diff --git
a/source/kde5-extra/calamares-frugalware/calamares-frugalware.desktop
b/source/kde5-extra/calamares-frugalware/calamares-frugalware.desktop
deleted file mode 100644
index c810739..0000000
--- a/source/kde5-extra/calamares-frugalware/calamares-frugalware.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Install FrugalWare
-GenericName=FrugalWare Installer
-Keywords=calamares;system;installer;frugalware
-TryExec=calamares
-Exec=pkexec /usr/bin/calamares -d
-Comment=Calamares â System Installer for FrugalWare
-Icon=calamares-frugalware
-Terminal=false
-StartupNotify=true
-Categories=Qt;System;
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
