Merge remote-tracking branch 'maniacikarus/samba'

Conflicts:
	samba/samba.nm

diff --cc samba/samba.nm
index e50b083c1775520169e62a340c73872cba95ba60,9b8f8be3786b3b4d4a2ab1f19f7214334b40e77b..e0f55378898ed87ceffa49dc73b6dc57a1fac89e
--- 1/samba/samba.nm
--- 2/samba/samba.nm
+++ b/samba/samba.nm
@@@ -88,16 -85,14 +88,14 @@@ en
  
  packages
        package %{name}
--      end
--      
++
        package %{name}-libs
                template LIBS
        end
--      
++
        package %{name}-devel
                template DEVEL
 +
 +              requires += %{name}-libs=%{thisver}
        end
  end
--