Browse Source

resolve file conflict with NSD (CW-IS #78)

Ralf S. Engelschall 23 years ago
parent
commit
c0ce5b4756
1 changed files with 6 additions and 4 deletions
  1. 6 4
      mico/mico.spec

+ 6 - 4
mico/mico.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        System
 License:      LGPL/GPL
 Version:      2.3.9
-Release:      20030224
+Release:      20030416
 
 #   package options
 %option       with_ssl      no
@@ -133,18 +133,20 @@ AutoReqProv:  no
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/ministl
     rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/mico-setup.*
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+    mv  $RPM_BUILD_ROOT%{l_prefix}/man/man8/nsd.8 \
+        $RPM_BUILD_ROOT%{l_prefix}/man/man8/mico-nsd.8
     ( cd $RPM_BUILD_ROOT%{l_prefix}/lib
       for name in mico micoaux micocoss micoir micox; do
           mv lib${name}%{version}.a lib${name}.a
       done
 %if "%{with_qt}" == "yes"
-          mv libmicoqt%{version}.a libmicoqt.a
+      mv libmicoqt%{version}.a libmicoqt.a
 %endif
 %if "%{with_gtk}" == "yes"
-          mv libmicogtk%{version}.a libmicogtk.a
+      mv libmicogtk%{version}.a libmicogtk.a
 %endif
 %if "%{with_tcl}" == "yes"
-          mv libmicotcl%{version}.a libmicotcl.a
+      mv libmicotcl%{version}.a libmicotcl.a
 %endif
     )