diff --git a/srcpkgs/Ice/Ice-devel.template b/srcpkgs/Ice/Ice-devel.template index 42049d02237..ee92cf6e516 100644 --- a/srcpkgs/Ice/Ice-devel.template +++ b/srcpkgs/Ice/Ice-devel.template @@ -5,6 +5,8 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." +revision=1 + Add_dependency run Ice do_install() diff --git a/srcpkgs/Ice/depends b/srcpkgs/Ice/depends new file mode 100644 index 00000000000..4c61d46f15b --- /dev/null +++ b/srcpkgs/Ice/depends @@ -0,0 +1,2 @@ +abi_depends=">=3.4.2_1" +api_depends="${abi_depends}" diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template index 35d8eaddc7b..b7baa557bd3 100644 --- a/srcpkgs/Ice/template +++ b/srcpkgs/Ice/template @@ -1,7 +1,7 @@ # Template file for 'Ice' pkgname=Ice version=3.4.2 -revision=1 +revision=2 homepage="http://www.zeroc.com" distfiles="${homepage}/download/Ice/3.4/${pkgname}-${version}.tar.gz" short_desc="The Internet Communications Engine (Ice)" @@ -41,12 +41,13 @@ do_configure() { sed -i -e "s|^#OPTIMIZE|OPTIMIZE|" config/Make.rules sed -i -e "s|x)/config|x)/lib/Ice/config|" config/Make.rules + sed -i '/^embedded_runpath_prefix*/d' config/Make.rules sed -i -e "s|test demo||" Makefile } do_build() { - make ${makejobs} + make prefix=/usr ${makejobs} } do_install() @@ -64,4 +65,7 @@ do_install() rm ${DESTDIR}/usr/LICENSE mv ${DESTDIR}/usr/ICE_LICENSE \ ${DESTDIR}/usr/share/licenses/${pkgname}/LICENSE + + # remove unused cruft + rm -f ${DESTDIR}/usr/lib/*.class }