# HG changeset patch # User Michael Schloh von Bennewitz # Date 1229342399 -3600 # Node ID eab6243607cbe40b483f10515c93e015541a3c9f # Parent 3715407014ea0080bf95d923b0ad21acb1548454 Allow parallel building, correct Qt logic, use new vendor version. diff -r 3715407014ea -r eab6243607cb mico/mico.spec --- a/mico/mico.spec Mon Dec 15 12:54:25 2008 +0100 +++ b/mico/mico.spec Mon Dec 15 12:59:59 2008 +0100 @@ -31,8 +31,8 @@ Class: PLUS Group: RPC License: LGPL/GPL -Version: 2.3.12 -Release: 20080101 +Version: 2.3.13 +Release: 20081215 # package options %option with_ssl no @@ -59,8 +59,8 @@ PreReq: X11 %endif %if "%{with_qt}" == "yes" -BuildPreReq: qt, pkgconfig -PreReq: qt +BuildPreReq: qt < 4, pkgconfig +PreReq: qt < 4 %endif %if "%{with_gtk}" == "yes" BuildPreReq: gtk @@ -148,7 +148,7 @@ --disable-mini-stl \ --disable-shared touch cpp/.depend - %{l_make} %{l_mflags} + %{l_make} %{l_mflags -O} %install rm -rf $RPM_BUILD_ROOT @@ -167,6 +167,7 @@ # install binaries, libraries, headers %{l_make} %{l_mflags} install \ + LDCONFIG=true \ INSTDIR=$RPM_BUILD_ROOT%{l_prefix} \ SHARED_INSTDIR=$RPM_BUILD_ROOT%{l_prefix} @@ -179,8 +180,6 @@ 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; do mv lib${name}%{version}.a lib${name}.a