Skip to content
This repository was archived by the owner on Nov 13, 2022. It is now read-only.

Commit b8eeb98

Browse files
committed
setup: drop data_files setting
Rational: pypa/pip#2874 (comment)
1 parent 7c103c0 commit b8eeb98

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

archlinux/PKGBUILD

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ check() {
3838
package() {
3939
cd "$pkgname-$pkgver"
4040
python setup.py install --root="$pkgdir"
41+
install -vDm644 -t "${pkgdir}/usr/share/pixmaps" plover/assets/plover.png
42+
install -vDm644 -t "${pkgdir}/usr/share/applications" application/plover.desktop
4143
chmod og+rX -R "$pkgdir"
4244
}
4345

linux/appimage/build.sh

+3-5
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,9 @@ python='appdir_python'
121121
# Install Plover and dependencies.
122122
bootstrap_dist "$wheel"
123123

124-
# Note: those will re-appear in their respective
125-
# locations when creating the AppImage...
126-
# ¯\_(ツ)_/¯
127-
run mv "$appdir/usr/share/applications/plover.desktop" "$appdir/plover.desktop"
128-
run mv "$appdir/usr/share/pixmaps/plover.png" "$appdir/plover.png"
124+
# Add desktop integration.
125+
run cp 'application/plover.desktop' "$appdir/plover.desktop"
126+
run cp 'plover/assets/plover.png' "$appdir/plover.png"
129127

130128
# Trim the fat.
131129
run "$python" -m utils.trim "$appdir" linux/appimage/blacklist.txt

rpm/package.spec

+2
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ env PYTHONPATH="$PWD/.deps" %{__python3} setup.py compile_catalog build_ui build
4646

4747
%install
4848
env PYTHONPATH="$PWD/.deps" %py3_install
49+
install -vDm644 -t "%{buildroot}/usr/share/pixmaps" plover/assets/plover.png
50+
install -vDm644 -t "%{buildroot}/usr/share/applications" application/plover.desktop
4951

5052
%check
5153
env PYTHONPATH="$PWD/.deps" %{__python3} setup.py test

setup.py

-4
Original file line numberDiff line numberDiff line change
@@ -467,8 +467,4 @@ def run(self):
467467
options=options,
468468
cmdclass=cmdclass,
469469
extras_require=extras_require,
470-
data_files=[
471-
('share/applications', ['application/plover.desktop']),
472-
('share/pixmaps', ['plover/assets/plover.png']),
473-
],
474470
)

0 commit comments

Comments
 (0)