OpenPKG Specs / changeset

     1.1 --- a/as-gui/as-gui.spec	Fri Nov 28 12:27:31 2008 +0100
     1.2 +++ b/as-gui/as-gui.spec	Sun Dec 14 13:33:48 2008 +0100
     1.3 @@ -24,22 +24,22 @@
     1.4  #   package information
     1.5  Name:         as-gui
     1.6  Summary:      Accounting System (AS) Graphical User Interface (GUI)
     1.7 -URL:          http://www.ossp.org/pkg/tool/as/
     1.8 +URL:          http://asgui.europalab.com/
     1.9  Vendor:       Michael Schloh von Bennewitz
    1.10  Packager:     OpenPKG Foundation e.V.
    1.11  Distribution: OpenPKG Community
    1.12  Class:        EVAL
    1.13  Group:        Finance
    1.14  License:      GPL
    1.15 -Version:      0.7.7
    1.16 -Release:      20081124
    1.17 +Version:      0.7.8
    1.18 +Release:      20081212
    1.19  
    1.20  #   package options
    1.21  %option       with_corba  yes
    1.22  %option       with_soap   yes
    1.23  
    1.24  #   list of sources
    1.25 -Source0:      ftp://ftp.ossp.org/pkg/tool/as/as-gui-%{version}.tar.gz
    1.26 +Source0:      ftp://ftp.europalab.com/pub/sfw/asgui/as-gui-%{version}.tar.gz
    1.27  
    1.28  #   build information
    1.29  Prefix:       %{l_prefix}
    1.30 @@ -58,13 +58,13 @@
    1.31  AutoReqProv:  no
    1.32  
    1.33  %description
    1.34 -    Accounting System (AS) is a time tracking and accounting system. AS
    1.35 -    GUI is the graphical user interface client.
    1.36 +    Accounting System (AS) is a time tracking and accounting system.
    1.37 +    AS GUI is the graphical user interface client.
    1.38  
    1.39  %track
    1.40      prog as-gui = {
    1.41          version   = %{version}
    1.42 -        url       = ftp://ftp.ossp.org/pkg/tool/as/
    1.43 +        url       = ftp://ftp.europalab.com/pub/sfw/asgui/
    1.44          regex     = as-gui-(__VER__)\.tar\.gz
    1.45      }
    1.46  

     2.1 --- a/qt/qt.spec	Fri Nov 28 12:27:31 2008 +0100
     2.2 +++ b/qt/qt.spec	Sun Dec 14 13:33:48 2008 +0100
     2.3 @@ -33,7 +33,7 @@
     2.4  Group:        Development
     2.5  License:      GPL
     2.6  Version:      4.4.3
     2.7 -Release:      20081124
     2.8 +Release:      20081214
     2.9  
    2.10  #   build options
    2.11  %option       with_tools     yes
    2.12 @@ -50,8 +50,8 @@
    2.13  PreReq:       OpenPKG, openpkg >= 20050726
    2.14  BuildPreReq:  X11, png, mng, jpeg, tiff, mesa, xrender
    2.15  PreReq:       X11, png, mng, jpeg, tiff, mesa, xrender
    2.16 -BuildPreReq:  zlib, libiconv, sqlite, dbus, glib2
    2.17 -PreReq:       zlib, libiconv, sqlite, dbus, glib2
    2.18 +BuildPreReq:  openssl, zlib, libiconv, sqlite, dbus
    2.19 +PreReq:       openssl, zlib, libiconv, sqlite, dbus
    2.20  BuildPreReq:  fontconfig, freetype
    2.21  PreReq:       fontconfig, freetype
    2.22  AutoReq:      no
    2.23 @@ -59,10 +59,10 @@
    2.24  Provides:     QTSDK
    2.25  
    2.26  %description
    2.27 -    Qt is a cross-platform application framework. Using Qt, you can
    2.28 -    develop applications and user interfaces once, and deploy them
    2.29 -    across many desktop and embedded operating systems without
    2.30 -    rewriting the source code.
    2.31 +    Qt is a comprehensive C++ framework for cross-platform application
    2.32 +    development. Using Qt, you can develop applications and user
    2.33 +    interfaces once, and deploy them across many desktop and embedded
    2.34 +    operating systems without rewriting the source code.
    2.35  
    2.36  %track
    2.37      prog qt = {
    2.38 @@ -78,7 +78,7 @@
    2.39        echo "  qt-x11-opensource-src-%{version} (4,5 Go)"
    2.40        echo "  qt-%{version}-<date>.<arch>-<os>-<tag>.rpm (1 Go)"
    2.41        echo "Building with no options takes 0,5 hours on a dual core"
    2.42 -      echo "2 GHz CPU, or 1,5 hours with all build options enabled."
    2.43 +      echo "2 GHz CPU, or 2 hours with all build options enabled."
    2.44      ) | %{l_rpmtool} msg -b -t notice
    2.45  
    2.46      %setup -q -n qt-x11-opensource-src-%{version}
    2.47 @@ -137,6 +137,9 @@
    2.48          mkspecs/qws/*/qmake.conf \
    2.49          mkspecs/*/*.conf
    2.50      %{l_shtool} subst \
    2.51 +        -e 's;^\(QMAKE_LIBS +=.*\);\1 -liconv;' \
    2.52 +        src/corelib/corelib.pro
    2.53 +    %{l_shtool} subst \
    2.54          -e "s;^\(QMAKE_INCDIR_X11[^=]*=\) *\(.*\);\1 %{l_prefix}/include \2;" \
    2.55          -e "s;^\(QMAKE_LIBDIR_X11[^=]*=\) *\(.*\);\1 %{l_prefix}/lib \2 $x11_supdir;" \
    2.56          mkspecs/qws/solaris*/qmake.conf \
    2.57 @@ -157,13 +160,14 @@
    2.58      rm -rf src/3rdparty/[^cdhmsw]* src/3rdparty/sql* src/3rdparty/win*
    2.59  
    2.60      case "%{l_platform -t}" in
    2.61 -        *-aix*     ) platcomp="aix-g++"     ;;
    2.62 -        *-freebsd* ) platcomp="freebsd-g++" ;;
    2.63 -        *-hpux*    ) platcomp="hpux-g++"    ;;
    2.64 -        *-irix*    ) platcomp="irix-g++"    ;;
    2.65 -        *-linux*   ) platcomp="linux-g++"   ;;
    2.66 -        *-darwin*  ) platcomp="macx-g++"    ;;
    2.67 -        *-sunos*   ) platcomp="solaris-g++" ;;
    2.68 +        *-aix*     ) platcomp="aix-g++"      ;;
    2.69 +        *-freebsd* ) platcomp="freebsd-g++"  ;;
    2.70 +        *-hpux*    ) platcomp="hpux-g++"     ;;
    2.71 +        *-irix*    ) platcomp="irix-g++"     ;;
    2.72 +        *64-linux* ) platcomp="linux-g++-64" ;;
    2.73 +        *-linux*   ) platcomp="linux-g++"    ;;
    2.74 +        *-darwin*  ) platcomp="macx-g++"     ;;
    2.75 +        *-sunos*   ) platcomp="solaris-g++"  ;;
    2.76          *          ) echo "Platform '%{l_platform -t}' is not supported." 2>&1; exit 1 ;;
    2.77      esac
    2.78  
    2.79 @@ -185,12 +189,13 @@
    2.80          -shared \
    2.81          -platform $platcomp \
    2.82          -no-sql-ibase \
    2.83 -        -no-sql-mysql \
    2.84 +        -qt-sql-mysql \
    2.85          -no-sql-odbc \
    2.86          -no-sql-psql \
    2.87          -no-sql-sqlite2 \
    2.88          -qt-sql-sqlite \
    2.89          -system-sqlite \
    2.90 +        -openssl-linked \
    2.91          -xmlpatterns \
    2.92          -svg \
    2.93          -no-webkit \
    2.94 @@ -209,8 +214,9 @@
    2.95          -xrender \
    2.96          -fontconfig \
    2.97          -freetype \
    2.98 -        -glib
    2.99 +        -no-glib
   2.100  
   2.101 +    #   sadly, webkit and glib is broken in Qt 4.4.3.
   2.102      #   default options are implicitly used, und zwar...
   2.103      #-no-fast -exceptions -accessibility -stl -qt3support -nis
   2.104      #-sm -xshape -xinerama -xcursor -xfixes -xrandr -tablet -xkb
   2.105 @@ -252,12 +258,13 @@
   2.106          -static \
   2.107          -platform $platcomp \
   2.108          -no-sql-ibase \
   2.109 -        -no-sql-mysql \
   2.110 +        -qt-sql-mysql \
   2.111          -no-sql-odbc \
   2.112          -no-sql-psql \
   2.113          -no-sql-sqlite2 \
   2.114          -qt-sql-sqlite \
   2.115          -system-sqlite \
   2.116 +        -openssl-linked \
   2.117          -xmlpatterns \
   2.118          -svg \
   2.119          -no-webkit \
   2.120 @@ -276,7 +283,7 @@
   2.121          -xrender \
   2.122          -fontconfig \
   2.123          -freetype \
   2.124 -        -glib
   2.125 +        -no-glib
   2.126  
   2.127      #   default options are implicitly used, und zwar...
   2.128      #-no-fast -exceptions -accessibility -stl -qt3support -nis
   2.129 @@ -320,7 +327,7 @@
   2.130  %if "%{with_examples}" == "yes"
   2.131      targets="$targets sub-demos-install_subtargets-ordered sub-examples-install_subtargets-ordered"
   2.132  %endif
   2.133 -    targets="$targets install_htmldocs install_translations install_qmake install_mkspecs"
   2.134 +    targets="$targets install_htmldocs install_qchdocs install_docimages install_translations install_qmake install_mkspecs"
   2.135      %{l_make} %{l_mflags} $targets INSTALL_ROOT="$RPM_BUILD_ROOT"
   2.136  
   2.137  %if "%{with_shared}" == "yes"