On Wednesday 17 of December 2003 14:03, wrobell wrote:
> On Wed, Dec 17, 2003 at 01:54:50PM +0100, Paweł Sikora wrote:
> > On Wednesday 17 of December 2003 13:26, wrobell wrote:
> > > On Wed, Dec 17, 2003 at 01:19:59PM +0100, Paweł Sikora wrote:
> > > > ok, u mnie sie zbudowalo, odpalilem i dziala.
> > > > czy ktos doswiadczony w specach moze sprawdzic poprawki?
> > >
> > > wygląda ok, tylko pliki *.sql powinny trafiać do /usr/share/postgresql/
> > >
> > > względem jakiej wersji spec-a robiłeś zmiany? nie wygląda to na HEAD...
> >
> > cvs rev = 1.242
>
> nie wygląda:
>
> @@ -1095,6 +1110,13 @@
> #%{_datadir}/%{name}/contrib/pgcrypto.sql
> #%{_datadir}/info/%{name}/contrib/README.pgcrypto.gz
>
> +%files module-tsearch2
> +%defattr(644,root,root,755)
> +%attr(755,root,root) %{_pgmoduledir}/tsearch2.so
> +%dir %{_datadir}/%{name}/contrib
> +%attr(644,root,root) %{_datadir}/%{name}/contrib/tsearch2.sql
> +%attr(644,root,root) %{_datadir}/%{name}/contrib/untsearch2.sql
>
> zakomentowane linijki z Twojego patch-a 1.242, to:
>
> %{_datadir}/%{name}/pgcrypto.sql
>
pgcrypto tak juz bylo:
%files module-pgcrypto
%defattr(644,root,root,755)
%attr(755,root,root) %{_pgmoduledir}/pgcrypto.so
# Hmm i think two below lines shouldn't be here - but i can be wrong ;)
#%{_datadir}/%{name}/contrib/pgcrypto.sql
#%{_datadir}/info/%{name}/contrib/README.pgcrypto.gz
no popatrz:
# [pluto]-[~/rpm/SPECS] # cvs up postgresql.spec
# [pluto]-[~/rpm/SPECS] # diff -u postgresql.spec-fixed postgresql.spec
i intersujacy nas fragment:
+%{__make} -C contrib/tsearch2 install \
+ DESTDIR=$RPM_BUILD_ROOT
+
touch $RPM_BUILD_ROOT/var/log/pgsql
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
@@ -1095,6 +1110,13 @@
#%{_datadir}/%{name}/contrib/pgcrypto.sql
#%{_datadir}/info/%{name}/contrib/README.pgcrypto.gz
+%files module-tsearch2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_pgmoduledir}/tsearch2.so
+%dir %{_datadir}/%{name}/contrib
+%attr(644,root,root) %{_datadir}/%{name}/contrib/tsearch2.sql
+%attr(644,root,root) %{_datadir}/%{name}/contrib/untsearch2.sql
+
widzisz jakies "+" przy # pgcrypto?
--
The only thing necessary for the triumph of evil
is for good men to do nothing.
- Edmund Burke
--- postgresql.spec 2003-12-17 13:57:15.000000000 +0100
+++ postgresql.spec-fixed 2003-12-17 12:43:36.000000000 +0100
@@ -52,6 +52,7 @@
Patch6: %{name}-com_err.patch
Patch7: %{name}-ecpg_link.patch
Patch8: %{name}-ecpg-includedir.patch
+Patch9: %{name}-tsearch2-compound-word-support-20031210.patch
Icon: postgresql.xpm
URL: http://www.postgresql.org/
BuildRequires: autoconf
@@ -742,6 +743,15 @@
%description module-pgcrypto -l pl
Funkcje kryptograficzne dla PostgreSQL.
+%package module-tsearch2
+Summary: Full text extension for PostgreSQL
+Group: Applications/Databases
+Requires: %{name} = %{version}
+
+%description module-tsearch2
+Implementation of a new data type tsvector - a searchable data type with indexed access.
+URL :http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/
+
%prep
%setup -q
%patch0 -p1
@@ -753,6 +763,7 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
tar xzf doc/man*.tar.gz
@@ -791,6 +802,7 @@
%{__make}
%{__make} -C contrib/pg_autovacuum
%{__make} -C contrib/pgcrypto
+%{__make} -C contrib/tsearch2
%ifnarch sparc sparcv9 sparc64 alpha ppc
%{?with_tests:%{__make} check}
%endif
@@ -813,6 +825,9 @@
%{__make} -C contrib/pgcrypto install \
DESTDIR=$RPM_BUILD_ROOT
+%{__make} -C contrib/tsearch2 install \
+ DESTDIR=$RPM_BUILD_ROOT
+
touch $RPM_BUILD_ROOT/var/log/pgsql
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
@@ -1095,6 +1110,13 @@
#%{_datadir}/%{name}/contrib/pgcrypto.sql
#%{_datadir}/info/%{name}/contrib/README.pgcrypto.gz
+%files module-tsearch2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_pgmoduledir}/tsearch2.so
+%dir %{_datadir}/%{name}/contrib
+%attr(644,root,root) %{_datadir}/%{name}/contrib/tsearch2.sql
+%attr(644,root,root) %{_datadir}/%{name}/contrib/untsearch2.sql
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
__________________________________________________________
nie pytaj co inni zrobili dla pld, pomysl ile sam zrobiles
