[arch-commits] Commit in units/trunk (PKGBUILD build-fix.patch)

[Sergej Pupykin]

    Date: Thursday, March 21, 2013 @ 16:10:58
  Author: spupykin
Revision: 86728

upgpkg: units 2.01-2

upd

Modified:
  units/trunk/PKGBUILD
Deleted:
  units/trunk/build-fix.patch

-----------------+
 PKGBUILD        |   10 ++++------
 build-fix.patch |   27 ---------------------------
 2 files changed, 4 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-21 15:05:26 UTC (rev 86727)
+++ PKGBUILD	2013-03-21 15:10:58 UTC (rev 86728)
@@ -5,7 +5,7 @@
 
 pkgname=units
 pkgver=2.01
-pkgrel=1
+pkgrel=2
 pkgdesc="converts between different units"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/units/units.html"
@@ -13,14 +13,12 @@
 license=("GPL")
 options=('!makeflags')
 install=units.install
-source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz
-	build-fix.patch)
-md5sums=('81bf85937c56fbbd04b16f2f3f9d8526'
-         'dbb20e628ce0879fe82393f585e9dab6')
+source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz)
+md5sums=('81bf85937c56fbbd04b16f2f3f9d8526')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-#  patch -p1 <$srcdir/build-fix.patch
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' units_cur
   ./configure --prefix=/usr --datadir=/usr/share
   make
 }

Deleted: build-fix.patch
===================================================================
--- build-fix.patch	2013-03-21 15:05:26 UTC (rev 86727)
+++ build-fix.patch	2013-03-21 15:10:58 UTC (rev 86728)
@@ -1,27 +0,0 @@
-diff -wbBur units-2.00.org/Makefile.in units-2.00/Makefile.in
---- units-2.00.org/Makefile.in	2012-05-03 00:37:55.000000000 +0400
-+++ units-2.00/Makefile.in	2012-07-04 12:54:20.000000000 +0400
-@@ -84,10 +84,10 @@
- 	sed -e "s:outfile = 'currency.units':outfile='@UDAT at currency.units':" units_cur > units_cur_inst
- 
- install-support: definitions.units currency.units units_cur_inst
--	$(srcdir)/mkinstalldirs @UDAT@  $(DESTDIR)$(bindir) 
--	$(INSTALL_DATA) $(srcdir)/definitions.units @UDAT at definitions.units
--	$(INSTALL_DATA) $(srcdir)/currency.units @UDAT at currency.units
--	$(INSTALL_DATA) $(srcdir)/locale.map @UDAT at locale.map
-+	$(srcdir)/mkinstalldirs $(DESTDIR)/@UDAT@  $(DESTDIR)$(bindir) 
-+	$(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)/@UDAT at definitions.units
-+	$(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)/@UDAT at currency.units
-+	$(INSTALL_DATA) $(srcdir)/locale.map $(DESTDIR)/@UDAT at locale.map
- 	$(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
- 
- install: units at EXEEXT@ install-doc install-support
-diff -wbBur units-2.00.org/units_cur units-2.00/units_cur
---- units-2.00.org/units_cur	2012-05-01 04:51:35.000000000 +0400
-+++ units-2.00/units_cur	2012-07-04 12:53:47.000000000 +0400
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- 
- import urllib
- import datetime