intial newer version of FeelUOwn

3 files changed, 38 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 778a1bce42b2..13a0b8d67dca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,19 @@
-# Generated by mksrcinfo v8
-# Sun May 22 09:51:41 UTC 2016
 pkgbase = feeluown
-	pkgdesc = 个性化音乐服务 For Mac And Linux
-	pkgver = 9.2a
+	pkgdesc = 一个符合 Unix 哲学的跨平台的音乐播放器
+	pkgver = 2.1.1
 	pkgrel = 1
 	url = https://github.com/cosven/FeelUOwn
+	install = feeluown.install
 	arch = any
 	license = GPL3
+	depends = python-quamash>=0.5.5
+	depends = python-fuocore
+	depends = python-requests
 	depends = python-pyqt5
-	depends = qt5-webkit
-	depends = python-xlib
 	depends = qt5-multimedia
-	depends = python-requests
-	depends = python-quamash
-	depends = xdg-utils
-	depends = python-sqlalchemy
-	optdepends = vlc
-	provides = feeluown
-	conflicts = feeluown
-	source = https://github.com/cosven/FeelUOwn/archive/v9.2a.tar.gz
-	md5sums = 975d67b1f75cab38f25418cefa300fb9
+	depends = qt5-webkit
+	source = https://files.pythonhosted.org/packages/af/3d/5b7b89a00c62b20af9b548107a05b4ac27d29417bd707c6853621a4b2f14/feeluown-2.1.1.tar.gz
+	sha256sums = d1688978a02c4528fb5cdf3b308661840b0fbb487af0bd84e30a6c382ea391df
 
 pkgname = feeluown
 
diff --git a/PKGBUILD b/PKGBUILD
index fe02857b5692..8cce7fe752e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,23 @@
-# Maintainer: xgdgsc <xgdgsc at gmail dot com>
+# Maintainer: Bruce Zhang <zttt183525594@gmail.com>
 pkgname=feeluown
-_pkgname=FeelUOwn
-pkgver=9.2a
+pkgver=2.1.1
 pkgrel=1
-pkgdesc="个性化音乐服务 For Mac And Linux"
-arch=("any")
+epoch=
+pkgdesc="一个符合 Unix 哲学的跨平台的音乐播放器"
+arch=('any')
 url="https://github.com/cosven/FeelUOwn"
 license=('GPL3')
-depends=('python-pyqt5' 'qt5-webkit' 'python-xlib' 'qt5-multimedia' 'python-requests' 'python-quamash' 'xdg-utils' 'python-sqlalchemy')
-optdepends=('vlc')
-provides=("feeluown")
-conflicts=("feeluown")
-source=("https://github.com/cosven/FeelUOwn/archive/v$pkgver.tar.gz")
-md5sums=('975d67b1f75cab38f25418cefa300fb9')
-_desktop="${_pkgname}.desktop"
+depends=('python-quamash>=0.5.5' 'python-fuocore' 'python-requests' 'python-pyqt5' 'qt5-multimedia' 'qt5-webkit')
+install=feeluown.install
+source=("https://files.pythonhosted.org/packages/af/3d/5b7b89a00c62b20af9b548107a05b4ac27d29417bd707c6853621a4b2f14/feeluown-${pkgver}.tar.gz")
+sha256sums=('d1688978a02c4528fb5cdf3b308661840b0fbb487af0bd84e30a6c382ea391df')
 
-prepare() {
-    cd "$srcdir/$_pkgname-$pkgver"
-    cat > ${_desktop} << EOF
-[Desktop Entry]
-Type=Application
-Name=FeelUOwn
-Comment=FeelUOwn Launcher
-Exec=${pkgname}
-Icon=/usr/share/${pkgname}/icons/FeelUOwn.png
-Categories=AudioVideo;Audio;Player;Qt;
-Terminal=false
-StartupNotify=true
-EOF
+build() {
+	cd "$pkgname-$pkgver"
+	python setup.py build
 }
 
 package() {
-    cd "$srcdir/$_pkgname-$pkgver"
-
-    python3 setup.py install --root="${pkgdir}" --optimize=1
-    echo "#!/usr/bin/env sh" > "${pkgdir}/usr/bin/feeluown"
-    echo "python -c 'from feeluown import __main__ as fu;fu.main()' \"\$@\"" >> "${pkgdir}/usr/bin/feeluown"
-
-    rm -f "${pkgdir}/usr/bin/"{'feeluown-install-dev','feeluown-genicon','feeluown-update'}
-
-    install -Dm644 './feeluown/feeluown.png' "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
-    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
-
-    install -Dm644 "${srcdir}/$_pkgname-$pkgver/${_desktop}" "${pkgdir}/usr/share/applications/${_desktop}"
+	cd "$pkgname-$pkgver"
+	python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
 }
diff --git a/feeluown.install b/feeluown.install
new file mode 100644
index 000000000000..55d20945d427
--- /dev/null
+++ b/feeluown.install
@@ -0,0 +1,15 @@
+post_install() {
+    echo "------------- 安装说明/Install Note -------------"
+    echo "安装完成后手动使用普通用户权限执行命令安装应用图标："
+    echo "Manually run the following command to setup the application icon after installation:"
+    echo "------------------------------------------------"
+    echo "feeluown-genicon"
+    echo "------------------------------------------------"
+}
+
+post_remove() {
+    echo "------------- 卸载说明/Uninstall Note -------------"
+    echo "删除用户配置请执行： rm -r $HOME/.FeelUOwn"
+    echo "删除应用启动图标请执行： rm $HOME/.local/share/applications/feeluown.desktop"
+    echo "--------------------------------------------------"
+}