SPECS: tk.spec - all private tk headers in tk-private dir

[arekm]

Author: arekm                        Date: Tue Sep  6 17:46:34 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- all private tk headers in tk-private dir

---- Files affected:
SPECS:
   tk.spec (1.78 -> 1.79) 

---- Diffs:

================================================================
Index: SPECS/tk.spec
diff -u SPECS/tk.spec:1.78 SPECS/tk.spec:1.79
--- SPECS/tk.spec:1.78	Sat Jun 18 21:10:19 2005
+++ SPECS/tk.spec	Tue Sep  6 19:46:29 2005
@@ -18,7 +18,6 @@
 Patch0:		%{name}-ieee.patch
 Patch1:		%{name}-manlnk.patch
 Patch2:		%{name}-pil.patch
-Patch3:		%{name}-headers_fix.patch
 Patch4:		%{name}-opt_flags_pass_fix.patch
 Patch6:		%{name}-soname_fix.patch
 Patch7:		%{name}-norpath.patch
@@ -121,7 +120,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch6 -p1
 %patch7 -p1
@@ -144,9 +142,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 +153,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
@@ -218,6 +224,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2005/09/06 17:46:29  arekm
+- all private tk headers in tk-private dir
+
 Revision 1.78  2005/06/18 19:10:19  qboosh
 - updated ieee patch
 
================================================================

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