Author: qboosh                       Date: Fri Jul  1 21:20:55 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- simplified versioning again after slony1 removal

---- Files affected:
SPECS:
   postgresql.spec (1.329 -> 1.330) 

---- Diffs:

================================================================
Index: SPECS/postgresql.spec
diff -u SPECS/postgresql.spec:1.329 SPECS/postgresql.spec:1.330
--- SPECS/postgresql.spec:1.329 Fri Jul  1 09:26:01 2005
+++ SPECS/postgresql.spec       Fri Jul  1 23:20:49 2005
@@ -14,8 +14,6 @@
 %bcond_with    php                     # enable PHP support
 %bcond_with    absolute_dbpaths        # enable absolute paths to create 
database
                                        # (disabled by default because it is a 
security risk)
-%define                postgresql_version      8.0.3
-%define                postgresql_release      3.1
 
 Summary:       PostgreSQL Data Base Management System
 Summary(de):   PostgreSQL Datenbankverwaltungssystem
@@ -28,11 +26,11 @@
 Summary(uk):   PostgreSQL - ÓÉÓÔĹÍÁ ËĹŇŐ×ÁÎÎŃ ÂÁÚÁÍÉ ÄÁÎÉČ
 Summary(zh_CN):        PostgreSQL żÍť§śËłĚĐňşÍżâÎÄźţ
 Name:          postgresql
-Version:       %{postgresql_version}
-Release:       %{postgresql_release}
+Version:       8.0.3
+Release:       3.1
 License:       BSD
 Group:         Applications/Databases
-Source0:       
ftp://ftp.postgresql.org/pub/source/v%{postgresql_version}/%{name}-%{postgresql_version}.tar.bz2
+Source0:       
ftp://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
 # Source0-md5: c0914a133ce6c1e0f1d8b93982d6e881
 ##Source0:     
ftp://ftp.postgresql.org/pub/source/v%{version}beta/%{name}-%{version}%{beta}.tar.bz2
 Source1:       %{name}.init
@@ -73,8 +71,8 @@
 %{?with_tcl:BuildRequires:     tcl-devel >= 8.4.3}
 BuildRequires: zlib-devel
 PreReq:                rc-scripts
-PreReq:                %{name}-clients = 
%{postgresql_version}-%{postgresql_release}
-PreReq:                %{name}-libs = 
%{postgresql_version}-%{postgresql_release}
+PreReq:                %{name}-clients = %{version}-%{release}
+PreReq:                %{name}-libs = %{version}-%{release}
 Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/groupadd
@@ -83,7 +81,7 @@
 Requires(post,preun):  /sbin/chkconfig
 Obsoletes:     postgresql-server
 Obsoletes:     postgresql-test
-BuildRoot:     %{tmpdir}/%{name}-%{postgresql_version}-root-%(id -u -n)
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pgmoduledir    %{_libdir}/postgresql
 %define                _pgsqldir       %{_datadir}/postgresql/contrib
@@ -321,7 +319,7 @@
 Summary(tr):   PostgreSQL baţlýk dosyalarý ve kitaplýklar
 Summary(uk):   PostgreSQL - ČĹÄĹŇÉ ÔÁ ÂŚÂĚŚĎÔĹËÉ ĐŇĎÇŇÁÍŚÓÔÁ
 Group:         Development/Libraries
-Requires:      %{name}-libs = %{postgresql_version}-%{postgresql_release}
+Requires:      %{name}-libs = %{version}-%{release}
 
 %description devel
 This package contains header files and libraries required to compile
@@ -368,8 +366,8 @@
 Summary:       PostgreSQL backend development header files
 Summary(pl):   PostgreSQL - pliki nagłówkowe dla backendu
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{postgresql_version}-%{postgresql_release}
-Requires:      %{name}-libs = %{postgresql_version}-%{postgresql_release}
+Requires:      %{name}-devel = %{version}-%{release}
+Requires:      %{name}-libs = %{version}-%{release}
 
 %description backend-devel
 This package contains header files required to compile functions that
@@ -387,7 +385,7 @@
 Summary(ru):   ëĚÉĹÎÔÓËÉĹ ĐŇĎÇŇÁÍÍŮ, ÎĹĎÂČĎÄÉÍŮĹ ÄĚŃ ÄĎÓÔŐĐÁ Ë ÓĹŇ×ĹŇŐ 
PostgreSQL
 Summary(uk):   ëĚŚ¤ÎÔÓŘËŚ ĐŇĎÇŇÁÍÉ, ÎĹĎÂČŚÄÎŚ ÄĚŃ ÄĎÓÔŐĐŐ ÄĎ ÓĹŇ×ĹŇÁ PostgreSQL
 Group:         Applications/Databases
-Requires:      %{name}-libs = %{postgresql_version}-%{postgresql_release}
+Requires:      %{name}-libs = %{version}-%{release}
 
 %description clients
 This package includes only the clients needed to access an PostgreSQL
@@ -467,7 +465,7 @@
 Summary:       Embedded SQL in C interface
 Summary(pl):   Interfejs wbudowanego SQL-a w język C
 Group:         Libraries
-Requires:      %{name}-libs = %{postgresql_version}-%{postgresql_release}
+Requires:      %{name}-libs = %{version}-%{release}
 
 %description ecpg
 Embedded SQL in C interface.
@@ -479,8 +477,8 @@
 Summary:       Embedded SQL in C interface files
 Summary(pl):   Pliki programistyczne interfejsu wbudowanego SQL-a w język C
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{postgresql_version}-%{postgresql_release}
-Requires:      %{name}-ecpg = %{postgresql_version}-%{postgresql_release}
+Requires:      %{name}-devel = %{version}-%{release}
+Requires:      %{name}-ecpg = %{version}-%{release}
 
 %description ecpg-devel
 Embedded SQL in C interface files.
@@ -496,7 +494,7 @@
 Summary(ru):   óÔÁÔÉŢĹÓËÉĹ ÂÉÂĚÉĎÔĹËÉ ÄĚŃ ĐŇĎÇŇÁÍÍÉŇĎ×ÁÎÉŃ Ó PostgreSQL
 Summary(uk):   óÔÁÔÉŢÎŚ ÂŚÂĚŚĎÔĹËÉ ÄĚŃ ĐŇĎÇŇÁÍŐ×ÁÎÎŃ Ú PostgreSQL
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{postgresql_version}-%{postgresql_release}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 PostgreSQL static libraries.
@@ -526,7 +524,7 @@
 Summary:       PL/pgSQL - PostgreSQL procedural language
 Summary(pl):   PL/pgSQL - język proceduralny bazy danych PostgreSQL
 Group:         Applications/Databases
-Requires:      %{name} = %{postgresql_version}-%{postgresql_release}
+Requires:      %{name} = %{version}-%{release}
 
 %description module-plpgsql
 From PostgreSQL documentation:
@@ -560,7 +558,7 @@
 Summary:       PL/perl - PostgreSQL procedural language
 Summary(pl):   PL/perl - język proceduralny bazy danych PostgreSQL
 Group:         Applications/Databases
-Requires:      %{name} = %{postgresql_version}-%{postgresql_release}
+Requires:      %{name} = %{version}-%{release}
 Requires:      perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print 
DynaLoader->VERSION')
 
 %description module-plperl
@@ -595,7 +593,7 @@
 Summary:       PL/PHP - PostgreSQL procedural language
 Summary(pl):   PL/PHP - język proceduralny bazy danych PostgreSQL
 Group:         Applications/Databases
-Requires:      %{name} = %{postgresql_version}-%{postgresql_release}
+Requires:      %{name} = %{version}-%{release}
 
 %description module-plphp
 From PostgreSQL documentation:
@@ -629,7 +627,7 @@
 Summary:       PL/Python - PostgreSQL procedural language
 Summary(pl):   PL/Python - język proceduralny bazy danych PostgreSQL
 Group:         Applications/Databases
-Requires:      %{name} = %{postgresql_version}-%{postgresql_release}
+Requires:      %{name} = %{version}-%{release}
 %pyrequires_eq python
 
 %description module-plpython
@@ -664,7 +662,7 @@
 Summary:       PL/Tcl - PostgreSQL procedural language
 Summary(pl):   PL/Tcl - język proceduralny bazy danych PostgreSQL
 Group:         Applications/Databases
-Requires:      %{name} = %{postgresql_version}-%{postgresql_release}
+Requires:      %{name} = %{version}-%{release}
 
 %description module-pltcl
 From PostgreSQL documentation:
@@ -698,7 +696,7 @@
 Summary:       Cryptographic functions for PostgreSQL
 Summary(pl):   Funkcje kryptograficzne dla PostgreSQL
 Group:         Applications/Databases
-Requires:      %{name} = %{postgresql_version}-%{postgresql_release}
+Requires:      %{name} = %{version}-%{release}
 
 %description module-pgcrypto
 Cryptographic functions for PostgreSQL.
@@ -710,7 +708,7 @@
 Summary:       Full text extension for PostgreSQL
 Summary(pl):   Rozszerzenie pełnotekstowe dla PostgreSQL-a
 Group:         Applications/Databases
-Requires:      %{name} = %{postgresql_version}-%{postgresql_release}
+Requires:      %{name} = %{version}-%{release}
 
 %description module-tsearch2
 Implementation of a new data type tsvector - a searchable data type
@@ -1089,6 +1087,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.330  2005/07/01 21:20:49  qboosh
+- simplified versioning again after slony1 removal
+
 Revision 1.329  2005/07/01 07:26:01  jajcus
 - slony1 removed -- version 1.1 may be built separately
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/postgresql.spec?r1=1.329&r2=1.330&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to