summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Kovalenko2016-11-21 13:34:55 +0300
committerIlya Kovalenko2016-11-21 13:34:55 +0300
commit75e4274ac825bfecbac109c00c728268025686e7 (patch)
treec48b097c39497b0c26d9eb723862cd14e41cfb66
parent6d533a25bf0f4a5114feb7db7ca239b7597b07ca (diff)
downloadaur-75e4274ac825.tar.gz
Change source from deb to rpm
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD28
-rw-r--r--joxi.desktop12
3 files changed, 15 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 04894040dfe..d6b70ad44fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = joxi
pkgdesc = Easy to use screenshot sharing application (Russian)
pkgver = 3.0.9
- pkgrel = 2
+ pkgrel = 3
url = http://joxi.net
arch = i686
arch = x86_64
@@ -23,12 +23,10 @@ pkgbase = joxi
depends = libcurl-compat
depends = libappindicator-gtk2
options = emptydirs
- source = http://dl.joxi.ru/linux/joxi-3.0.9_amd64.deb
+ source = http://dl.joxi.ru/linux/joxi-net_x86_64-fr.rpm
source = joxi.ld_preload.wrapper
- source = joxi.desktop
- md5sums = c461bee02f6e739c6881ac2ed28f04fa
+ md5sums = 5c2ef9b7e6b39dfb731f62ef0d146cb7
md5sums = fa1d9cf5344c0e586d1cf0784713195b
- md5sums = 35fc3adf057a6c83ab216fe76dbe5b9a
pkgname = joxi
diff --git a/PKGBUILD b/PKGBUILD
index 6faf78b3803..4795ed97e76 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=joxi
pkgver=3.0.9
-pkgrel=2
+pkgrel=3
pkgdesc="Easy to use screenshot sharing application (Russian)"
arch=('i686' 'x86_64')
url="http://joxi.net"
@@ -13,33 +13,29 @@ options=('emptydirs')
depends=('qt5-declarative' 'qt5-x11extras' 'qt5-base' 'qt5-script' 'qt5-xmlpatterns' 'qt5-multimedia' 'qt5-quick1' 'libgl' 'libx11' 'libstdc++5' 'libxdamage' 'glib2' 'gtk2' 'libmcrypt' 'libcurl-compat' 'libappindicator-gtk2')
if [ "${CARCH}" = 'x86_64' ]; then
- ARCH='amd64'
- md5sums=("c461bee02f6e739c6881ac2ed28f04fa" "fa1d9cf5344c0e586d1cf0784713195b" "35fc3adf057a6c83ab216fe76dbe5b9a")
+ md5sums=("5c2ef9b7e6b39dfb731f62ef0d146cb7" "fa1d9cf5344c0e586d1cf0784713195b")
elif [ "${CARCH}" = 'i686' ]; then
- ARCH='i386'
- md5sums=("48327f33e6b055c26d25ba40717e291b" "fa1d9cf5344c0e586d1cf0784713195b" "35fc3adf057a6c83ab216fe76dbe5b9a")
+ md5sums=("6d62ab37f316f09f3fa666379eae4696" "fa1d9cf5344c0e586d1cf0784713195b")
fi
+ARCH=${CARCH}
source=(
- "http://dl.joxi.ru/linux/${pkgname}-${pkgver}_${ARCH}.deb"
+ "http://dl.joxi.ru/linux/${pkgname}-net_${ARCH}-fr.rpm"
"joxi.ld_preload.wrapper"
- "joxi.desktop"
)
package() {
- ar -x "${srcdir}/${pkgname}-${pkgver}_${ARCH}.deb"
- tar -Jxf "${srcdir}/data.tar.xz"
- sed -i -e 's# /opt/joxi/icon_64.png#/usr/share/icons/hicolor/icon_64.png#' "${srcdir}/usr/share/applications/Joxi.desktop"
# there is no /usr/lib/joxi dir, so this config is pointless
- # install -D -m755 "${srcdir}/etc/ld.so.conf.d/${pkgname}.conf" "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
+ install -D -m755 "${srcdir}/etc/ld.so.conf.d/${pkgname}.conf" "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
- install -D -m644 "${srcdir}/opt/${pkgname}/icon_64.png" "${pkgdir}/usr/share/icons/hicolor/icon_64.png"
- install -D -m644 "${srcdir}/opt/${pkgname}/icon_light.png" "${pkgdir}/usr/share/icons/hicolor/icon_light.png"
+ install -D -m644 "${srcdir}/opt/${pkgname}/icon_64.png" "${pkgdir}/opt/joxi/icon_64.png"
+ install -D -m644 "${srcdir}/opt/${pkgname}/icon_light.png" "${pkgdir}/opt/joxi/icon_light.png"
install -D -m755 "${srcdir}/usr/bin/joxi" "${pkgdir}/opt/joxi/joxi"
+
+ install -D -m755 "${srcdir}/joxi.ld_preload.wrapper" "${pkgdir}/usr/bin/joxi"
- install -D -m755 "${srcdir}/joxi.ld_preload.wrapper" "${pkgdir}/usr/bin/joxi"
-
- install -D -m755 "${srcdir}/joxi.desktop" "${pkgdir}/usr/share/applications/Joxi.desktop"
+ install -D -m755 "${srcdir}/usr/share/applications/Joxi.desktop" "${pkgdir}/usr/share/applications/Joxi.desktop"
+ # install -D -m755 "${srcdir}/joxi.desktop" "${pkgdir}/usr/share/applications/Joxi.desktop"
}
diff --git a/joxi.desktop b/joxi.desktop
deleted file mode 100644
index 81ec3602d2c..00000000000
--- a/joxi.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Categories=Network;Application;
-Comment=joxi
-Exec=/usr/bin/joxi
-GenericName=joxi
-Name=Joxi
-X-KDE-StartupNotify=true
-MimeType=application/x-designer;
-Icon=/usr/share/icons/hicolor/icon_64.png
-Terminal=false
-Type=Application
-Version=0.1