packages: postgresql/postgresql.spec - fixed beta stuff removal

[baggins]

Author: baggins                      Date: Thu Jul  2 15:29:16 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed beta stuff removal

---- Files affected:
packages/postgresql:
   postgresql.spec (1.425 -> 1.426) 

---- Diffs:

================================================================
Index: packages/postgresql/postgresql.spec
diff -u packages/postgresql/postgresql.spec:1.425 packages/postgresql/postgresql.spec:1.426
--- packages/postgresql/postgresql.spec:1.425	Thu Jul  2 17:15:03 2009
+++ packages/postgresql/postgresql.spec	Thu Jul  2 17:29:11 2009
@@ -10,6 +10,10 @@
 %bcond_with	absolute_dbpaths	# enable absolute paths to create database
 					# (disabled by default because it is a security risk)
 #
+
+%define beta %{nil}
+%define mver 8.4
+
 Summary:	PostgreSQL Data Base Management System
 Summary(de.UTF-8):	PostgreSQL Datenbankverwaltungssystem
 Summary(es.UTF-8):	Gestor de Banco de Datos PostgreSQL
@@ -21,7 +25,7 @@
 Summary(uk.UTF-8):	PostgreSQL - система керування базами даних
 Summary(zh_CN.UTF-8):	PostgreSQL 客户端程序和库文件
 Name:		postgresql
-Version:	8.4.0
+Version:	%{mver}.0
 Release:	0.1
 License:	BSD
 Group:		Applications/Databases
@@ -849,14 +853,14 @@
 
 # find locales
 for f in libpq5 pg_controldata pg_dump pg_resetxlog pgscripts postgres psql initdb pg_ctl pg_config plpgsql ecpg ecpglib6 plperl plpgsql plpython; do
-	%find_lang $f
+	%find_lang $f-%{mver}
 done
 # merge locales
-cat pgscripts.lang pg_resetxlog.lang \
-    postgres.lang pg_controldata.lang \
-    > main.lang
-cat pg_dump.lang psql.lang initdb.lang \
-    pg_ctl.lang > clients.lang
+cat pgscripts-%{mver}.lang pg_resetxlog-%{mver}.lang \
+    postgres-%{mver}.lang pg_controldata-%{mver}.lang \
+    > main-%{mver}.lang
+cat pg_dump-%{mver}.lang psql-%{mver}.lang initdb-%{mver}.lang \
+    pg_ctl-%{mver}.lang > clients-%{mver}.lang
 
 # Remove Contrib documentation. We use macro %doc
 rm -rf $RPM_BUILD_ROOT/contrib
@@ -928,7 +932,7 @@
 %post	ecpg -p /sbin/ldconfig
 %postun	ecpg -p /sbin/ldconfig
 
-%files -f main.lang
+%files -f main-%{mver}.lang
 %defattr(644,root,root,755)
 %doc COPYRIGHT README HISTORY doc/{FAQ*,README*,bug.template}
 %attr(754,root,root) /etc/rc.d/init.d/postgresql
@@ -975,7 +979,7 @@
 %doc doc/unpacked/* doc/src/FAQ howto
 %{_examplesdir}/%{name}-%{version}
 
-%files libs -f libpq5.lang
+%files libs -f libpq5-%{mver}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpq.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libpq.so.5
@@ -999,7 +1003,7 @@
 %attr(755,root,root) %{_libdir}/libpgtypes.so
 %{_includedir}/ecpg*
 
-%files devel -f pg_config.lang
+%files devel -f pg_config-%{mver}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pg_config
 %attr(755,root,root) %{_libdir}/libpq.so
@@ -1035,7 +1039,7 @@
 %{_libdir}/libpgtypes.a
 %{_libdir}/libpgport.a
 
-%files clients -f clients.lang
+%files clients -f clients-%{mver}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/clusterdb
 %attr(755,root,root) %{_bindir}/createdb
@@ -1178,6 +1182,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.426  2009/07/02 15:29:11  baggins
+- fixed beta stuff removal
+
 Revision 1.425  2009/07/02 15:15:03  baggins
 - removed more beta leftovers
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/postgresql/postgresql.spec?r1=1.425&r2=1.426&f=u