[arch-commits] Commit in stellarium/repos (4 files)

[Jan de Groot]

    Date: Friday, May 8, 2009 @ 17:07:28
  Author: jgc
Revision: 38520

Merged revisions 38519 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/stellarium/trunk

........
  r38519 | jgc | 2009-05-08 21:07:13 +0000 (Fri, 08 May 2009) | 4 lines
  
  upgpkg: stellarium 0.10.2-2
      Fix dependencies
  Make desktop file valid
  Remove install scriptlet, there is no mimetype in the desktop file
........

Modified:
  stellarium/repos/extra-x86_64/	(properties)
  stellarium/repos/extra-x86_64/PKGBUILD
  stellarium/repos/extra-x86_64/stellarium.desktop
Deleted:
  stellarium/repos/extra-x86_64/stellarium.install

--------------------+
 PKGBUILD           |   13 ++++++-------
 stellarium.desktop |    4 +---
 stellarium.install |   18 ------------------
 3 files changed, 7 insertions(+), 28 deletions(-)


Property changes on: stellarium/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /stellarium/trunk:1-32247
   + /stellarium/trunk:1-38519

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-08 21:07:13 UTC (rev 38519)
+++ extra-x86_64/PKGBUILD	2009-05-08 21:07:28 UTC (rev 38520)
@@ -4,31 +4,30 @@
 
 pkgname=stellarium
 pkgver=0.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A stellarium with great graphics and a nice database of sky-objects"
 arch=("i686" "x86_64")
 url="http://stellarium.free.fr/"
 license=('GPL2')
-depends=('libpng' 'mesa' 'sdl_mixer' 'libgl' 'freetype2' 'curl' 'qt>=4.5.0')
+depends=('libpng' 'mesa' 'libgl' 'freetype2' 'qt>=4.5.1' 'openssl')
 makedepends=('cmake' 'boost')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" \
 	'stellarium.desktop' 'stellarium.png')
-install=stellarium.install
 md5sums=('c544fff9e75e9317055075b658ae5924'
-         'd119a2f0fc23eebb440697ed0f759fea'
+         'b4f9ebd082c4e112c2bbfac9f2c8465d'
          '134ab08e73f4f5d995a7931a7957b7a3')
 	
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE || return 1
   make || return 1
-  make DESTDIR=${pkgdir} install
+  make DESTDIR=${pkgdir} install || return 1
 
   # install desktop file & pixmap
   install -Dm644 ${srcdir}/stellarium.desktop \
-	${pkgdir}/usr/share/applications/stellarium.desktop
+	${pkgdir}/usr/share/applications/stellarium.desktop || return 1
   install -Dm644 ${srcdir}/stellarium.png \
-	${pkgdir}/usr/share/pixmaps/stellarium.png
+	${pkgdir}/usr/share/pixmaps/stellarium.png || return 1
 }
 
 

Modified: extra-x86_64/stellarium.desktop
===================================================================
--- extra-x86_64/stellarium.desktop	2009-05-08 21:07:13 UTC (rev 38519)
+++ extra-x86_64/stellarium.desktop	2009-05-08 21:07:28 UTC (rev 38520)
@@ -3,9 +3,7 @@
 GenericName=Nightsky renderer
 Comment=A real-time nightsky renderer
 Categories=Education;Science;Astronomy;
-Icon=/usr/share/pixmaps/stellarium.png
+Icon=stellarium
 Exec=stellarium
 Terminal=false
 Type=Application
-Encoding=UTF-8
-

Deleted: extra-x86_64/stellarium.install
===================================================================
--- extra-x86_64/stellarium.install	2009-05-08 21:07:13 UTC (rev 38519)
+++ extra-x86_64/stellarium.install	2009-05-08 21:07:28 UTC (rev 38520)
@@ -1,18 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-}
-
-op=$1
-shift
-
-$op $*
-
-