more packaging fixes

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 64ddf3988c1a8ff0506f15b24fe47a43effcf485..dfe4cd9a9ba31c1424c8772a9aab236a0d5e57ac 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -676,7 +676,7 @@ Python extension for graphviz.
 %{_datadir}/graphviz/demo/*.py*
 %{_mandir}/man3/*.3python.*
 %exclude %{_libdir}/graphviz/python/*.so
-%exclude %{_libdir}/graphviz/python/*.py
+%exclude %{_libdir}/graphviz/python/*.py*
 %endif
 
 #-- graphviz-lang-R rpm ---------------------------------------------
@@ -735,6 +735,7 @@ Various tcl packages (extensions) for the graphviz tools.
 %{_datadir}/graphviz/demo/entities.html
 %{_mandir}/man3/*.3tcl.*
 %{_mandir}/man3/*.3tk.*
+%exclude %{_libdir}/graphviz/tcl/*
 %endif
 
 #-- graphviz-devel rpm --------------------------------------------

diff --git a/tclpkg/Makefile.am b/tclpkg/Makefile.am
index a335198855b0c26059d5e75d79564853afce98f4..8714989883a3c19a1f8b5590f64981940de78f14 100644 (file)
--- a/tclpkg/Makefile.am
+++ b/tclpkg/Makefile.am
@@ -156,7 +156,7 @@ if WITH_TCL
        -mkdir -p $(DESTDIR)@TCL_INSTALL_DIR@;
        if test -w $(DESTDIR)@TCL_INSTALL_DIR@/; then \
                (cd $(DESTDIR)@TCL_INSTALL_DIR@; \
-                       cp -f $(DESTDIR)$(pkgtcldir) @PACKAGE_NAME@;) \
+                       cp -rf $(DESTDIR)$(pkgtcldir) @PACKAGE_NAME@;) \
        else \
                echo "Warning: @TCL_INSTALL_DIR@ is not writable."; \
                echo "Skipping system installation of tcl bindings."; \