tcl: Rework package

* Rework build process
* Fix installation of man-pages
* Don't ship main so file in devel pkg
* Ship static library in devel package
* Ship tcl m4 macro for libtool

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/tcl/tcl.nm b/tcl/tcl.nm
index d0160cad0d3b24e33bc965c83c712083239d4520..76bc6eea9bba017b03d237e7517052ab1dac3df2 100644 (file)
--- a/tcl/tcl.nm
+++ b/tcl/tcl.nm
@@ -6,7 +6,7 @@
 name       = tcl
 major_ver  = 8.6
 version    = %{major_ver}.13
-release    = 1.1
+release    = 1.2
 thisapp    = tcl%{version}
 
 groups     = Development/Languages
@@ -37,11 +37,12 @@ build
        LDFLAGS += -lm
 
        prepare_cmds
-               # Don't build SQLite3 support
-               rm -rf pkgs/sqlite3*
+               # Don't build support for sqlite3.
+               rm -rf %{DIR_SRC}/%{thisapp}/pkgs/sqlite3*
        end
 
        configure_options += \
+               --mandir=%{mandir} \
                --enable-threads \
                --enable-64bit
 
@@ -54,13 +55,15 @@ build
                # for linking with -lib%{name}
                ln -svf lib%{name}%{major_ver}.so %{BUILDROOT}%{libdir}/lib%{name}.so
 
-               # paths don't look at /usr/lib for efficiency, so we symlink into tcl8.5 for now
+               # paths don't look at /usr/lib for efficiency, so we symlink into tcl8.6 for now
                mkdir -pv %{BUILDROOT}%{libdir}/%{name}%{major_ver}
                ln -svf ../%{name}Config.sh %{BUILDROOT}%{libdir}/%{name}%{major_ver}/%{name}Config.sh
 
-               # remove buildroot traces
-               #sed -i -e "s|$PWD/unix|%{libdir}|; s|$PWD|%{includedir}/%{name}-private|" %{BUILDROOT}%{libdir}/%{name}Config.sh
-               #rm -rf %{BUILDROOT}%{datadir}/%{name}%{major_ver}/ldAix
+               # Install tcl m4 macros for aclocal.
+               install -Dm644 tcl.m4 -t %{BUILDROOT}/usr/share/aclocal
+
+               # Fix permissions.
+               chmod 644 %{BUILDROOT}%{libdir}/libtclstub%{major_ver}.a
        end
 end
 
@@ -69,6 +72,12 @@ packages
 
        package %{name}-devel
                template DEVEL
+
+               files += \
+                       %{libdir}/libtclstub*.a
+
+               files += \
+                       !%{libdir}/libtcl%{major_ver}.so
        end
 
        package %{name}-debuginfo