rpms/postgresql
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Install Pgtcl in /usr/lib/tcl$TCL_VERSION, not directly in /usr/lib

Browse Source
This commit is contained in:
Tom Lane 2008-06-20 16:54:12 +00:00
parent 493aa00b1a
commit 898ed62300
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
postgresql.spec
View File

@ -83,7 +83,7 @@
Summary: PostgreSQL client programs and libraries Summary: PostgreSQL client programs and libraries
Name: postgresql Name: postgresql
Version: 8.3.3 Version: 8.3.3
Release: 1%{?dist} Release: 2%{?dist}
License: BSD License: BSD
Group: Applications/Databases Group: Applications/Databases
Url: http://www.postgresql.org/ Url: http://www.postgresql.org/
@ -305,7 +305,7 @@ Summary: A Tcl client library for PostgreSQL
Group: Applications/Databases Group: Applications/Databases
# this is intentionally not a version-specific Requires: # this is intentionally not a version-specific Requires:
Requires: libpq.so Requires: libpq.so
Requires: tcl >= 8.3 Requires: tcl >= 8.5
Obsoletes: rh-postgresql-tcl Obsoletes: rh-postgresql-tcl
%description tcl %description tcl
@ -520,9 +520,17 @@ install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
%if %tcl %if %tcl
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/Pgtcl TCL_VERSION=`echo 'puts $tcl_version' | tclsh`
cp Pgtcl/pkgIndex.tcl $RPM_BUILD_ROOT%{_libdir}/Pgtcl TCLLIBDIR="%{_libdir}/tcl$TCL_VERSION"
cp Pgtcl/libpgtcl*.so $RPM_BUILD_ROOT%{_libdir}/Pgtcl # check the target directory is a dir, not a symlink
if [ -h "$TCLLIBDIR" ] ; then
echo "$TCLLIBDIR must not be a symlink"
exit 1
fi
PGTCL_DIR="${RPM_BUILD_ROOT}${TCLLIBDIR}/Pgtcl"
install -d -m 755 "$PGTCL_DIR"
cp Pgtcl/pkgIndex.tcl "$PGTCL_DIR"
cp Pgtcl/libpgtcl*.so "$PGTCL_DIR"
%endif %endif
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
@ -808,7 +816,7 @@ rm -rf $RPM_BUILD_ROOT
%if %tcl %if %tcl
%files tcl %files tcl
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/Pgtcl/ %{_libdir}/tcl*/Pgtcl/
%doc Pgtcl-docs/* %doc Pgtcl-docs/*
%endif %endif
@ -851,6 +859,14 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Fri Jun 20 2008 Tom Lane <tgl@redhat.com> 8.3.3-2
- Install Pgtcl in /usr/lib/tcl$TCL_VERSION, not directly in /usr/lib.
Needed because tcl 8.5 no longer puts /usr/lib into its package search path.
NOTE: do not back-port this change into branches using pre-8.5 tcl, because
/usr/lib/tcl8.4 had been a symlink to /usr/share/tcl8.4, and /usr/share
is exactly where we must not put Pgtcl.
Resolves: #228263
* Wed Jun 11 2008 Tom Lane <tgl@redhat.com> 8.3.3-1 * Wed Jun 11 2008 Tom Lane <tgl@redhat.com> 8.3.3-1
- Update to PostgreSQL 8.3.3. - Update to PostgreSQL 8.3.3.
- Remove postgresql-prefer-ncurses.patch, no longer needed in recent - Remove postgresql-prefer-ncurses.patch, no longer needed in recent