rpms/tcl-pgtcl/devel import.log, NONE, 1.1 pgtcl-no-rpath.patch, NONE, 1.1 tcl-pgtcl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Tom Lane]

Author: tgl

Update of /cvs/pkgs/rpms/tcl-pgtcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17673/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pgtcl-no-rpath.patch tcl-pgtcl.spec 
Log Message:
Initial import (#452306).


--- NEW FILE import.log ---
tcl-pgtcl-1_6_2-2_fc13:HEAD:tcl-pgtcl-1.6.2-2.fc13.src.rpm:1263013509

pgtcl-no-rpath.patch:
 Makefile.in |    2 +-
 aclocal.m4  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pgtcl-no-rpath.patch ---
This patch prevents use of rpath, which isn't wanted on Fedora.

Also, tweak Makefile.in to ensure that the -L switch for libpq appears
before any -L for the Tcl libraries during the link.  This prevents the
generated library from being bound to the wrong version of libpq when
building on a machine that has an older version of libpq already installed
(bug #166665).


diff -Naur pgtcl1.5.3.orig/Makefile.in pgtcl1.5.3/Makefile.in
--- pgtcl1.5.3.orig/Makefile.in	2006-09-09 21:59:59.000000000 -0400
+++ pgtcl1.5.3/Makefile.in	2007-01-10 18:58:19.000000000 -0500
@@ -101,7 +101,7 @@
 RANLIB_STUB	= @RANLIB_STUB@
 SHLIB_CFLAGS	= @SHLIB_CFLAGS@
 SHLIB_LD	= @SHLIB_LD@
-SHLIB_LD_LIBS   = @SHLIB_LD_LIBS@ $(PG_LIBS) $(TCL_LIBS)
+SHLIB_LD_LIBS   = $(PG_LIBS) @SHLIB_LD_LIBS@ $(TCL_LIBS)
 STLIB_LD	= @STLIB_LD@
 #TCL_DEFS	= @TCL_DEFS@
 TCL_BIN_DIR	= @TCL_BIN_DIR@
diff -Naur pgtcl1.5.3.orig/aclocal.m4 pgtcl1.5.3/aclocal.m4
--- pgtcl1.5.3.orig/aclocal.m4	2006-09-09 20:27:09.000000000 -0400
+++ pgtcl1.5.3/aclocal.m4	2007-01-10 18:56:46.000000000 -0500
@@ -844,7 +844,7 @@
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
-	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR},-rpath,${LIB_PGTCL_RUNTIME_DIR}'
+	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 	    if test "`uname -m`" = "alpha" ; then
 		CFLAGS="$CFLAGS -mieee"


--- NEW FILE tcl-pgtcl.spec ---
Name:		tcl-pgtcl
Version:	1.6.2
Release:	2%{?dist}
Summary:	A Tcl client library for PostgreSQL

Group:		Applications/Databases
URL:		http://pgfoundry.org/projects/pgtclng/
# PostgreSQL calls their license simplified BSD, but the requirements are
# more similar to other MIT licenses.
License:	MIT

Source0:	http://pgfoundry.org/projects/pgtclng/pgtcl%{version}.tar.gz
Source1:	http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip

Patch1:		pgtcl-no-rpath.patch

Provides:	pgtcl = %{version}-%{release}
# pgtcl was originally shipped as a sub-RPM of the PostgreSQL package;
# these Provides/Obsoletes give a migration path.  The cutoff EVR was
# chosen to be later than anything we are likely to ship in Fedora 12.
Provides:	postgresql-tcl = 8.5.0-1
Obsoletes:	postgresql-tcl < 8.5

BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root

BuildRequires:	postgresql-devel tcl-devel
BuildRequires:	autoconf

Requires:	tcl(abi) = 8.5

%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}

%description
PostgreSQL is an advanced Object-Relational database management system.
The tcl-pgtcl package contains Pgtcl, a Tcl client library for connecting
to a PostgreSQL server.

%prep
%setup -q -n pgtcl%{version}

unzip %{SOURCE1}
PGTCLDOCDIR=`basename %{SOURCE1} .zip`
mv $PGTCLDOCDIR Pgtcl-docs

%patch1 -p1

autoconf

%build

%configure --libdir=%{tcl_sitearch} --with-tcl=%{_libdir}

# note: as of pgtcl 1.5.2, its makefile is not parallel-safe
make all

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT
# we don't really need to ship the .h file
rm -f $RPM_BUILD_ROOT%{_includedir}/libpgtcl.h

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_libdir}/tcl%{tcl_version}/pgtcl%{version}/
%doc Pgtcl-docs/*

%changelog
* Tue Nov 24 2009 Tom Lane <tgl at redhat.com> 1.6.2-2
- Fix License tag as per discussion in PyGreSQL package review request.
Related: #452321

* Fri Jun 20 2008 Tom Lane <tgl at redhat.com> 1.6.2-1
- Created package by stripping down postgresql specfile and adjusting
  to meet current packaging guidelines for Tcl extensions.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-pgtcl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Jan 2010 04:34:47 -0000	1.1
+++ .cvsignore	9 Jan 2010 05:06:49 -0000	1.2
@@ -0,0 +1,2 @@
+pgtcl1.6.2.tar.gz
+pgtcldocs-20070115.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl-pgtcl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Jan 2010 04:34:47 -0000	1.1
+++ sources	9 Jan 2010 05:06:50 -0000	1.2
@@ -0,0 +1,2 @@
+abf26e3cd7f8229f468045ed1fb7e748  pgtcl1.6.2.tar.gz
+8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip