OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 06-Sep-2003 15:32:48
Branch: HEAD Handle: 2003090614324602
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Fix more problems with the optional shared library build
Summary:
Revision Changes Path
1.83 +10 -18 openpkg-src/qt/qt.spec
1.6431 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
============================================================================
$ cvs diff -u -r1.82 -r1.83 qt.spec
--- openpkg-src/qt/qt.spec 4 Sep 2003 17:02:13 -0000 1.82
+++ openpkg-src/qt/qt.spec 6 Sep 2003 13:32:48 -0000 1.83
@@ -33,7 +33,7 @@
Group: XWindow
License: GPL
Version: 3.2.1
-Release: 20030904
+Release: 20030906
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -146,7 +146,7 @@
-plugindir %{l_prefix}/share/qt/plugins \
-translationdir %{l_prefix}/share/qt/translations \
-sysconfdir %{l_prefix}/etc/qt \
- -release -static -shared -stl -sm \
+ -release -shared -stl -sm \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-I$QTDIR/include %{l_cppflags freetype2} -I${l_x11_incdir} \
-L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
@@ -159,9 +159,6 @@
LD_LIBRARY_PATH=$QTDIR/lib \
sub-src sub-plugins
- # keep only static library pkg-config build definitions
- rm lib/qt.pc
-
%if "%{with_threads}" == "yes"
# run configure a second time to get threaded libs as well
CC="%{l_cc}" \
@@ -182,7 +179,7 @@
-plugindir %{l_prefix}/share/qt/plugins \
-translationdir %{l_prefix}/share/qt/translations \
-sysconfdir %{l_prefix}/etc/qt \
- -release -static -shared -stl -sm \
+ -release -shared -stl -sm \
-qt-zlib -qt-libpng -qt-libjpeg -qt-libmng -qt-gif \
-I$QTDIR/include %{l_cppflags freetype2} -I${l_x11_incdir} \
-L$QTDIR/lib %{l_ldflags} -L${l_x11_libdir} \
@@ -194,10 +191,14 @@
MAKE="%{l_make} %{l_mflags -O}" \
LD_LIBRARY_PATH=$QTDIR/lib \
sub-src sub-plugins
-
- # keep only static library pkg-config build definitions
- rm lib/qt-mt.pc
%endif
+
+ # already install our shared libs, and clear out the rest
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/qtdyn
+ %{l_tar} cf - lib/*.so* lib/*.prl lib/*.pc | %{l_tar} xf - \
+ -C $RPM_BUILD_ROOT%{l_prefix}/lib/qtdyn/
+ rm -f lib/*
%endif
# start of static lib build
@@ -235,7 +236,6 @@
( cd tools/designer
%{l_make} %{l_mflags -O} \
MAKE="%{l_make} %{l_mflags -O}" \
- LD_LIBRARY_PATH=$QTDIR/lib \
sub-uic
) || exit $?
%endif
@@ -279,7 +279,6 @@
( cd tools/designer
%{l_make} %{l_mflags -O} \
MAKE="%{l_make} %{l_mflags -O}" \
- LD_LIBRARY_PATH=$QTDIR/lib \
sub-uic
) || exit $?
%endif
@@ -298,9 +297,6 @@
# make directory structure
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
-%if "%{with_shared}" == "yes"
- $RPM_BUILD_ROOT%{l_prefix}/lib/qtdyn \
-%endif
%if "%{with_tools}" == "yes"
$RPM_BUILD_ROOT%{l_prefix}/share/qt/templates \
$RPM_BUILD_ROOT%{l_prefix}/share/qt/phrasebooks \
@@ -339,10 +335,6 @@
lib/*.pc $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
%{l_shtool} install -c -m 644 \
lib/*.a lib/*.prl $RPM_BUILD_ROOT%{l_prefix}/lib/
-%if "%{with_shared}" == "yes"
- %{l_tar} cf - lib/*.so* lib/*.prl | %{l_tar} xf - \
- -C $RPM_BUILD_ROOT%{l_prefix}/lib/qtdyn/
-%endif
%if "%{with_tools}" == "yes"
%{l_shtool} install -c -m 644 \
tools/designer/templates/*.ui $RPM_BUILD_ROOT%{l_prefix}/share/qt/templates/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6430 -r1.6431 news.txt
--- openpkg-web/news.txt 6 Sep 2003 08:09:55 -0000 1.6430
+++ openpkg-web/news.txt 6 Sep 2003 13:32:46 -0000 1.6431
@@ -1,3 +1,4 @@
+06-Sep-2003: Upgraded package: P<qt-3.2.1-20030906>
06-Sep-2003: Upgraded package: P<pnetlib-0.5.12-20030906>
06-Sep-2003: Upgraded package: P<pnet-0.5.12-20030906>
06-Sep-2003: Upgraded package: P<postfix-2.0.15-20030906>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
