summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHellogain2020-07-08 13:01:37 +0200
committerHellogain2020-07-08 13:01:37 +0200
commit5b199a1022e70d557c99dd0fee1c0f4843634e94 (patch)
treee6b02cee050e9833c032d42eadca9dc028a08170
parent5abdbf16c599a72a51853f0811db681f8ac9e9bd (diff)
downloadaur-5b199a1022e70d557c99dd0fee1c0f4843634e94.tar.gz
Bump to 2.1.0.e-2
Fixing permissions from previous pkgrel Adding install script to help with incompatible libraries (See: https://www.fakturama.info/community/postid/15198/ ) Added second desktop file for clean mode (i.e. -clean flag)
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD15
-rw-r--r--fakturama.install18
-rw-r--r--fakturama2-clean.desktop11
4 files changed, 38 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5f11fd7b156..1b2acb6239d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,19 @@
pkgbase = fakturama
pkgdesc = Creates invoices with ZUGFeRD support
pkgver = 2.1.0.e
- pkgrel = 2
+ pkgrel = 3
url = https://www.fakturama.info
+ install = fakturama.install
arch = x86_64
license = EPL
depends = java-runtime=8
depends = webkit2gtk
source = fakturama-2.1.0.e.tar.gz::https://files.fakturama.info/release/v2.1.0/Installer_Fakturama_linux_x64_2.1.0e.tar.gz
source = fakturama2.desktop
+ source = fakturama2-clean.desktop
sha256sums = f930260f04dec2aae3e347c1007e636b64f5504c1f84dced6d4814575af34519
sha256sums = 550964ece2b39f76e4985ecc2203fee63f57ef669d8b1ae170d80b3cfa5cb54c
+ sha256sums = 96ac2d3815e37f993ea92c0598c5b4350d69e57f0c415bde7dafbecfe1e4e407
pkgname = fakturama
diff --git a/PKGBUILD b/PKGBUILD
index 5d2773e40e5..73c467a84df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=fakturama
pkgver=2.1.0.e
-pkgrel=2
+pkgrel=3
pkgdesc="Creates invoices with ZUGFeRD support"
arch=('x86_64')
url="https://www.fakturama.info"
@@ -20,17 +20,19 @@ conflicts=()
replaces=()
backup=()
options=()
-install=
+install=$pkgname.install
changelog=
source=(
# "$pkgname-$pkgver.tar.gz::https://bitbucket.org/fakturamadev/fakturama-2/downloads/Installer_Fakturama_linux_x64_${pkgver}.tar.gz"
"$pkgname-$pkgver.tar.gz::https://files.fakturama.info/release/v2.1.0/Installer_Fakturama_linux_x64_2.1.0e.tar.gz"
"fakturama2.desktop"
+ "fakturama2-clean.desktop" # version with "-clean" flag
)
noextract=()
sha256sums=(
"f930260f04dec2aae3e347c1007e636b64f5504c1f84dced6d4814575af34519"
"550964ece2b39f76e4985ecc2203fee63f57ef669d8b1ae170d80b3cfa5cb54c"
+ "96ac2d3815e37f993ea92c0598c5b4350d69e57f0c415bde7dafbecfe1e4e407"
)
prepare() {
@@ -52,7 +54,6 @@ package() {
# Create entry under _main_application
install -m 755 -d "$_main_application"
- chmod u+w,g+w,o+w -R "$_main_application"
# Copy all needed files
cp -r "$srcdir/artifacts.xml" "$_main_application"
@@ -63,14 +64,8 @@ package() {
cp -r "$srcdir/p2" "$_main_application"
cp -r "$srcdir/plugins" "$_main_application"
- # special folder that needs special permissions
- chmod u+w,g+w,o+w -R "$_main_application/configuration"
- chmod u+w,g+w,o+w -R "$_main_application/features"
- chmod u+w,g+w,o+w -R "$_main_application/plugins"
- chmod u+w,g+w,o+w -R "$_main_application/p2"
-
-
# Copy other files
install -Dm 644 "$srcdir/icon.xpm" "$pkgdir/usr/share/pixmaps/fakturama2.xpm"
install -Dm 644 "$srcdir/fakturama2.desktop" "$pkgdir/usr/share/applications/fakturama2.desktop"
+ install -Dm 644 "$srcdir/fakturama2-clean.desktop" "$pkgdir/usr/share/applications/fakturama2-clean.desktop"
}
diff --git a/fakturama.install b/fakturama.install
new file mode 100644
index 00000000000..09469cc8450
--- /dev/null
+++ b/fakturama.install
@@ -0,0 +1,18 @@
+## arg 1: the new package version
+## arg 2: the old package version
+pre_upgrade() {
+ # Cleanup features and plugins as mentioned here:
+ # https://www.fakturama.info/community/postid/15198/
+ echo "Removing old files that were created by a prior fakturama installation"
+ rm -rf usr/share/fakturama2/features
+ rm -rf usr/share/fakturama2/plugins
+
+ echo "You are upgrading from $2 to $1"
+ if [ $2 == "2.1.0.e-2" ]
+ then
+ # Cleanup permission mess from 2.1.0.e-2
+ echo " --> fix permissions from $2"
+ rm -rf usr/share/fakturama2/*
+ chmod 755 usr/share/fakturama2
+ fi
+}
diff --git a/fakturama2-clean.desktop b/fakturama2-clean.desktop
new file mode 100644
index 00000000000..ce5007bbe6e
--- /dev/null
+++ b/fakturama2-clean.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Fakturama2 (clean start)
+Name[de]=Fakturama2 ("clean"-Start)
+Comment=Invoicing Software - http://www.fakturama.info
+Comment[de]=Programm - http://www.fakturama.info
+Exec=/usr/share/fakturama2/Fakturama -clean
+Icon=fakturama2.xpm
+Terminal=false
+Type=Application
+Categories=Office;
+StartupNotify=false