# HG changeset patch
# User Tomas Zeman <tzeman@volny.cz>
# Date 1222842523 -7200
# Node ID c688ce49611deb71766905ea348c6495dc1fe6e5
# Parent  ad007ca04674952d15396b6802d8c59bd97f0cf6# Parent  66f7514b27bcc28ab2e75e0bc7062873711192b1
Merge branch 'master' of ssh://tzeman@jizera.stika.net/~tzeman/dev/frugalware-patches

Conflicts:
	master/vim.patch

diff -r ad007ca04674 -r c688ce49611d dmraid.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dmraid.patch	Wed Oct 01 08:28:43 2008 +0200
@@ -0,0 +1,38 @@
+dmraid
+
+diff --git a/source/custom/dmraid/FrugalBuild b/source/custom/dmraid/FrugalBuild
+new file mode 100644
+index 0000000..49bc6a7
+--- /dev/null
++++ b/source/custom/dmraid/FrugalBuild
+@@ -0,0 +1,30 @@
++# Taken from Archlinux
++
++pkgname=dmraid
++pkgver=1.0.0.rc14
++pkgrel=1
++pkgdesc="Device mapper RAID interface"
++url="http://people.redhat.com/~heinzm/sw/dmraid/"
++depends=(device-mapper)
++archs=('i686')
++groups=('custom')
++license=('GPL')
++up2date="lynx -dump $url/src| Flasttar"
++source=($url/src/$pkgname-$pkgver.tar.bz2)
++sha1sums=('2b3284db46a995967d88993ae5ae36b57c513bc4')
++
++build() {
++  cd $startdir/src/$pkgname/$pkgver
++
++  # create static bin
++  #./configure --enable-static_link --prefix=/usr
++  #make || return 1
++  #make DESTDIR=$startdir/pkg exec_prefix=$startdir/pkg/usr install
++  #mv $startdir/pkg/usr/sbin/dmraid $startdir/pkg/usr/sbin/dmraid.static
++
++  # create dynamic linked bin
++  ./configure --prefix=/usr
++  make || return 1
++  make DESTDIR=$startdir/pkg exec_prefix=$startdir/pkg/usr install
++  mkdir -p $startdir/pkg/var/lock/dmraid
++}
diff -r ad007ca04674 -r c688ce49611d perl-netaddr-ip.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/perl-netaddr-ip.patch	Wed Oct 01 08:28:43 2008 +0200
@@ -0,0 +1,15 @@
+perl-netaddr-ip
+
+diff --git a/source/network-extra/spamassassin/FrugalBuild b/source/network-extra/spamassassin/FrugalBuild
+index 268fe06..347f7b0 100644
+--- a/source/network-extra/spamassassin/FrugalBuild
++++ b/source/network-extra/spamassassin/FrugalBuild
+@@ -13,7 +13,7 @@ depends=('perl-html-parser>=3.56-2' 'perl-digest-sha1>=2.11-2' 'openssl' \
+ 	'perl-ip-country' 'perl-libwww' 'perl-io-socket-inet6>=2.52' \
+ 	'perl-mail-spf-query' 'perl-net-ident' 'perl-io-socket-ssl' \
+ 	'razor-agents>=2.84-2' 'perl-mail-dkim' 'perl-encode-detect>=1.00-2' 'perl>=5.10.0-2' \
+-	'perl-net-ssleay>=1.32-2')
++	'perl-net-ssleay>=1.32-2' 'perl-netaddr-ip')
+ groups=('network-extra')
+ archs=('i686' 'x86_64')
+ backup=(etc/conf.d/spamd etc/mail/spamassassin/local.cf)
diff -r ad007ca04674 -r c688ce49611d series
--- a/series	Wed Oct 01 08:16:05 2008 +0200
+++ b/series	Wed Oct 01 08:28:43 2008 +0200
@@ -44,6 +44,8 @@
 getmail.patch
 firehol.patch
 vim.patch
+dmraid.patch
+perl-netaddr-ip.patch
 haskel-x11.patch
 xmonad.patch
 xmonad-contrib.patch
diff -r ad007ca04674 -r c688ce49611d vim.patch