setup: drop data_files setting

benoit-pierre · benoit-pierre · commit 31ee212d8fcc · 2017-05-25T18:17:06.000+02:00
Rational: pypa/pip#2874 (comment)
diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
@@ -38,6 +38,8 @@ check() {
 package() {
   cd "$pkgname-$pkgver"
   python setup.py install --root="$pkgdir"
+  install -vDm644 -t "${pkgdir}/usr/share/pixmaps" plover/assets/plover.png
+  install -vDm644 -t "${pkgdir}/usr/share/applications" application/plover.desktop
   chmod og+rX -R "$pkgdir"
 }
 
diff --git a/rpm/package.spec b/rpm/package.spec
@@ -46,6 +46,8 @@ env PYTHONPATH="$PWD/.deps" %{__python3} setup.py compile_catalog build_ui build
 
 %install
 env PYTHONPATH="$PWD/.deps" %py3_install
+install -vDm644 -t "%{buildroot}/usr/share/pixmaps" plover/assets/plover.png
+install -vDm644 -t "%{buildroot}/usr/share/applications" application/plover.desktop
 
 %check
 env PYTHONPATH="$PWD/.deps" %{__python3} setup.py test
diff --git a/setup.py b/setup.py
@@ -467,8 +467,4 @@ def run(self):
     options=options,
     cmdclass=cmdclass,
     extras_require=extras_require,
-    data_files=[
-        ('share/applications', ['application/plover.desktop']),
-        ('share/pixmaps', ['plover/assets/plover.png']),
-    ],
 )

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ check() {`
`38`	`38`	`package() {`
`39`	`39`	`cd "$pkgname-$pkgver"`
`40`	`40`	`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`
`41`	`43`	`chmod og+rX -R "$pkgdir"`
`42`	`44`	`}`
`43`	`45`
Original file line number	Diff line number	Diff line change
`@@ -467,8 +467,4 @@ def run(self):`
`467`	`467`	`options=options,`
`468`	`468`	`cmdclass=cmdclass,`
`469`	`469`	`extras_require=extras_require,`
`470`		`- data_files=[`
`471`		`- ('share/applications', ['application/plover.desktop']),`
`472`		`- ('share/pixmaps', ['plover/assets/plover.png']),`
`473`		`- ],`
`474`	`470`	`)`