rpms/tclhttpd/devel tclhttpd.spec,1.12,1.13

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/tclhttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22661

Modified Files:
	tclhttpd.spec 
Log Message:
Fix build problem caused by installation path mismatch on 64-bit platforms




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/devel/tclhttpd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tclhttpd.spec	4 Jan 2008 17:04:12 -0000	1.12
+++ tclhttpd.spec	4 Jan 2008 22:23:03 -0000	1.13
@@ -4,7 +4,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -36,7 +36,7 @@
 %patch2 -p1
 
 %build
-%configure --with-serverroot=%{contentdir} --libdir=%{tcl_sitearch}
+%configure --with-serverroot=%{contentdir}
 make %{?_smp_mflags}
 
 %install
@@ -48,10 +48,13 @@
 
 # Move some of the libraries around so that we don't pollute the libdir.
 # Eventually this fix should be put into the Makefile.
-mv $RPM_BUILD_ROOT%{tcl_sitearch}/liblimit1.0.so $RPM_BUILD_ROOT%{tcl_sitearch}/limit1.0/
-mv $RPM_BUILD_ROOT%{tcl_sitearch}/libcrypt1.0.so $RPM_BUILD_ROOT%{tcl_sitearch}/crypt1.0/
-sed -e 's# \.\. # . #' < limit_pkgIndex.tcl > $RPM_BUILD_ROOT%{tcl_sitearch}/limit1.0/pkgIndex.tcl
-sed -e 's# \.\. # . #' < crypt_pkgIndex.tcl > $RPM_BUILD_ROOT%{tcl_sitearch}/crypt1.0/pkgIndex.tcl
+mkdir -p $RPM_BUILD_ROOT%{tcl_sitearch}
+mv $RPM_BUILD_ROOT%{_libdir}/liblimit1.0.so $RPM_BUILD_ROOT%{_libdir}/limit1.0/
+mv $RPM_BUILD_ROOT%{_libdir}/libcrypt1.0.so $RPM_BUILD_ROOT%{_libdir}/crypt1.0/
+sed -e 's# \.\. # . #' < limit_pkgIndex.tcl > $RPM_BUILD_ROOT%{_libdir}/limit1.0/pkgIndex.tcl
+sed -e 's# \.\. # . #' < crypt_pkgIndex.tcl > $RPM_BUILD_ROOT%{_libdir}/crypt1.0/pkgIndex.tcl
+mv $RPM_BUILD_ROOT%{_libdir}/limit1.0 $RPM_BUILD_ROOT%{tcl_sitearch}/
+mv $RPM_BUILD_ROOT%{_libdir}/crypt1.0 $RPM_BUILD_ROOT%{tcl_sitearch}/
 
 # Replace the numeric id in this configuration file with a name.  We don't
 # know what numeric id it will end up with when it's created during
@@ -141,6 +144,9 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Fri Jan  4 2008 Wart <wart at kobold.org> - 3.5.1-18
+- Fix build problem caused by installation path mismatch on 64-bit platforms
+
 * Fri Jan  4 2008 Wart <wart at kobold.org> - 3.5.1-17
 - Move extensions to tcl-specific directory