deleted: Makefile

modified: PKGBUILD modified: setup.py new file: src/lib/__init__.py renamed: src/conf.py -> src/lib/conf.py renamed: src/pactray.py -> src/lib/pactray.py renamed: src/tray.py -> src/lib/tray.py renamed: src/updates.py -> src/lib/updates.py renamed: pactray.desktop -> src/pactray.desktop renamed: src/archlogo.png -> src/share/archlogo.png renamed: src/archlogo.svg -> src/share/archlogo.svg
Thermionix · Sep 14, 2015 · be0af09 · be0af09
1 parent 101bb00
commit be0af09
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 41 deletions.
diff --git a/Makefile b/Makefile
diff --git a/PKGBUILD b/PKGBUILD
@@ -9,13 +9,11 @@ license=('GPL')
 url=""
 depends=('pacman' 'python-gobject')
 optdepends=('cower: check aur packages')
-source=('pactray.py' 'archlogo.png')
-md5sums=('')
+source=()
+md5sums=()
 
 build() {
-	mkdir -p ${pkgdir}/usr/bin
-
-	cp -f ${srcdir}/pactray.py ${pkgdir}/usr/bin/pactray
-
-	chmod -R 755 ${pkgdir}/
+	python setup.py build
+	python setup.py install --prefix=${pkgdir}/usr
 }
+
diff --git a/setup.py b/setup.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
-import glob
 
 setup(name='pactray',
       version='0.1',
@@ -10,10 +9,9 @@
       author=['Thermionix'],
       author_email=['[email protected]'],
       url='https://github.com/Thermionix/pactray',
-      package_dir={'pactray':'src/'},
+      package_dir={'pactray':'src/lib/'},
       packages=['pactray'],
-      data_files=[('share/pactray/', ['src/archlogo.png', 'src/archlogo.svg']),
-                  ('share/applications', ['pactray.desktop']),
-                  ]
+      data_files=[('share/pactray/', ['src/share/archlogo.png', 'src/share/archlogo.svg']),
+                  ('share/applications', ['src/pactray.desktop'])]
 )
 
diff --git a/src/lib/__init__.py b/src/lib/__init__.py
diff --git a/src/conf.py → src/lib/conf.py b/src/conf.py → src/lib/conf.py
diff --git a/src/pactray.py → src/lib/pactray.py b/src/pactray.py → src/lib/pactray.py
diff --git a/src/tray.py → src/lib/tray.py b/src/tray.py → src/lib/tray.py
diff --git a/src/updates.py → src/lib/updates.py b/src/updates.py → src/lib/updates.py
diff --git a/pactray.desktop → src/pactray.desktop b/pactray.desktop → src/pactray.desktop
diff --git a/src/archlogo.png → src/share/archlogo.png b/src/archlogo.png → src/share/archlogo.png
diff --git a/src/archlogo.svg → src/share/archlogo.svg b/src/archlogo.svg → src/share/archlogo.svg