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

[Michael Thomas (wart)]

Author: wart

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

Modified Files:
	tclhttpd.spec 
Log Message:
Move extensions to tcl-specific directory




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/devel/tclhttpd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tclhttpd.spec	4 Jan 2008 13:51:49 -0000	1.11
+++ tclhttpd.spec	4 Jan 2008 17:04:12 -0000	1.12
@@ -1,7 +1,10 @@
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
+
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 16%{?dist}
+Release: 17%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -33,7 +36,7 @@
 %patch2 -p1
 
 %build
-%configure --with-serverroot=%{contentdir}
+%configure --with-serverroot=%{contentdir} --libdir=%{tcl_sitearch}
 make %{?_smp_mflags}
 
 %install
@@ -45,10 +48,10 @@
 
 # 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%{_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%{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
 
 # 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
@@ -131,14 +134,17 @@
 %dir %attr(-,tclhttpd,tclhttpd) %{_var}/run/tclhttpd
 %attr(-,tclhttpd,tclhttpd) %{_var}/log/tclhttpd
 %{_initrddir}/tclhttpd
-%{_libdir}/crypt1.0
-%{_libdir}/limit1.0
+%{tcl_sitearch}/crypt1.0
+%{tcl_sitearch}/limit1.0
 %doc src/README
 %ghost %{_var}/lock/subsys/tclhttpd
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
-* Fri Jan  4 2008 Marcela Maslanova <mmaslano at redhat.com? - 3.5.1-16
+* Fri Jan  4 2008 Wart <wart at kobold.org> - 3.5.1-17
+- Move extensions to tcl-specific directory
+
+* Fri Jan  4 2008 Marcela Maslanova <mmaslano at redhat.com> - 3.5.1-16
 - rebuild for tcl8.5
 
 * Tue Aug 21 2007 Wart <wart at kobold.org> - 3.5.1-15