kernel: Update to 3.13.2.

[people/ms/ipfire-3.x.git] / grep / grep.nm

diff --git a/grep/grep.nm b/grep/grep.nm
index 2057f8b6ff3eb11ce51d69fa4e63ea2b5328584c..983dc7b28b6efe516e73d55fc002927a4840d14f 100644 (file)
--- a/grep/grep.nm
+++ b/grep/grep.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = grep
-version    = 2.11
+version    = 2.14
 release    = 1
 
 groups     = Applications/Text
@@ -13,8 +13,8 @@ license    = GPLv3+
 summary    = A pattern matching utilities.
 
 description
-       The GNU versions of commonly used grep utilities. Grep searches through \
-       textual input for lines which contain a match to a specified pattern and then \
+       The GNU versions of commonly used grep utilities. Grep searches through
+       textual input for lines which contain a match to a specified pattern and then
        prints the matching lines. GNU's grep utilities include grep, egrep and fgrep.
 end
 
@@ -26,9 +26,6 @@ build
                pcre-devel
        end
 
-       configure_options += \
-               --bindir=/bin
-
        test
                make check
        end
@@ -37,6 +34,14 @@ end
 packages
        package %{name}
                groups += Base Build
+
+               provides
+                       /bin/grep
+               end
+
+               conflicts
+                       filesystem < 002
+               end
        end
 
        package %{name}-debuginfo