Update copyright, file server URL, modify doc and link logic.

Fri, 15 Oct 2010 18:46:25 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Fri, 15 Oct 2010 18:46:25 +0200
changeset 261
4f973c756446
parent 260
2a1b1cf8080a
child 262
495dc52debb0

Update copyright, file server URL, modify doc and link logic.
Now documentation is installed by default to the correct path,
and QtCreator links against Qt shared libraries instead of Qt
static libraries. This unfortunate change supports Nokia's
unfortunate decision to poorly support static linking in Qt.

qtcreator/qtcreator.spec file | annotate | diff | comparison | revisions
     1.1 --- a/qtcreator/qtcreator.spec	Sun Oct 10 18:21:45 2010 +0200
     1.2 +++ b/qtcreator/qtcreator.spec	Fri Oct 15 18:46:25 2010 +0200
     1.3 @@ -1,6 +1,6 @@
     1.4  ##
     1.5  ##  qtcreator.spec -- OpenPKG RPM Specification
     1.6 -##  Copyright (c) 2009 Michael Schloh von Bennewitz <michael@schloh.com>
     1.7 +##  Copyright (c) 2010 Michael Schloh von Bennewitz <michael@schloh.com>
     1.8  ##
     1.9  ##  Permission to use, copy, modify, and distribute this software for
    1.10  ##  any purpose with or without fee is hereby granted, provided that
    1.11 @@ -32,7 +32,7 @@
    1.12  Group:        Development
    1.13  License:      GPL
    1.14  Version:      2.0.1
    1.15 -Release:      20101010
    1.16 +Release:      20101012
    1.17  
    1.18  #   list of sources
    1.19  Source0:      ftp://ftp.qt.nokia.com/qtcreator/qt-creator-%{version}-src.tgz
    1.20 @@ -56,20 +56,25 @@
    1.21  %track
    1.22      prog qtcreator = {
    1.23          version   = %{version}
    1.24 -        url       = ftp://ftp.trolltech.com/qtcreator/
    1.25 -        regex     = qt-creator-(__VER__)-src\.tar\.gz
    1.26 +        url       = ftp://ftp.qt.nokia.com/qtcreator/
    1.27 +        regex     = qt-creator-(__VER__)-src\.tgz
    1.28      }
    1.29  
    1.30  %prep
    1.31      %setup -q -n qt-creator-%{version}-src
    1.32      %{l_shtool} subst \
    1.33 -        -e 's;\(CONFIG[\ \t]*+=\)[\ \t]*\(.*\);\1 static \2;' \
    1.34 -        qtcreator.pro
    1.35 +        -e 's;\(QMAKE_RPATHDIR +=\);#\1;g' \
    1.36 +        -e 's;\(\$\$join(QMAKE_RPATHDIR, ":"\));\1, "%{l_prefix}/lib/qtcreator:");' \
    1.37 +        src/rpath.pri
    1.38      %{l_shtool} subst \
    1.39 -        -e 's;\(QMAKE_RPATHDIR +=\);#\1;g' \
    1.40 -        -e 's;\(QMAKE_RPATHDIR =\)$;\1 %{l_prefix}/lib/qtcreator:%{l_prefix}/lib/qt/dynamic;' \
    1.41 -        src/qtcreatorplugin.pri \
    1.42 -        src/rpath.pri
    1.43 +        -e 's;\(share\)/\(doc\)/\(qtcreator\);\1/\3/\2;' \
    1.44 +        doc/doc.pri \
    1.45 +        qtcreator.pri \
    1.46 +        src/plugins/help/helpplugin.cpp
    1.47 +    echo '' >>src/libs/3rdparty/botan/botan.pro
    1.48 +    for profil in `find . -name '*.pro' | grep -v '[	 ]'`; do
    1.49 +        echo 'CONFIG += shared' >>$profil
    1.50 +    done
    1.51  
    1.52  %build
    1.53      %{l_prefix}/bin/qmake qtcreator.pro
    1.54 @@ -79,7 +84,7 @@
    1.55      rm -rf $RPM_BUILD_ROOT
    1.56  
    1.57      #   carry out installation procedure
    1.58 -    %{l_make} %{l_mflags} install_subtargets INSTALL_ROOT="$RPM_BUILD_ROOT%{l_prefix}"
    1.59 +    %{l_make} %{l_mflags} install INSTALL_ROOT="$RPM_BUILD_ROOT%{l_prefix}"
    1.60  
    1.61      #   clean up installation
    1.62      rm $RPM_BUILD_ROOT/%{l_prefix}/bin/qtcreator_process_stub

mercurial