summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmile Yvan Boutet Livoff2018-09-07 11:40:21 +0200
committerEmile Yvan Boutet Livoff2018-09-07 11:40:21 +0200
commitab1cccc880fff1f03e1e3eec9a2ce8b1740e0f42 (patch)
tree5d5d8099a3b1c51c93afdde15ec6ee0866a2cb25
parentf4e1b0322f08f0b18917470ad68240a560e87bb7 (diff)
downloadaur-ab1cccc880fff1f03e1e3eec9a2ce8b1740e0f42.tar.gz
Make sure lix-ereader (this package) doesn't conflict with the package lix
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD12
-rw-r--r--lix.desktop.patch2
3 files changed, 8 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e331beb014be..78a0510d34d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = lix-ereader
pkgdesc = A proprietary e-reader
pkgver = 1.0.19
- pkgrel = 1
+ pkgrel = 2
url = https://www.lix.com/
arch = x86_64
license = unknown
diff --git a/PKGBUILD b/PKGBUILD
index 49e49584796c..f6b9da287d7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=lix-ereader
pkgver=1.0.19
-pkgrel=1
+pkgrel=2
pkgdesc="A proprietary e-reader"
arch=('x86_64')
url='https://www.lix.com/'
@@ -24,16 +24,16 @@ prepare() {
rm -r usr/lib
# Desktop Entry
- patch -uN lix.desktop ../lix.desktop.patch || return 1
+ patch -uN lix.desktop ../lix.desktop.patch || return 1
mkdir -p usr/share/applications
- mv lix.desktop usr/share/applications
+ mv lix.desktop usr/share/applications/lix-ereader.desktop
# Move the main chunk of it into opt
- mkdir -p opt/lix
- mv usr/bin/* opt/lix
+ mkdir -p opt/lix-ereader
+ mv usr/bin/* opt/lix-ereader
# Add a symlink for the executable
- ln -s /opt/lix/lix usr/bin/lix
+ ln -s /opt/lix-ereader/lix usr/bin/lix-ereader
# Make the usr/share/icons have the world executable bit set
chmod -R a+xr usr/share/icons
diff --git a/lix.desktop.patch b/lix.desktop.patch
index ca3d31635a1c..e9c26a0d13dd 100644
--- a/lix.desktop.patch
+++ b/lix.desktop.patch
@@ -5,7 +5,7 @@
Name=Lix
Comment=Lix E-Reader for Linux
-Exec=AppRun
-+Exec=/opt/lix/lix
++Exec=/opt/lix-ereader/lix
Terminal=false
Type=Application
-Icon=lix