- fixed beta stuff removal

Changed files:
    postgresql.spec -> 1.426

diff --git a/postgresql.spec b/postgresql.spec
index 463bf55c89b6eb289cf40d9c064c9560f70d7c7d..24f5d0e9aa7507d245d3c3d34e96ca87f572ef63 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -9,6 +9,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
@@ -20,7 +24,7 @@ Summary(tr.UTF-8):    Veri Tabanı Yönetim Sistemi
 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
@@ -848,14 +852,14 @@ tar zxf %{SOURCE2} -C howto
 
 # 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
@@ -927,7 +931,7 @@ fi
 %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
@@ -974,7 +978,7 @@ fi
 %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
@@ -998,7 +1002,7 @@ fi
 %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
@@ -1034,7 +1038,7 @@ fi
 %{_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