rpms/postgresql/devel postgresql.spec,1.97,1.98
Tom Lane (tgl)
fedora-extras-commits at redhat.com
Fri Jun 20 16:54:55 UTC 2008
- Previous message: rpms/system-config-printer/devel sources,1.181,1.182
- Next message: rpms/system-config-printer/F-9 system-config-printer-0.7.82.4.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.164, 1.165 sources, 1.171, 1.172 system-config-printer.spec, 1.186, 1.187 system-config-printer-0.7.82.3.tar.bz2.sig, 1.1, NONE system-config-printer-dash.patch, 1.1, NONE system-config-printer-exit-code.patch, 1.1, NONE system-config-printer-install-drivers.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tgl
Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2146
Modified Files:
postgresql.spec
Log Message:
Install Pgtcl in /usr/lib/tcl$TCL_VERSION, not directly in /usr/lib
Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- postgresql.spec 11 Jun 2008 16:18:40 -0000 1.97
+++ postgresql.spec 20 Jun 2008 16:54:12 -0000 1.98
@@ -83,7 +83,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -305,7 +305,7 @@
Group: Applications/Databases
# this is intentionally not a version-specific Requires:
Requires: libpq.so
-Requires: tcl >= 8.3
+Requires: tcl >= 8.5
Obsoletes: rh-postgresql-tcl
%description tcl
@@ -520,9 +520,17 @@
cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
%if %tcl
- install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/Pgtcl
- cp Pgtcl/pkgIndex.tcl $RPM_BUILD_ROOT%{_libdir}/Pgtcl
- cp Pgtcl/libpgtcl*.so $RPM_BUILD_ROOT%{_libdir}/Pgtcl
+ TCL_VERSION=`echo 'puts $tcl_version' | tclsh`
+ TCLLIBDIR="%{_libdir}/tcl$TCL_VERSION"
+ # 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
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
@@ -808,7 +816,7 @@
%if %tcl
%files tcl
%defattr(-,root,root)
-%{_libdir}/Pgtcl/
+%{_libdir}/tcl*/Pgtcl/
%doc Pgtcl-docs/*
%endif
@@ -851,6 +859,14 @@
%endif
%changelog
+* Fri Jun 20 2008 Tom Lane <tgl at 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 at redhat.com> 8.3.3-1
- Update to PostgreSQL 8.3.3.
- Remove postgresql-prefer-ncurses.patch, no longer needed in recent
- Previous message: rpms/system-config-printer/devel sources,1.181,1.182
- Next message: rpms/system-config-printer/F-9 system-config-printer-0.7.82.4.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.164, 1.165 sources, 1.171, 1.172 system-config-printer.spec, 1.186, 1.187 system-config-printer-0.7.82.3.tar.bz2.sig, 1.1, NONE system-config-printer-dash.patch, 1.1, NONE system-config-printer-exit-code.patch, 1.1, NONE system-config-printer-install-drivers.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list