SPECS: tclx.spec - still more work needed in install section

[arekm]

Author: arekm                        Date: Tue Sep  6 18:09:35 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- still more work needed in install section

---- Files affected:
SPECS:
   tclx.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/tclx.spec
diff -u SPECS/tclx.spec:1.3 SPECS/tclx.spec:1.4
--- SPECS/tclx.spec:1.3	Tue Sep  6 19:07:07 2005
+++ SPECS/tclx.spec	Tue Sep  6 20:09:30 2005
@@ -9,6 +9,7 @@
 Group:		Development/Languages/Tcl
 Source0:	http://dl.sourceforge.net/tclx/%{name}%{version}-src.tar.gz
 # Source0-md5:	2cdd06d29f6dfbf31bf4ce192cf46918
+Patch0:		%{name}-skiptest.patch
 URL:		http://tclx.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	tcl-devel >= %{major}.0
@@ -41,13 +42,17 @@
 
 %prep
 %setup -q -n %{name}%{version}
+%patch0 -p1
 
 %build
 cd unix
-sed -e "s/^CFLAGS_OPTIMIZE.*/CFLAGS_OPTIMIZE=%{rpmcflags} -D__NO_STRING_INLINES -D__NO_MATH_INLINES -D_REENTRANT/" \
-	Makefile.in > Makefile.in.new
-mv -f Makefile.in.new Makefile.in
+sed -i -e "s/^CFLAGS_OPTIMIZE.*/CFLAGS_OPTIMIZE=%{rpmcflags} -D__NO_STRING_INLINES -D__NO_MATH_INLINES -D_REENTRANT/" \
+	Makefile.in
 %configure2_13 \
+	--with-tclconfig=%{_ulibdir} \
+        --with-tkconfig=%{_ulibdir} \
+        --with-tclinclude=%{_includedir} \
+        --with-tkinclude=%{_includedir} \
 	--enable-shared \
 	--enable-threads \
 	--enable-64bit \
@@ -55,9 +60,7 @@
 %{__make} \
 	TCL_PACKAGE_PATH="%{_libdir} %{_libdir}/tcl%{major} %{_ulibdir} %{_ulibdir}/tcl%{major}"
 
-sed -e "s#%{_builddir}/%{name}%{version}/unix#%{_libdir}#; \
-	s#%{_builddir}/%{name}%{version}#%{_includedir}#" tclConfig.sh > tclConfig.sh.new
-mv -f tclConfig.sh.new tclConfig.sh
+sed -i -e "s#%{_builddir}/%{name}%{version}/unix#%{_libdir}#g" t*Config.sh
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -68,15 +71,16 @@
 	TCL_PACKAGE_PATH="%{_libdir} %{_libdir}/tcl%{major} %{_ulibdir} %{_ulibdir}/tcl%{major}" \
 	MAN_INSTALL_DIR=$RPM_BUILD_ROOT%{_mandir}
 
-ln -sf libtcl%{major}.so.0.0 $RPM_BUILD_ROOT%{_libdir}/libtcl.so
-ln -sf libtcl%{major}.so.0.0 $RPM_BUILD_ROOT%{_libdir}/libtcl%{major}.so
-mv -f $RPM_BUILD_ROOT%{_bindir}/tclsh%{major} $RPM_BUILD_ROOT%{_bindir}/tclsh
+# for linking with -ltclx and -ltkx
+ln -sf libtclx%{major}.so $RPM_BUILD_ROOT%{_libdir}/libtclx.so
+ln -sf libtkx%{major}.so $RPM_BUILD_ROOT%{_libdir}/libtkx.so
+ln -sf libtclx%{major}.a $RPM_BUILD_ROOT%{_libdir}/libtclx.a
+ln -sf libtkx%{major}.a $RPM_BUILD_ROOT%{_libdir}/libtkx.a
 
-%{?have_ulibdir:mv $RPM_BUILD_ROOT%{_libdir}/tclConfig.sh $RPM_BUILD_ROOT%{_ulibdir}/tclConfig.sh}
+# rename memory.n since tcl-devel also provides it
+mv $RPM_BUILD_ROOT%{_mandir}/mann/{m,M}emory.n
 
-bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-
-install -d $RPM_BUILD_ROOT%{_libdir}/tcl%{major}
+%{?have_ulibdir:mv $RPM_BUILD_ROOT%{_libdir}/t*Config.sh $RPM_BUILD_ROOT%{_ulibdir}}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -108,6 +112,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/09/06 18:09:30  arekm
+- still more work needed in install section
+
 Revision 1.3  2005/09/06 17:07:07  glen
 - BR tk-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/tclx.spec?r1=1.3&r2=1.4&f=u