rpms/blt/devel blt.spec,1.17,1.18

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/pkgs/rpms/blt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15062

Modified Files:
	blt.spec 
Log Message:
* Sat Jan 05 2008 Sergio Pascual <sergiopr at fedoraproject.org> 2.4-21
- Libraries moved to %libdir, file in ld.so.conf.d not needed
- Tcl files moved to %tcl_sitelib



Index: blt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blt/devel/blt.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- blt.spec	4 Jan 2008 14:34:39 -0000	1.17
+++ blt.spec	5 Jan 2008 16:20:47 -0000	1.18
@@ -1,10 +1,11 @@
 %{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
+%{!?tcl_sitelib: %define tcl_sitelib %{_datadir}/tcl%{tcl_version}}
 
 Summary: BLT widget extension to Tcl/Tk scripting language development
 Name: blt
 Version: 2.4
-Release: 20%{?dist}
+Release: 21%{?dist}
 
 License: MIT
 Group: Development/Libraries
@@ -59,18 +60,18 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-DIRECTORY=$RPM_BUILD_ROOT%{tcl_sitearch}/%{name}%{version}
-install -d $DIRECTORY
-install -m 755 -p src/shared/libBLT24.so src/shared/libBLTlite24.so $DIRECTORY
-install -m 644 -p library/*.{pro,tcl,xbm} library/tclIndex $DIRECTORY
-install -d $RPM_BUILD_ROOT%{_includedir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{tcl_sitearch}/%{name}%{version}
+mkdir -p $RPM_BUILD_ROOT%{tcl_sitelib}/%{name}%{version}
+
+install -m 755 -p src/shared/libBLT24.so $RPM_BUILD_ROOT%{_libdir}
+install -m 755 -p src/shared/libBLTlite24.so $RPM_BUILD_ROOT%{_libdir}
+install -m 644 -p library/*.{pro,tcl,xbm} library/tclIndex $RPM_BUILD_ROOT%{tcl_sitelib}/%{name}%{version}
 install -m 644 -p src/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}
-echo 'package ifneeded BLT 2.4 "if {[llength [info commands tk]] > 0} {load [file join $dir libBLT24.so]} else {load [file join $dir libBLTlite24.so] BLT}"' > $DIRECTORY/pkgIndex.tcl
-cp -p -r library/dd_protocols $DIRECTORY
+echo 'package ifneeded BLT 2.4 "if {[llength [info commands tk]] > 0} {load [file join "%{_libdir}" libBLT24.so]} else {load [file join "%{_libdir}" libBLTlite24.so] BLT}"' > $RPM_BUILD_ROOT%{tcl_sitearch}/%{name}%{version}/pkgIndex.tcl
+cp -p -r library/dd_protocols $RPM_BUILD_ROOT%{tcl_sitelib}/%{name}%{version}
 rm -f html/Makefile.vc
-# File in /etc/ld.so.conf.d
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
-echo "%{tcl_sitearch}/%{name}%{version}" >> $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,14 +83,19 @@
 %files
 %defattr(-,root,root,0755)
 %doc README INSTALL PROBLEMS html/
-%config(noreplace) %{_sysconfdir}/ld.so.conf.d/*
-%{tcl_sitearch}/%{name}%{version}/
+%{_libdir}/*
+%{tcl_sitearch}/*
+%{tcl_sitelib}/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/blt/*
 
 %changelog
+* Sat Jan 05 2008 Sergio Pascual <sergiopr at fedoraproject.org> 2.4-21
+- Libraries moved to %%libdir, file in ld.so.conf.d not needed
+- Tcl files moved to %%tcl_sitelib
+
 * Fri Jan 04 2008 Sergio Pascual <sergiopr at fedoraproject.org> 2.4-20
 - Rebuilt for tk 8.5 (added patch)
 - Following PackagingDrafts/Tcl