- docdir fix

Changed files:
    mutt.spec -> 1.21

diff --git a/mutt.spec b/mutt.spec
index c231fb79be80e512bb8c89e5fb7be5cb7f7dcd04..61ec4b7057be62eba56550eafd66e532bfd36fe9 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -59,11 +59,7 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
        --disable-warnings \
        --disable-domain \
         --enable-compressed \
-<<<<<<< mutt.spec
        --with-docdir=%{_defaultdocdir}/%{name}-%{version}
-=======
-       --with-docdir=$RPM_BUILD_ROOT%{_datadir}/doc/mutt-%{version}
->>>>>>> 1.19
 
 make