Cleanup

5 files changed, 50 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1cfd3b1008c..4b3eafa797ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = xrick
-	pkgdesc = A clone of Rick Dangerous
+	pkgdesc = Clone of Rick Dangerous, a classic platform game
 	pkgver = 021212
-	pkgrel = 9
+	pkgrel = 10
 	url = http://www.bigorno.net/xrick
-	install = xrick.install
 	arch = i686
 	arch = x86_64
 	license = custom: spirit of GPL
@@ -12,13 +11,10 @@ pkgbase = xrick
 	depends = zlib
 	source = http://www.bigorno.net/xrick/xrick-021212.zip
 	source = xrick.desktop
-	source = xrick.install
-	md5sums = 6a56d23679f51c602b285642c6451fb6
-	md5sums = 4b7d95acef1c6c14527d7d3a7f702ebc
-	md5sums = a2be0f43954eb8a37dd807435e843ab1
+	source = xrick-fs.desktop
 	sha256sums = 2a167169ccdb2c108e97d5d021da9be29356d756283f1c20d5a7ad121b4accf0
-	sha256sums = 9bf9d3f063dc0cc5ce256cc2fd3475512628d68a5efcf87f4a64878956d8bba0
-	sha256sums = e8577e66ae08d597d908eb0d04792c890b04f7ecd463f9d601d2b244e04614d2
+	sha256sums = 3dda77a8017e35767c8339fb92ce0a554912c98af33fb75e986ca1d30d40c320
+	sha256sums = 5d8c57aeb0b4e445576f86aaa8b851315c4c31d03544f7ad4b95c9507551a625
 
 pkgname = xrick
 
diff --git a/PKGBUILD b/PKGBUILD
index a43d8b6d8cd9..d0e57c417e21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +1,60 @@
-# Maintainer: carstene1ns <arch carsten-teibes de>
+# Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 # Contributor: grimi <grimi at poczta dot fm>
 
 pkgname=xrick
 pkgver=021212
-pkgrel=9
-pkgdesc='A clone of Rick Dangerous'
+pkgrel=10
+pkgdesc='Clone of Rick Dangerous, a classic platform game'
 arch=('i686' 'x86_64')
 url='http://www.bigorno.net/xrick'
-install="$pkgname.install"
 license=('custom: spirit of GPL')
 depends=('sdl' 'zlib')
 makedepends=('imagemagick')
 source=("http://www.bigorno.net/xrick/$pkgname-$pkgver.zip"
         "$pkgname.desktop"
-        "$pkgname.install")
-md5sums=('6a56d23679f51c602b285642c6451fb6'
-         '4b7d95acef1c6c14527d7d3a7f702ebc'
-         'a2be0f43954eb8a37dd807435e843ab1')
+        "$pkgname-fs.desktop")
 sha256sums=('2a167169ccdb2c108e97d5d021da9be29356d756283f1c20d5a7ad121b4accf0'
-            '9bf9d3f063dc0cc5ce256cc2fd3475512628d68a5efcf87f4a64878956d8bba0'
-            'e8577e66ae08d597d908eb0d04792c890b04f7ecd463f9d601d2b244e04614d2')
+            '3dda77a8017e35767c8339fb92ce0a554912c98af33fb75e986ca1d30d40c320'
+            '5d8c57aeb0b4e445576f86aaa8b851315c4c31d03544f7ad4b95c9507551a625')
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
+prepare() {
+  cd $pkgname-$pkgver
 
   # change data path
-  sed -i 's|"data.zip"|"/usr/share/xrick/data.zip"|' src/xrick.c
-
+  sed 's|"data.zip"|"/usr/share/xrick/data.zip"|' -i src/xrick.c
   # add our build flags
-  sed -i "s|cflags)|cflags) ${CXXFLAGS}|" Makefile
-
-  make
+  sed "s|CFLAGS=|CFLAGS+=|;s|LDFLAGS=|LDFLAGS+=|" -i Makefile
 
   # create icon
   convert src/xrickST.ico xrick.png
 
   # change data path in manual page
   gunzip xrick.6.gz
-  sed -i 's|where xrick is|/usr/share/xrick.|' xrick.6
-  sed -i 's|run from.||' xrick.6
+  sed 's|where xrick is|/usr/share/xrick.|;s|run from.||' -i xrick.6
   gzip xrick.6
 }
 
+build() {
+  cd $pkgname-$pkgver
+
+  make
+}
+
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # install binary, icon, data, manual and desktop files
-  install -d "$pkgdir"/usr/{bin,man/man6,share/{xrick,applications,pixmaps}}
-  install -m755 xrick "$pkgdir/usr/bin/xrick"
-  install -m644 {data.zip,KeyCodes} "$pkgdir/usr/share/xrick/"
-  install -m644 xrick.6.gz "$pkgdir/usr/man/man6/"
-  install -m644 "$srcdir/xrick.desktop" "$pkgdir/usr/share/applications/"
-  install -m644 xrick.png "$pkgdir/usr/share/pixmaps/"
+  cd $pkgname-$pkgver
+
+  # binary
+  install -Dm755 xrick "$pkgdir"/usr/bin/xrick
+  # data
+  install -d "$pkgdir"/usr/share/xrick
+  install -m644 {data.zip,KeyCodes} "$pkgdir"/usr/share/xrick/
+  # doc + license
+  install -Dm644 xrick.6.gz "$pkgdir"/usr/share/man/man6/xrick.6.gz
+  install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README
+  install -Dm644 README "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  sed '5,27!d' -i "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  # .desktop files
+  install -Dm644 ../xrick.desktop "$pkgdir"/usr/share/applications/xrick.desktop
+  install -m644 ../xrick-fs.desktop "$pkgdir"/usr/share/applications
+  install -Dm644 xrick.png "$pkgdir"/usr/share/pixmaps/xrick.png
 }
diff --git a/xrick-fs.desktop b/xrick-fs.desktop
new file mode 100644
index 000000000000..55488a9e048f
--- /dev/null
+++ b/xrick-fs.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=xrick (Fullscreen)
+Exec=xrick -fullscreen
+Icon=xrick
+Comment=Rick Dangerous game clone
+Terminal=false
+Categories=Game;ArcadeGame;
diff --git a/xrick.desktop b/xrick.desktop
index b73eba7e46ed..9ae1a4af62bb 100644
--- a/xrick.desktop
+++ b/xrick.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
-Comment=Rick Dangerous game clone
+Type=Application
+Version=1.0
 Name=xrick
 Exec=xrick
 Icon=xrick
+Comment=Rick Dangerous game clone
 Terminal=false
-Type=Application
 Categories=Game;ArcadeGame;
diff --git a/xrick.install b/xrick.install
deleted file mode 100644
index bd5f4e219b45..000000000000
--- a/xrick.install
+++ /dev/null
@@ -1,13 +0,0 @@
-
-# apply updates for our .desktop file
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}