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: 08-Sep-2003 09:25:18
Branch: HEAD Handle: 2003090808251602
Modified files:
openpkg-src/qt qt.spec
openpkg-web news.txt
Log:
Patch pc files more and require sed to match tabs correctly
Summary:
Revision Changes Path
1.84 +13 -5 openpkg-src/qt/qt.spec
1.6444 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
============================================================================
$ cvs diff -u -r1.83 -r1.84 qt.spec
--- openpkg-src/qt/qt.spec 6 Sep 2003 13:32:48 -0000 1.83
+++ openpkg-src/qt/qt.spec 8 Sep 2003 07:25:18 -0000 1.84
@@ -33,7 +33,7 @@
Group: XWindow
License: GPL
Version: 3.2.1
-Release: 20030906
+Release: 20030908
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -50,7 +50,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, X11, freetype, gcc
+BuildPreReq: OpenPKG, openpkg >= 20030103, X11, freetype, gcc, sed
PreReq: OpenPKG, openpkg >= 20030103, X11, freetype
%if "%{with_pgsql}" == "yes"
BuildPreReq: postgresql
@@ -283,11 +283,19 @@
) || exit $?
%endif
- # patch and prepare pkg-config (.pc) files
+ # patch the badly generated pkg-config (.pc) files
mv qt.pc lib
%{l_shtool} subst \
- -e 's;[ \t]*$;;g' \
- -e 's;\(Libs.*$\);\1 -pthread;g' \
+ -e "s;-l/.*\.pc ;;g" \
+ -e "s;-L[^ \t]*[ \t];;g" \
+ -e "s;Libs:;Libs: %{l_ldflags} -L${l_x11_libdir};g" \
+ -e "s;\t; ;g" \
+ -e "s; \+; ;g" \
+ -e "s; *$;;g" \
+ lib/qt.pc \
+ lib/qt-mt.pc
+ %{l_shtool} subst \
+ -e "s;\(Libs.*$\);\1 -pthread;g" \
lib/qt-mt.pc
%endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6443 -r1.6444 news.txt
--- openpkg-web/news.txt 8 Sep 2003 06:08:23 -0000 1.6443
+++ openpkg-web/news.txt 8 Sep 2003 07:25:16 -0000 1.6444
@@ -1,3 +1,4 @@
+08-Sep-2003: Upgraded package: P<qt-3.2.1-20030908>
08-Sep-2003: Upgraded package: P<openpkg-20030908-20030908>
07-Sep-2003: Upgraded package: P<snmp-5.0.9-20030907>
07-Sep-2003: Upgraded package: P<pgadmin-0.9.3.20030907-20030907>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
