[arch-commits] Commit in emelfm2/trunk (PKGBUILD emelfm2-0.8.0-dsofix.patch)

[Eric Bélanger]

    Date: Sunday, April 22, 2012 @ 19:01:34
  Author: eric
Revision: 156676

upgpkg: emelfm2 0.8.1-1

Upstream update, Update license, Remove old patch

Modified:
  emelfm2/trunk/PKGBUILD
Deleted:
  emelfm2/trunk/emelfm2-0.8.0-dsofix.patch

----------------------------+
 PKGBUILD                   |   30 +++++++++++++++---------------
 emelfm2-0.8.0-dsofix.patch |   11 -----------
 2 files changed, 15 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-22 22:33:09 UTC (rev 156675)
+++ PKGBUILD	2012-04-22 23:01:34 UTC (rev 156676)
@@ -3,28 +3,28 @@
 # Contributor: contrasutra
 
 pkgname=emelfm2
-pkgver=0.8.0
-pkgrel=2
+pkgver=0.8.1
+pkgrel=1
 pkgdesc="A file manager that implements the popular two-pane design"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://emelfm2.net/"
 depends=('gtk2')
-license=('GPL')
-source=("http://emelfm2.net/rel/${pkgname}-${pkgver}.tar.bz2"
-        'emelfm2-0.8.0-dsofix.patch')
-md5sums=('8490d501e19009860f53ac6a98db74c1'
-         '0a6252eda0c3a98ba693148dfdd6ccba')
+license=('GPL3')
+source=("http://emelfm2.net/rel/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('5528bdd7001451dbdba95bf26ee588be9a0b86da')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}/emelfm2-0.8.0-dsofix.patch"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make PREFIX=/usr
-  make PREFIX=${pkgdir}/usr install
-  make PREFIX=${pkgdir}/usr install_i18n
+}
 
-  install -m 755 ${pkgdir}/usr/share/pixmaps/emelfm2/emelfm2_48.png \
-      ${pkgdir}/usr/share/pixmaps/emelfm2.png
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make PREFIX="${pkgdir}/usr" install install_i18n
+
+  install -m 755 "${pkgdir}/usr/share/pixmaps/emelfm2/emelfm2_48.png" \
+      "${pkgdir}/usr/share/pixmaps/emelfm2.png"
   sed -e '/Icon=/ s^emelfm2/emelfm2_48.png^emelfm2.png^' \
       -e '/Categories=/ s^;$^;Application;Utility;^' \
-      -i ${pkgdir}/usr/share/applications/emelfm2.desktop
+      -i "${pkgdir}/usr/share/applications/emelfm2.desktop"
 }

Deleted: emelfm2-0.8.0-dsofix.patch
===================================================================
--- emelfm2-0.8.0-dsofix.patch	2012-04-22 22:33:09 UTC (rev 156675)
+++ emelfm2-0.8.0-dsofix.patch	2012-04-22 23:01:34 UTC (rev 156676)
@@ -1,11 +0,0 @@
---- a/Makefile	2011-06-06 11:10:28.000000000 +0200
-+++ b/Makefile	2012-02-27 18:20:11.000000000 +0100
-@@ -382,7 +382,7 @@
- 
- $(TARGET): $(OBJECTS)
- 	@echo "linking binary '$(TARGET)'"
--	@$(CC) $(LDFLAGS) $(OBJECTS) -o $(TARGET) -Wl,--as-needed $(lLIBS)
-+	@$(CC) $(LDFLAGS) $(OBJECTS) -o $(TARGET) -lm -ldl -Wl,--as-needed $(lLIBS)
- ifeq ($(STRIP), 1)
- ifneq ($(DEBUG), 1)
- 	@echo "stripping binary '$(TARGET)'"