[arch-commits] Commit in haveged/trunk (PKGBUILD haveged-1.7-build.patch service)

[Bartłomiej Piotrowski]

    Date: Sunday, May 12, 2013 @ 08:27:31
  Author: bpiotrowski
Revision: 90383

upgpkg: haveged 1.7.a-2

- move binary to /usr/bin

Modified:
  haveged/trunk/PKGBUILD
  haveged/trunk/service
Deleted:
  haveged/trunk/haveged-1.7-build.patch

-------------------------+
 PKGBUILD                |   13 +++++++------
 haveged-1.7-build.patch |   13 -------------
 service                 |    2 +-
 3 files changed, 8 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-12 06:18:57 UTC (rev 90382)
+++ PKGBUILD	2013-05-12 06:27:31 UTC (rev 90383)
@@ -6,26 +6,27 @@
 pkgname=haveged
 pkgver=1.7.a
 _pkgver=${pkgver/.a/a}
-pkgrel=1
+pkgrel=2
 pkgdesc='Entropy harvesting daemon using CPU timings'
 arch=('i686' 'x86_64')
 url='http://www.issihosts.com/haveged'
 license=('GPL')
 depends=('glibc')
+options=('!libtool')
 source=($url/$pkgname-$_pkgver.tar.gz
         service)
 sha256sums=('8e7b0779bd8a4b9b73769ddaf626918355e2a542d3ac35e5ec31b74a58b9b051'
-            '85aed005b7d0d0bae74f7fc0ca70907a6f67ddbcb2df77ca004f9a919028564a')
+            'badf8ceb5484d45888a089fabdfba5f44f6ec2930bca203c50200051a4d83e12')
 
 build() {
-  cd $srcdir/$pkgname-$_pkgver
-  ./configure --prefix=/usr
+  cd $pkgname-$_pkgver
+  ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$_pkgver
-  make DESTDIR=$pkgdir install
+  cd $pkgname-$_pkgver
+  make DESTDIR="$pkgdir" install
 
   rm -rf $pkgdir/etc/init.d
   install -D -m644 $srcdir/service $pkgdir/usr/lib/systemd/system/haveged.service

Deleted: haveged-1.7-build.patch
===================================================================
--- haveged-1.7-build.patch	2013-05-12 06:18:57 UTC (rev 90382)
+++ haveged-1.7-build.patch	2013-05-12 06:27:31 UTC (rev 90383)
@@ -1,13 +0,0 @@
-Index: haveged-1.7/src/Makefile.am
-===================================================================
---- haveged-1.7.orig/src/Makefile.am
-+++ haveged-1.7/src/Makefile.am
-@@ -27,7 +27,7 @@ pkginclude_HEADERS = havege.h
- 
- haveged_SOURCES = haveged.c haveged.h
- 
--haveged_LDADD = @HA_LDFLAGS@ $(top_builddir)/src/libhavege.la
-+haveged_LDADD = @HA_LDFLAGS@ libhavege.la
- ##libtool_end##
- 
- MAINTAINERCLEANFILES = Makefile.in

Modified: service
===================================================================
--- service	2013-05-12 06:18:57 UTC (rev 90382)
+++ service	2013-05-12 06:27:31 UTC (rev 90383)
@@ -4,7 +4,7 @@
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/haveged -w 1024 -v 1
+ExecStart=/usr/bin/haveged -w 1024 -v 1
 PIDFile=/var/run/haveged.pid
 
 [Install]