Author: qboosh Date: Thu Feb 17 12:07:51 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- build tutorial, package pgxs files; sorted configure options
- changed .sysconfig to default to standard, one-cluster setting
---- Files affected:
SPECS:
postgresql.spec (1.311 -> 1.312)
---- Diffs:
================================================================
Index: SPECS/postgresql.spec
diff -u SPECS/postgresql.spec:1.311 SPECS/postgresql.spec:1.312
--- SPECS/postgresql.spec:1.311 Thu Feb 17 09:56:34 2005
+++ SPECS/postgresql.spec Thu Feb 17 13:07:45 2005
@@ -2,7 +2,6 @@
#
# TODO:
# - pg_autovacuum init support? look at its readme file, please
-# - fix tutorial building
#
# Conditional build:
%bcond_without tests # disable testing
@@ -724,7 +723,6 @@
%prep
%setup -q -a4
-#%setup -q -n %{name}-%{version}%{beta}
%patch0 -p1
%{?with_absolute_dbpaths:%patch1 -p1}
%patch2 -p1
@@ -742,29 +740,27 @@
#find contrib -type d -name CVS -exec rm -rf {} \;
%build
-#rm -f config/libtool.m4
-#install /usr/share/automake/config.* config
%{__aclocal} -I config
%{__autoconf}
%configure \
CFLAGS="%{rpmcflags} -DNEED_REENTRANT_FUNCS" \
+ --disable-rpath \
+ --enable-depend \
+ --enable-integer-datetimes \
%{?with_pgsql_locale:--enable-locale} \
%{?with_pgsql_multibyte:--enable-multibyte} \
- --disable-rpath \
--enable-nls \
- --enable-thread-safety \
- --enable-integer-datetimes \
- --enable-depend \
--enable-recode \
--enable-syslog \
- --with-pam \
+ --enable-thread-safety \
--enable-unicode-conversion \
--with-CXX \
- %{?with_tcl:--with-tcl} \
- %{?with_perl:--with-perl} \
- %{?with_python:--with-python} \
%{?with_kerberos5:--with-krb5} \
--with-openssl \
+ --with-pam \
+ %{?with_perl:--with-perl} \
+ %{?with_python:--with-python} \
+ %{?with_tcl:--with-tcl} \
--with-x \
--without-docdir
@@ -773,7 +769,8 @@
%{__make} -C contrib/pgcrypto
%{__sed} -i 's:contrib/::g' contrib/tsearch2/tsearch.sql.in
%{__make} -C contrib/tsearch2
-#%{__make} -C src/tutorial
+%{__make} -C src/tutorial \
+ NO_PGXS=1
%ifnarch sparc sparcv9 sparc64 alpha
%{?with_tests:%{__make} check}
%endif
@@ -787,7 +784,6 @@
cd ..
%endif
-
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig}} \
@@ -796,7 +792,7 @@
$RPM_BUILD_ROOT%{_mandir} \
$RPM_BUILD_ROOT/home/services/postgres
-#install src/tutorial/*.sql $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+install src/tutorial/*.sql $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -994,7 +990,6 @@
%attr(755,root,root) %{_pgmoduledir}/utf*
%dir %{_pgsqldir}
-%dir %{_pgmoduledir}
%dir %{_datadir}/postgresql
%dir %{_datadir}/postgresql/timezone
%{_datadir}/postgresql/*.bki
@@ -1031,6 +1026,7 @@
%files libs -f libpq.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libpq.so.*.*
+%dir %{_pgmoduledir}
%files ecpg
%defattr(644,root,root,755)
@@ -1070,6 +1066,9 @@
%files backend-devel
%defattr(644,root,root,755)
%{_includedir}/postgresql/server
+%dir %{_pgmoduledir}/pgxs
+%attr(755,root,root) %{_pgmoduledir}/pgxs/config
+%{_pgmoduledir}/pgxs/src
%files static
%defattr(644,root,root,755)
@@ -1151,6 +1150,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.312 2005/02/17 12:07:45 qboosh
+- build tutorial, package pgxs files; sorted configure options
+- changed .sysconfig to default to standard, one-cluster setting
+
Revision 1.311 2005/02/17 08:56:34 zboczuch
- new release to fetch new init script
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/postgresql.spec?r1=1.311&r2=1.312&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
