OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Nov-2005 20:49:10
Branch: HEAD Handle: 2005110619491000
Modified files:
openpkg-src/pgadmin pgadmin.spec
Log:
upgrading package: pgadmin 1.2.2 -> 1.4.0
Summary:
Revision Changes Path
1.49 +7 -9 openpkg-src/pgadmin/pgadmin.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pgadmin/pgadmin.spec
============================================================================
$ cvs diff -u -r1.48 -r1.49 pgadmin.spec
--- openpkg-src/pgadmin/pgadmin.spec 2 Jun 2005 18:10:46 -0000 1.48
+++ openpkg-src/pgadmin/pgadmin.spec 6 Nov 2005 19:49:10 -0000 1.49
@@ -32,8 +32,8 @@
Class: EVAL
Group: Database
License: Artistic
-Version: 1.2.2
-Release: 20050602
+Version: 1.4.0
+Release: 20051106
# list of sources
Source0:
ftp://ftp.postgresql.org/pub/pgadmin3/release/v%{version}/src/pgadmin3-%{version}.tar.gz
@@ -43,8 +43,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: X11, wx >= 2.6.0, postgresql, openssl
-PreReq: X11, wx >= 2.6.0, postgresql, openssl
+BuildPreReq: X11, wx >= 2.6.2-20051106, postgresql, openssl
+PreReq: X11, wx >= 2.6.2-20051106, postgresql, openssl
AutoReq: no
AutoReqProv: no
@@ -65,22 +65,20 @@
%setup -q -n pgadmin3-%{version}
%build
- %{l_shtool} subst \
- -e 's;--libs stc,ogl;--libs stc;' \
- configure
CC="%{l_cc}" \
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O}" \
CXXFLAGS="%{l_cxxflags -O} `wx-config --cxxflags`" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
- LIBS="`wx-config --libs` `wx-config --libs stc` -lpq -lssl -lcrypto
-lcrypt" \
+ LIBS="`wx-config --libs` `wx-config --libs stc ogl` -lpq -lssl -lcrypto
-lcrypt `pkg-config gtk+-2.0 --static --libs`" \
./configure \
--prefix=%{l_prefix} \
--with-wx=%{l_prefix} \
--with-wx-config=wx-config \
--with-pgsql-include=%{l_prefix}/include/postgresql \
- --with-pgsql=%{l_prefix}/lib
+ --with-pgsql=%{l_prefix} \
+ --enable-static
%{l_make} %{l_mflags -O}
%install
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
