rpms/tkimg/EL-5 tkimg.spec,1.8,1.9

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/pkgs/rpms/tkimg/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5884

Modified Files:
	tkimg.spec 
Log Message:
* Tue May 06 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 1.3-0.8.2008
0505svn
- Fixed source extension



Index: tkimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/EL-5/tkimg.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tkimg.spec	3 Jul 2008 15:39:36 -0000	1.8
+++ tkimg.spec	17 Jul 2008 08:32:31 -0000	1.9
@@ -1,11 +1,9 @@
-%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
-%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 # Data from subversion
 %define svnversion 20080505
 
 Name: tkimg
 Version: 1.3
-Release: 0.11.%{svnversion}svn%{?dist}
+Release: 0.8.%{svnversion}svn%{?dist}
 Summary: More Image Formats for Tk
 
 Group: Development/Libraries
@@ -16,7 +14,6 @@
 # svn export -r 130 https://tkimg.svn.sourceforge.net/svnroot/tkimg/trunk tkimg-20071018
 #  tar -czvf tkimg-20071018.tar.gz  tkimg-20071018
 
-# Data from subversion
 Source0: %{name}-%{svnversion}.tar.bz2
 Patch0: tkimg-build.patch
 Patch1: tkimg-systemlibs.patch
@@ -25,7 +22,7 @@
 BuildRequires: tcl-devel tk-devel
 BuildRequires: libtiff-devel libpng-devel libjpeg-devel zlib-devel
 
-Requires: tcl(abi) = 8.5
+Requires: tcl(abi) = 8.4
 
 %description
 This package contains a collection of image format handlers for the Tk
@@ -48,27 +45,20 @@
 %patch1 -p1
 
 %build
-%configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --disable-static \
- --libdir=%{tcl_sitearch}
+%configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --disable-static 
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -fr %{buildroot}
 %{__make} %{?_smp_mflags} INSTALL_ROOT=%{buildroot} install
-
 # Fixing some permissions
-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
-
+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
 # Make library links
-%{__mv} %{buildroot}/%{tcl_sitearch}/*.sh %{buildroot}/%{_libdir}
-for tcllibs in %{buildroot}/%{tcl_sitearch}/Img1.3/*tcl*.so 
-do
-btcllibs=`basename $tcllibs`
-%{__ln_s} %{tcl_sitearch}/Img1.3/$btcllibs %{buildroot}/%{_libdir}/$btcllibs
-done
+%{__mkdir_p} %{buildroot}/%{_sysconfdir}/ld.so.conf.d
+echo "%{_libdir}/Img1.3" >> %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 %clean
 %{__rm} -fr %{buildroot}
@@ -80,36 +70,20 @@
 %files
 %defattr(-,root,root,-)
 %doc README 
-%{_libdir}/*.so
-%{tcl_sitearch}/Img1.3
-%exclude %{tcl_sitearch}/Img1.3/*.a
-
+%config(noreplace) %{_sysconfdir}/ld.so.conf.d/*
+%{_libdir}/*.sh
+%{_libdir}/Img1.3
+%exclude %{_libdir}/Img1.3/*.a
 
 %files devel
 %doc README 
 %{_includedir}/*
-%{_libdir}/*.sh
-%{tcl_sitearch}/Img1.3/*.a
+%{_libdir}/Img1.3/*.a
 
 %changelog
-* Thu Jul 03 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3-0.11.200805005svn
-- fix configure to use --with-tcl=%%{tcl_sitearch}
-
-* Mon May 05 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 1.3-0.10.20080505svn
-- New upstream source
-- Including fooConfig.sh files in -devel 
-- Making symlinks of shared libraries in libdir
-- Removing file in ld.so.conf.d
-- Fixing bug #444872
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3-0.9.20071018svn
-- Autorebuild for GCC 4.3
-
-* 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
+* Tue May 06 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 1.3-0.8.2008
+0505svn
+- Fixed source extension
 
 * Mon Dec 24 2007 Sergio Pascual <sergiopr at fedoraproject.org> 1.3-0.6.20071018svn
 - Static 'stub' library included in devel subpackage