Allow parallel building, correct Qt logic, use new vendor version.

Mon, 15 Dec 2008 12:59:59 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Mon, 15 Dec 2008 12:59:59 +0100
changeset 6
eab6243607cb
parent 5
3715407014ea
child 7
5443cb9b550a

Allow parallel building, correct Qt logic, use new vendor version.

mico/mico.spec file | annotate | diff | comparison | revisions
     1.1 --- a/mico/mico.spec	Mon Dec 15 12:54:25 2008 +0100
     1.2 +++ b/mico/mico.spec	Mon Dec 15 12:59:59 2008 +0100
     1.3 @@ -31,8 +31,8 @@
     1.4  Class:        PLUS
     1.5  Group:        RPC
     1.6  License:      LGPL/GPL
     1.7 -Version:      2.3.12
     1.8 -Release:      20080101
     1.9 +Version:      2.3.13
    1.10 +Release:      20081215
    1.11  
    1.12  #   package options
    1.13  %option       with_ssl      no
    1.14 @@ -59,8 +59,8 @@
    1.15  PreReq:       X11
    1.16  %endif
    1.17  %if "%{with_qt}" == "yes"
    1.18 -BuildPreReq:  qt, pkgconfig
    1.19 -PreReq:       qt
    1.20 +BuildPreReq:  qt < 4, pkgconfig
    1.21 +PreReq:       qt < 4
    1.22  %endif
    1.23  %if "%{with_gtk}" == "yes"
    1.24  BuildPreReq:  gtk
    1.25 @@ -148,7 +148,7 @@
    1.26          --disable-mini-stl \
    1.27          --disable-shared
    1.28      touch cpp/.depend
    1.29 -    %{l_make} %{l_mflags}
    1.30 +    %{l_make} %{l_mflags -O}
    1.31  
    1.32  %install
    1.33      rm -rf $RPM_BUILD_ROOT
    1.34 @@ -167,6 +167,7 @@
    1.35  
    1.36      #   install binaries, libraries, headers
    1.37      %{l_make} %{l_mflags} install \
    1.38 +        LDCONFIG=true \
    1.39          INSTDIR=$RPM_BUILD_ROOT%{l_prefix} \
    1.40          SHARED_INSTDIR=$RPM_BUILD_ROOT%{l_prefix}
    1.41  
    1.42 @@ -179,8 +180,6 @@
    1.43      rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/ministl
    1.44      rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/mico-setup.*
    1.45      strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
    1.46 -    mv  $RPM_BUILD_ROOT%{l_prefix}/man/man8/nsd.8 \
    1.47 -        $RPM_BUILD_ROOT%{l_prefix}/man/man8/mico-nsd.8
    1.48      ( cd $RPM_BUILD_ROOT%{l_prefix}/lib
    1.49        for name in mico micoaux micocoss micoir; do
    1.50            mv lib${name}%{version}.a lib${name}.a

mercurial