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-Feb-2007 09:44:27
Branch: OPENPKG_2_STABLE Handle: 2007020608442600
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/postgresql postgresql.spec
Log:
Ops, fix merge conflict
Summary:
Revision Changes Path
1.197.2.6 +0 -5 openpkg-src/postgresql/postgresql.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/postgresql/postgresql.spec
============================================================================
$ cvs diff -u -r1.197.2.5 -r1.197.2.6 postgresql.spec
--- openpkg-src/postgresql/postgresql.spec 6 Feb 2007 08:43:32 -0000
1.197.2.5
+++ openpkg-src/postgresql/postgresql.spec 6 Feb 2007 08:44:26 -0000
1.197.2.6
@@ -84,13 +84,8 @@
BuildPreReq: readline, zlib, openssl, getopt
PreReq: readline, zlib, openssl, getopt
%if "%{with_perl}" == "yes"
-<<<<<<< postgresql.spec
BuildPreReq: perl, perl-openpkg >= 2.20061018
PreReq: perl
-=======
-BuildPreReq: perl >= %{V_perl}, perl-openpkg >= 2.20061018
-PreReq: perl >= %{V_perl}
->>>>>>> 1.229
%endif
%if "%{with_odbc}" == "yes"
BuildPreReq: unixodbc
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
