[CVS] OpenPKG: openpkg-src/postgresql postgresql.spec openpkg-web news...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src, openpkg-web Date: 19-Dec-2002 14:37:55
Branch: HEAD Handle: 2002121913375401
Modified files:
openpkg-src/postgresql postgresql.spec
openpkg-web news.txt
Log:
- be consistent with other packages: if we have V_xxx, then for all parts
- be consistent with (most) other packages: first versions, then options
- split over-sized CPPLINE line
- make build loop even more portable by using sed(1) instead of basename(1)
- be more portable and use "ar" commands "rc" plus an "rm" before
- remove extra blank line
Summary:
RevisionChanges Path
1.24+15 -17 openpkg-src/postgresql/postgresql.spec
1.2340 +1 -0 openpkg-web/news.txt
Index: openpkg-src/postgresql/postgresql.spec
$ cvs diff -u -r1.23 -r1.24 postgresql.spec
--- openpkg-src/postgresql/postgresql.spec19 Dec 2002 12:54:07 - 1.23
+++ openpkg-src/postgresql/postgresql.spec19 Dec 2002 13:37:55 - 1.24
@@ -23,6 +23,10 @@
## SUCH DAMAGE.
##
+# package versions
+%define V_postgresql 7.3
+%define V_libpqxx 4.0
+
# package options
%ifndef with_openssl
%define with_openssl no
@@ -37,9 +41,6 @@
%define with_tcl no
%endif
-# package component versions
-%define V_libpqxx 4.0
-
# package information
Name: postgresql
Summary: PostgreSQL Database
@@ -49,11 +50,11 @@
Distribution: OpenPKG [BASE]
Group:Database
License: GPL
-Version: 7.3
+Version: %{V_postgresql}
Release: 20021219
# list of sources
-Source0:
ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
+Source0:
ftp://ftp.postgresql.org/pub/source/v%{V_postgresql}/postgresql-%{V_postgresql}.tar.gz
Source1:
ftp://gborg.postgresql.org/pub/libpqpp/stable/libpq++-%{V_libpqxx}.tar.gz
Source2: rc.postgresql
Source3: pg_migrate
@@ -138,13 +139,16 @@
( cd libpq++-%{V_libpqxx}
CXX="%{l_cxx}"
CFLAGS="%{l_cflags -O}"
- CPPFLAGS="-DHAVE_NAMESPACE_STD -DHAVE_CXX_STRING_HEADER -DDLLIMPORT= -I.
-I../src/interfaces -I../src/interfaces/libpq %{l_cppflags}"
+ CPPFLAGS="-DHAVE_NAMESPACE_STD -DHAVE_CXX_STRING_HEADER -DDLLIMPORT= "
+ CPPFLAGS="$CPPFLAGS -I. -I../src/interfaces -I../src/interfaces/libpq "
+ CPPFLAGS="$CPPFLAGS %{l_cppflags}"
LDFLAGS="%{l_ldflags}"
OBJS="pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.o"
for o in $OBJS; do
- $CXX $CFLAGS $CPPFLAGS $LDFLAGS -c -o $o `basename $o .o`.cc
+ $CXX $CFLAGS $CPPFLAGS $LDFLAGS -c -o $o `echo $o | sed -e 's;\.o$;.cc;'`
done
- ar r libpq++.a $OBJS
+ rm -f libpq++.a
+ ar rc libpq++.a $OBJS
)
%install
@@ -202,17 +206,11 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/include/libpq++
%{l_shtool} install -c -m 644 \
- libpq++.h \
- pgconnection.h \
- pgdatabase.h \
- pgtransdb.h \
- pgcursordb.h \
- pglobject.h \
+ libpq++.h pgconnection.h pgdatabase.h pgtransdb.h pgcursordb.h
pglobject.h \
$RPM_BUILD_ROOT%{l_prefix}/include/libpq++/
%{l_shtool} install -c -m 644 \
libpq++.a \
$RPM_BUILD_ROOT%{l_prefix}/lib/
-
)
# install run-command script
@@ -244,7 +242,7 @@
# database migration dumping hint
v_old_all=`cat $RPM_INSTALL_PREFIX/var/postgresql/db/PG_VERSION`
v_old_maj=`echo "$v_old_all" | sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
-v_new_all="%{version}"
+v_new_all="%{V_postgresql}"
v_new_maj=`echo "$v_new_maj" | sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
if [ ".$v_old_maj" != ".$v_new_maj" ]; then
if [ ! -f $RPM_INSTALL_PREFIX/var/postgresql/db.dump.sql.bz2 -a
".$PG_MIGRATE" != .ignore ]; then
@@ -326,7 +324,7 @@
# database migration restoring hint
v_old_all=`cat $RPM_INSTALL_PREFIX/var/postgresql/db/PG_VERSION`
v_old_maj=`echo "$v_old_all" | sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
-v_new_all="%{version}"
+v_new_all="%{V_postgresql}"
v_new_maj=`echo "$v_new_maj" | sed -e 's/^\([0-9]*\.[0-9]*\).*
[CVS] OpenPKG: openpkg-src/postgresql postgresql.spec openpkg-web news...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 18-Dec-2002 17:09:40
Branch: HEAD Handle: 2002121816093901
Modified files:
openpkg-src/postgresql postgresql.spec
openpkg-web news.txt
Log:
remove library DSOs, but keep other DSOs
Summary:
RevisionChanges Path
1.22+2 -1 openpkg-src/postgresql/postgresql.spec
1.2322 +1 -0 openpkg-web/news.txt
Index: openpkg-src/postgresql/postgresql.spec
$ cvs diff -u -r1.21 -r1.22 postgresql.spec
--- openpkg-src/postgresql/postgresql.spec7 Dec 2002 15:51:04 - 1.21
+++ openpkg-src/postgresql/postgresql.spec18 Dec 2002 16:09:40 - 1.22
@@ -47,7 +47,7 @@
Group:Database
License: GPL
Version: 7.3
-Release: 20021207
+Release: 20021218
# list of sources
Source0:
ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
@@ -141,6 +141,7 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/pgaccess.1
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/pgtclsh.1
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/pgtksh.1
+rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.so*
# namespace adjustments to installation
for prog in \
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2321 -r1.2322 news.txt
--- openpkg-web/news.txt 18 Dec 2002 15:55:16 - 1.2321
+++ openpkg-web/news.txt 18 Dec 2002 16:09:39 - 1.2322
@@ -1,3 +1,4 @@
+18-Dec-2002: Upgraded package: P
18-Dec-2002: Upgraded package: P
18-Dec-2002: Upgraded package: P
18-Dec-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/postgresql postgresql.spec openpkg-web news...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 07-Dec-2002 12:44:40
Branch: HEAD Handle: 2002120711443900
Modified files:
openpkg-src/postgresql postgresql.spec
openpkg-web news.txt
Log:
fix %pre procedure
Summary:
RevisionChanges Path
1.20+2 -2 openpkg-src/postgresql/postgresql.spec
1.2212 +1 -0 openpkg-web/news.txt
Index: openpkg-src/postgresql/postgresql.spec
$ cvs diff -u -r1.19 -r1.20 postgresql.spec
--- openpkg-src/postgresql/postgresql.spec3 Dec 2002 12:10:43 - 1.19
+++ openpkg-src/postgresql/postgresql.spec7 Dec 2002 11:44:39 - 1.20
@@ -47,7 +47,7 @@
Group:Database
License: GPL
Version: 7.3
-Release: 20021203
+Release: 20021207
# list of sources
Source0:
ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.gz
@@ -200,7 +200,7 @@
rm -rf $RPM_BUILD_ROOT
%pre
-if [ $1 -gt 1 ]; then
+if [ $1 -eq 1 ]; then
# initial installation
if [ -f $RPM_INSTALL_PREFIX/var/postgresql/db/PG_VERSION -a \
-f $RPM_INSTALL_PREFIX/bin/pg_migrate ]; then
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2211 -r1.2212 news.txt
--- openpkg-web/news.txt 7 Dec 2002 10:35:55 - 1.2211
+++ openpkg-web/news.txt 7 Dec 2002 11:44:39 - 1.2212
@@ -1,3 +1,4 @@
+07-Dec-2002: Upgraded package: P
07-Dec-2002: Upgraded package: P
06-Dec-2002: Upgraded package: P
06-Dec-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/postgresql postgresql.spec openpkg-web news...
OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 21-Aug-2002 11:13:17
Branch: HEAD Handle: 2002082110131601
Modified files:
openpkg-src/postgresql postgresql.spec
openpkg-web news.txt
Log:
requires flex and bison
Summary:
RevisionChanges Path
1.12+2 -2 openpkg-src/postgresql/postgresql.spec
1.1285 +1 -0 openpkg-web/news.txt
Index: openpkg-src/postgresql/postgresql.spec
$ cvs diff -u -r1.11 -r1.12 postgresql.spec
--- openpkg-src/postgresql/postgresql.spec13 Aug 2002 12:49:32 - 1.11
+++ openpkg-src/postgresql/postgresql.spec21 Aug 2002 09:13:17 - 1.12
@@ -33,7 +33,7 @@
Group:Database
License: GPL
Version: 7.2.1
-Release: 20020509
+Release: 20020821
# list of sources
Source0:
ftp://ftp.de.postgresql.org/mirror/postgresql/source/v7.2/postgresql-%{version}.tar.gz
@@ -42,7 +42,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020416, make, gcc, readline, openssl
+BuildPreReq: OpenPKG, openpkg >= 20020416, make, gcc, readline, openssl, flex,
bison
PreReq: OpenPKG, openpkg >= 20020416
AutoReq: no
AutoReqProv: no
Index: openpkg-web/news.txt
$ cvs diff -u -r1.1284 -r1.1285 news.txt
--- openpkg-web/news.txt 21 Aug 2002 09:08:25 - 1.1284
+++ openpkg-web/news.txt 21 Aug 2002 09:13:16 - 1.1285
@@ -1,3 +1,4 @@
+21-Aug-2002: Upgraded package: P
21-Aug-2002: Upgraded package: P
21-Aug-2002: Upgraded package: P
21-Aug-2002: Upgraded package: P
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
