Author: wrobell Date: Thu Apr 16 10:19:20 2009 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- lang files got version suffix, fixed
---- Files affected:
SPECS:
postgresql.spec (1.417.2.1 -> 1.417.2.2)
---- Diffs:
================================================================
Index: SPECS/postgresql.spec
diff -u SPECS/postgresql.spec:1.417.2.1 SPECS/postgresql.spec:1.417.2.2
--- SPECS/postgresql.spec:1.417.2.1 Thu Apr 16 03:14:49 2009
+++ SPECS/postgresql.spec Thu Apr 16 12:19:15 2009
@@ -10,6 +10,9 @@
%bcond_with absolute_dbpaths # enable absolute paths to create
database
# (disabled by default because it is a
security risk)
#
+
+%define beta beta1
+
Summary: PostgreSQL Data Base Management System
Summary(de.UTF-8): PostgreSQL Datenbankverwaltungssystem
Summary(es.UTF-8): Gestor de Banco de Datos PostgreSQL
@@ -21,11 +24,11 @@
Summary(uk.UTF-8): PostgreSQL - система керування базами даних
Summary(zh_CN.UTF-8): PostgreSQL 客户端程序和库文件
Name: postgresql
-Version: 8.4beta1
-Release: 0.1
+Version: 8.4
+Release: 0.%{beta}.1
License: BSD
Group: Applications/Databases
-Source0:
ftp://ftp.postgresql.org/pub/source/v8.4beta/%{name}-%{version}.tar.bz2
+Source0:
ftp://ftp.postgresql.org/pub/source/v8.4beta/%{name}-%{version}%{beta}.tar.bz2
# Source0-md5: d007478ee15faceeb85a6afe50e701a3
Source1: %{name}.init
Source2: pgsql-Database-HOWTO-html.tar.gz
@@ -754,7 +757,7 @@
Różne moduły dołączone do PostgreSQL-a.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}%{beta}
%patch0 -p1
%{?with_absolute_dbpaths:%patch1 -p1}
%patch2 -p1
@@ -847,12 +850,15 @@
%endif
# find locales
-for f in libpq pg_controldata pg_dump pg_resetxlog pgscripts postgres psql
initdb pg_ctl pg_config; do
- %find_lang $f
+for f in libpq5 pg_controldata pg_dump pg_resetxlog pgscripts postgres psql
initdb pg_ctl pg_config; do
+ %find_lang $f-%{version}
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-%{version}.lang pg_resetxlog-%{version}.lang \
+ postgres-%{version}.lang pg_controldata-%{version}.lang \
+ > main-%{version}.lang
+cat pg_dump-%{version}.lang psql-%{version}.lang initdb-%{version}.lang \
+ pg_ctl-%{version}.lang > clients-%{version}.lang
# Remove Contrib documentation. We use macro %doc
rm -rf $RPM_BUILD_ROOT/contrib
@@ -924,14 +930,14 @@
%post ecpg -p /sbin/ldconfig
%postun ecpg -p /sbin/ldconfig
-%files -f main.lang
+%files -f main-%{version}.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
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/sysconfig/postgresql
%attr(755,root,root) %{_bindir}/initdb
-%attr(755,root,root) %{_bindir}/ipcclean
+#%attr(755,root,root) %{_bindir}/ipcclean
%attr(755,root,root) %{_bindir}/pg_controldata
%attr(755,root,root) %{_bindir}/pg_ctl
%attr(755,root,root) %{_bindir}/pg_resetxlog
@@ -961,7 +967,7 @@
%attr(640,postgres,postgres) %config(noreplace) %verify(not md5 mtime size)
/var/log/pgsql
%{_mandir}/man1/initdb.1*
-%{_mandir}/man1/ipcclean.1*
+#%{_mandir}/man1/ipcclean.1*
%{_mandir}/man1/pg_controldata.1*
%{_mandir}/man1/pg_ctl.1*
%{_mandir}/man1/pg_resetxlog.1*
@@ -973,7 +979,7 @@
%doc doc/unpacked/* doc/src/FAQ howto
%{_examplesdir}/%{name}-%{version}
-%files libs -f libpq.lang
+%files libs -f libpq5-%{version}.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libpq.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libpq.so.5
@@ -997,11 +1003,12 @@
%attr(755,root,root) %{_libdir}/libpgtypes.so
%{_includedir}/ecpg*
-%files devel -f pg_config.lang
+%files devel -f pg_config-%{version}.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/pg_config
%attr(755,root,root) %{_libdir}/libpq.so
%dir %{_includedir}/postgresql
+%{_includedir}/libpq-events.h
%{_includedir}/libpq-fe.h
%{_includedir}/pg_config.h
%{_includedir}/pg_config_manual.h
@@ -1032,7 +1039,7 @@
%{_libdir}/libpgtypes.a
%{_libdir}/libpgport.a
-%files clients -f clients.lang
+%files clients -f clients-%{version}.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/clusterdb
%attr(755,root,root) %{_bindir}/createdb
@@ -1128,7 +1135,7 @@
%attr(755,root,root) %{_pgmoduledir}/btree_gist.so
%attr(755,root,root) %{_pgmoduledir}/chkpass.so
%attr(755,root,root) %{_pgmoduledir}/hstore.so
-%attr(755,root,root) %{_pgmoduledir}/int_aggregate.so
+#%attr(755,root,root) %{_pgmoduledir}/int_aggregate.so
%attr(755,root,root) %{_pgmoduledir}/isn.so
%attr(755,root,root) %{_pgmoduledir}/ltree.so
%attr(755,root,root) %{_pgmoduledir}/pageinspect.so
@@ -1172,6 +1179,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.417.2.2 2009/04/16 10:19:15 wrobell
+- lang files got version suffix, fixed
+
Revision 1.417.2.1 2009/04/16 01:14:49 wrobell
- started to work on postgresql 8.4 beta 1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/postgresql.spec?r1=1.417.2.1&r2=1.417.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
