5.32

Remove MinimumProfit.desktop
Patch hard-coded install paths in makefile.in
Don't install pixmap mp.png
Create folders "$pkgdir"{/usr/share/applications,/usr/share/icons/hicolor/48x48/apps}

3 files changed, 15 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f7cd66b92d00..6dc025d915fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = mp-5
-	pkgver = 5.31
+	pkgver = 5.32
 	pkgrel = 1
 	url = http://www.triptico.com/software/mp.html
 	arch = x86_64
@@ -8,10 +8,8 @@ pkgbase = mp-5
 	makedepends = ncurses
 	makedepends = qt5-base
 	options = !makeflags
-	source = http://triptico.com/download/mp/mp-5.31.tar.gz
-	source = MinimumProfit.desktop
-	md5sums = 91fa68d6391e359b88106629956847c7
-	md5sums = 7eae413ded2d6f69fba8347240b8b875
+	source = http://triptico.com/download/mp/mp-5.32.tar.gz
+	md5sums = 2c82a29af4500c9c6971428d5b77d24c
 
 pkgname = mp-5-gtk
 	pkgdesc = Text editor for programmers (GTK front-end)
diff --git a/MinimumProfit.desktop b/MinimumProfit.desktop
deleted file mode 100644
index c7e8e9fc0fdb..000000000000
--- a/MinimumProfit.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=mp-5
-Comment[es_CL]=Un editor de texto para programadores
-Name=Minimum Profit
-Comment=A text editor for programmers
-Icon=gnome-panel-launcher
-Categories=Development;
-Encoding=UTF-8
-Icon=/usr/share/pixmaps/mp.png
-
diff --git a/PKGBUILD b/PKGBUILD
index 8f12dc0877d9..914cb1d00716 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=mp-5
 pkgname=(mp-5-gtk mp-5-nc mp-5-qt5)
-pkgver=5.31
+pkgver=5.32
 pkgrel=1
 arch=('x86_64')
 url="http://www.triptico.com/software/mp.html"
@@ -11,12 +11,13 @@ license=('GPL')
 #'mp_doccer' 'perl-grutatxt'
 makedepends=('gtk3' 'ncurses' 'qt5-base')
 options=(!makeflags)
-source=(http://triptico.com/download/mp/mp-$pkgver.tar.gz
-		MinimumProfit.desktop)
-md5sums=('91fa68d6391e359b88106629956847c7'
-         '7eae413ded2d6f69fba8347240b8b875')
+source=(http://triptico.com/download/mp/mp-$pkgver.tar.gz)
+md5sums=('2c82a29af4500c9c6971428d5b77d24c')
 
 prepare() {
+  # Patch hard-coded install paths
+  sed -i 's| /usr| $(PREFIX)|g' mp-$pkgver/makefile.in
+
   rm -rf mp-5-gtk
   cp -a mp-$pkgver mp-5-gtk
 
@@ -49,11 +50,9 @@ package_mp-5-gtk() {
   provides=($_pkgname)
   conflicts=($_pkgname)
 
-  install -Dm644 MinimumProfit.desktop "$pkgdir/usr/share/applications/MinimumProfit.desktop"
-
   cd mp-5-gtk
-  install -Dm644 mp.png "$pkgdir/usr/share/pixmaps/mp.png"
-  install -dm755 "$pkgdir/usr/bin"
+  #install -Dm644 mp.png "$pkgdir/usr/share/pixmaps/mp.png"
+  install -dm755 "$pkgdir"{/usr/bin,/usr/share/applications,/usr/share/icons/hicolor/48x48/apps}
   make DESTDIR="$pkgdir" install
 }
 
@@ -64,11 +63,9 @@ package_mp-5-nc() {
   provides=($_pkgname)
   conflicts=($_pkgname)
 
-  install -Dm644 MinimumProfit.desktop "$pkgdir/usr/share/applications/MinimumProfit.desktop"
-
   cd mp-5-nc
-  install -Dm644 mp.png "$pkgdir/usr/share/pixmaps/mp.png"
-  install -dm755 "$pkgdir/usr/bin"
+  #install -Dm644 mp.png "$pkgdir/usr/share/pixmaps/mp.png"
+  install -dm755 "$pkgdir"{/usr/bin,/usr/share/applications,/usr/share/icons/hicolor/48x48/apps}
   make DESTDIR="$pkgdir" install
 }
 
@@ -79,11 +76,9 @@ package_mp-5-qt5() {
   provides=($_pkgname)
   conflicts=($_pkgname)
 
-  install -Dm644 MinimumProfit.desktop "$pkgdir/usr/share/applications/MinimumProfit.desktop"
-
   cd mp-5-qt5
-  install -Dm644 mp.png "$pkgdir/usr/share/pixmaps/mp.png"
-  install -dm755 "$pkgdir/usr/bin"
+  #install -Dm644 mp.png "$pkgdir/usr/share/pixmaps/mp.png"
+  install -dm755 "$pkgdir"{/usr/bin,/usr/share/applications,/usr/share/icons/hicolor/48x48/apps}
   make DESTDIR="$pkgdir" install
 }