rpms/tkimg/devel tkimg.spec,1.4,1.5

[Sergio Pascual (sergiopr)]

Author: sergiopr

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

Modified Files:
	tkimg.spec 
Log Message:
* Fri Jan 04 2008 Sergio Pascual <sergiopr at fedoraproject.org> 1.3-0.8.20071018svn
- Following PackagingDrafts/Tcl



Index: tkimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/devel/tkimg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tkimg.spec	3 Jan 2008 12:54:49 -0000	1.4
+++ tkimg.spec	4 Jan 2008 14:40:17 -0000	1.5
@@ -1,6 +1,9 @@
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
+
 Name: tkimg
 Version: 1.3
-Release: 0.7.20071018svn%{?dist}
+Release: 0.8.20071018svn%{?dist}
 Summary: More Image Formats for Tk
 
 Group: Development/Libraries
@@ -44,20 +47,21 @@
 %patch1 -p1
 
 %build
-%configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --disable-static 
+%configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --disable-static \
+ --libdir=%{tcl_sitearch}
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -fr %{buildroot}
 %{__make} %{?_smp_mflags} INSTALL_ROOT=%{buildroot} install
 # Fixing some permissions
-find %{buildroot}/%{_libdir} -name "*.sh" |xargs chmod 644
-find %{buildroot}/%{_libdir} -name "*.tcl" |xargs chmod 644
-find %{buildroot}/%{_libdir} -name "*.a" |xargs chmod 644
-find %{buildroot}/%{_libdir} -name "*.so" |xargs chmod 755
+find %{buildroot}/%{tcl_sitearch} -name "*.sh" |xargs chmod 644
+find %{buildroot}/%{tcl_sitearch} -name "*.tcl" |xargs chmod 644
+find %{buildroot}/%{tcl_sitearch} -name "*.a" |xargs chmod 644
+find %{buildroot}/%{tcl_sitearch} -name "*.so" |xargs chmod 755
 # Make library links
 %{__mkdir_p} %{buildroot}/%{_sysconfdir}/ld.so.conf.d
-echo "%{_libdir}/Img1.3" >> %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+echo "%{tcl_sitearch}/Img1.3" >> %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 %clean
 %{__rm} -fr %{buildroot}
@@ -70,16 +74,19 @@
 %defattr(-,root,root,-)
 %doc README 
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/*
-%{_libdir}/*.sh
-%{_libdir}/Img1.3
-%exclude %{_libdir}/Img1.3/*.a
+%{tcl_sitearch}/Img1.3
+%exclude %{tcl_sitearch}/Img1.3/*.a
 
 %files devel
 %doc README 
 %{_includedir}/*
-%{_libdir}/Img1.3/*.a
+%{tcl_sitearch}/*.sh
+%{tcl_sitearch}/Img1.3/*.a
 
 %changelog
+* Fri Jan 04 2008 Sergio Pascual <sergiopr at fedoraproject.org> 1.3-0.8.20071018svn
+- Following PackagingDrafts/Tcl
+
 * Thu Jan 03 2008 Sergio Pascual <sergiopr at fedoraproject.org> 1.3-0.7.20071018svn
 - Rebuilt for tcl 8.5