Update libsolv recipe

* Move build_requires to build_prerequires
* Add requires zlib and expat.
* Fix package directory layout.

dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe

@@ -1,21 +1,27 @@
 SUMMARY="Library for solving packages and reading repositories"
 DESCRIPTION="Library for solving packages and reading repositories."
+LICENSE="BSD (3-clause)"
+COPYRIGHT="2007-2013, Novell Inc."
 HOMEPAGE="http://github.com/openSUSE/libsolv" 
 SRC_URI="git+git://github.com/weinhold/libsolv.git#85dcb683b0c705c1789a3f688bd0d02368107824"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="libsolv = $portVersion
 	lib:libsolv = $portVersion
 	lib:libsolvext = $portVersion"
 REQUIRES="haiku >= $haikuVersion
-	lib:libexpat >= 1.5"
-BUILD_REQUIRES="lib:libexpat >= 1.5"
+	lib:libexpat >= 1.5
+	lib:libz
+	"
+BUILD_REQUIRES="$REQUIRES"
 BUILD_PREREQUIRES="haiku_devel >= $haikuVersion
 	cmd:cmake
 	cmd:gcc
 	cmd:ld
-	cmd:make"
+	cmd:make
+	cmd:sed
+	"
 
 SOURCE_DIR="$portVersionedName"
 
@@ -25,7 +31,7 @@ BUILD()
 	mkdir build
 	cd build
 	cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix ..
-	make
+	make $jobArgs
 }
 
 INSTALL()
@@ -33,9 +39,18 @@ INSTALL()
 	cd build
 	make install
 
+	# set up the develop directory correctly
+	prepareInstalledDevelLibs libsolv libsolvext
+
+	mkdir -p $includeDir
+	mv $prefix/include/* $includeDir
+	rmdir $prefix/include
+
+	# move cmake files
+	mkdir -p $dataDir
+	mv $prefix/share/cmake $dataDir
+	rmdir $prefix/share
+
 	# We don't want the executables.
 	rm -r $prefix/bin
 }
-
-LICENSE="BSD (3-clause)"
-COPYRIGHT="2007-2013, Novell Inc."