4 files changed, 21 insertions, 21 deletions
diff --git a/build b/build
index 5875c3f..f72aa28 100755
--- a/build
+++ b/build
@@ -1,19 +1,14 @@
-#! /usr/bin/make -f
+#!/usr/bin/make -f
 
-PKGS = alsa-utils
-
-$(PKGS): alsa-utils.buildstamp
-
-.SILENT: alsa-utils.buildstamp
-alsa-utils.buildstamp:
-	cd src && \
-		./configure --prefix=/usr \
-		--build=$${OH_BUILD_ARCH_GNU} --host=$${OH_HOST_ARCH_GNU} \
+build:
+	oh-autoconfigure -- \
 		--disable-xmlto \
-		--disable-alsaconf && \
-		make && make DESTDIR=$$(pwd)/../dest install
-	oh-installfiles $(PKGS)
-	oh-installdocs alsa-utils
-	oh-gencontrol $(PKGS)
-	oh-buildopk $(PKGS)
-	touch alsa-utils.buildstamp
+		--disable-alsaconf
+	oh-autobuild
+	touch $@
+
+install: build
+	oh-autoinstall
+	oh-fixperms
+	oh-strip
+	oh-installfiles
diff --git a/changelog b/changelog
index bbf164a..b2e9a11 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+alsa-utils (1.0.25-2) trunk
+
+  * Update to SPF 2.0 and opkhelper 3.0.
+
+ -- "P. J. McDermott" <pj@pehjota.net>  Fri, 13 Jun 2014 22:48:58 -0400
+
 alsa-utils (1.0.25-1)
 
   * Initial release.
diff --git a/control b/control
index 8545950..22cc612 100644
--- a/control
+++ b/control
@@ -1,4 +1,3 @@
-Source: alsa-utils
-Version: 1.0.25-1
-Maintainer: "P. J. McDermott" <pjm@nac.net>
+Maintainer: "P. J. McDermott" <pj@pehjota.net>
+Build-Depends: opkhelper-3.0
 Homepage: http://www.alsa-project.org/main/index.php/Main_Page
diff --git a/format b/format
index d3827e7..cd5ac03 100644
--- a/format
+++ b/format
@@ -1 +1 @@
-1.0
+2.0