Merge remote-tracking branch 'maniacikarus/libpwquality'

diff --git a/autoconf/autoconf.nm b/autoconf/autoconf.nm
index 295d64c2795326af4116657b72b75b3af333ccba..cb08c29740f555a5aa3ece3927e074f635ad4e42 100644 (file)
--- a/autoconf/autoconf.nm
+++ b/autoconf/autoconf.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = autoconf
-version    = 2.68
-release    = 2
+version    = 2.69
+release    = 1
 arch       = noarch
 
 groups     = Development/Tools

diff --git a/mc/mc.nm b/mc/mc.nm
index 1b26b167f6def29450535d4739ee2ea57951378a..fcba89f9f4cf01d890be90abfd21075537dd6c9c 100644 (file)
--- a/mc/mc.nm
+++ b/mc/mc.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = mc
-version    = 4.8.2
+version    = 4.8.3
 release    = 1
 
 groups     = Applications/System

diff --git a/squid/squid.nm b/squid/squid.nm
index e2d74d59c009f82b1c88aade4f1754949dc5277d..7a8fa129aaaf819eb82158dbb2816ee3239ceb77 100644 (file)
--- a/squid/squid.nm
+++ b/squid/squid.nm
@@ -5,8 +5,8 @@
 
 name       = squid
 major_ver  = 3.1
-version    = %{major_ver}.16
-release    = 5
+version    = %{major_ver}.19
+release    = 1
 
 maintainer = Christian Schmidt <christian.schmidt@ipfire.org>
 groups     = Networking/Daemons
@@ -152,7 +152,7 @@ packages
 
                requires = /usr/bin/smbclient
 
-               filter_requires = perl\(Authen::Smb\)
+               filter_requires = perl.Auth.*
        end
 
        package %{name}-debuginfo

diff --git a/suricata/suricata.nm b/suricata/suricata.nm
index 69c863287d1b96fa9f9fb05cc0999dc34a3e4df5..4a92cb795c4d1e84e35e2dae6f5e641af4bc9d9c 100644 (file)
--- a/suricata/suricata.nm
+++ b/suricata/suricata.nm
@@ -4,8 +4,10 @@
 ###############################################################################
 
 name       = suricata
-version    = 1.2.1
-release    = 2
+version    = 1.3
+devel_ver  = beta1
+release    = 0.1-%{devel_ver}
+thisapp    = %{name}-%{version}%{devel_ver}
 
 groups     = Networking/IDS
 url        = http://www.openinfosecfoundation.org/

diff --git a/wavemon/wavemon.nm b/wavemon/wavemon.nm
index ea4f1a0d2c772422caf640ca98cd9cebbf4ad7e3..1ec862cd65507a34b0c080412fbe0a10b74bc25e 100644 (file)
--- a/wavemon/wavemon.nm
+++ b/wavemon/wavemon.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = wavemon
-version    = 0.7.2
+version    = 0.7.4
 release    = 1
 
 groups     = Applications/Internet