SPECS (AC-branch): tk.spec - tk-private for all tk headers

[arekm]

Author: arekm                        Date: Tue Sep  6 17:45:34 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- tk-private for all tk headers

---- Files affected:
SPECS:
   tk.spec (1.75.2.1 -> 1.75.2.2) 

---- Diffs:

================================================================
Index: SPECS/tk.spec
diff -u SPECS/tk.spec:1.75.2.1 SPECS/tk.spec:1.75.2.2
--- SPECS/tk.spec:1.75.2.1	Sun Jul 24 19:19:55 2005
+++ SPECS/tk.spec	Tue Sep  6 19:45:29 2005
@@ -9,7 +9,7 @@
 Name:		tk
 %define major	8.4
 Version:	%{major}.11
-Release:	1
+Release:	2
 License:	BSD
 Group:		Development/Languages/Tcl
 Source0:	http://dl.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
@@ -144,9 +144,8 @@
 
 %{__make}
 
-sed -e "s#%{_builddir}/%{name}%{version}/unix#%{_libdir}#; \
-	s#%{_builddir}/%{name}%{version}#%{_includedir}#" tkConfig.sh > tkConfig.sh.new
-mv -f tkConfig.sh.new tkConfig.sh
+sed -i -e "s#%{_builddir}/%{name}%{version}/unix#%{_libdir}#; \
+	s#%{_builddir}/%{name}%{version}#%{_includedir}/%{name}-private#" tkConfig.sh
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -156,6 +155,15 @@
 	INSTALL_ROOT=$RPM_BUILD_ROOT \
 	MAN_INSTALL_DIR=$RPM_BUILD_ROOT%{_mandir}
 
+install -d $RPM_BUILD_ROOT%{_includedir}/%{name}-private/{generic,unix}
+find generic unix -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT%{_includedir}/%{name}-private/'{}' ';'
+for h in $RPM_BUILD_ROOT%{_includedir}/*.h; do
+        rh=$(basename "$h")
+        if [ -f "$RPM_BUILD_ROOT%{_includedir}/%{name}-private/generic/$rh" ]; then
+                ln -sf "../../$rh" $RPM_BUILD_ROOT%{_includedir}/%{name}-private/generic
+        fi
+done
+
 ln -sf libtk%{major}.so.0.0 $RPM_BUILD_ROOT%{_libdir}/libtk.so
 ln -sf libtk%{major}.so.0.0 $RPM_BUILD_ROOT%{_libdir}/libtk%{major}.so
 mv -f $RPM_BUILD_ROOT%{_bindir}/wish%{major} $RPM_BUILD_ROOT%{_bindir}/wish
@@ -216,6 +224,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.75.2.2  2005/09/06 17:45:29  arekm
+- tk-private for all tk headers
+
 Revision 1.75.2.1  2005/07/24 17:19:55  arekm
 - up to 8.4.11
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/tk.spec?r1=1.75.2.1&r2=1.75.2.2&f=u