rpms/tkimg/F-9 sources,1.2,1.3 tkimg.spec,1.6,1.7

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/pkgs/rpms/tkimg/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv580

Modified Files:
	sources tkimg.spec 
Log Message:
* 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



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Oct 2007 20:22:20 -0000	1.2
+++ sources	5 May 2008 11:10:17 -0000	1.3
@@ -1 +1 @@
-2af12ce6c552e8a8127c040e3f663a63  tkimg-20071018.tar.gz
+ddac07532734ac9ef3ea5dfaaf35ad58  tkimg-20080505.tar.bz2


Index: tkimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/F-9/tkimg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tkimg.spec	19 Feb 2008 23:42:14 -0000	1.6
+++ tkimg.spec	5 May 2008 11:10:17 -0000	1.7
@@ -1,9 +1,11 @@
 %{!?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.9.20071018svn%{?dist}
+Release: 0.10.%{svnversion}svn%{?dist}
 Summary: More Image Formats for Tk
 
 Group: Development/Libraries
@@ -15,8 +17,7 @@
 #  tar -czvf tkimg-20071018.tar.gz  tkimg-20071018
 
 # Data from subversion
-%define svnversion 20071018
-Source0: %{name}-%{svnversion}.tar.gz
+Source0: %{name}-%{svnversion}.tar.bz2
 Patch0: tkimg-build.patch
 Patch1: tkimg-systemlibs.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -54,14 +55,20 @@
 %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
+
 # Make library links
-%{__mkdir_p} %{buildroot}/%{_sysconfdir}/ld.so.conf.d
-echo "%{tcl_sitearch}/Img1.3" >> %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+%{__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
 
 %clean
 %{__rm} -fr %{buildroot}
@@ -73,17 +80,25 @@
 %files
 %defattr(-,root,root,-)
 %doc README 
-%config(noreplace) %{_sysconfdir}/ld.so.conf.d/*
+%{_libdir}/*.so
 %{tcl_sitearch}/Img1.3
 %exclude %{tcl_sitearch}/Img1.3/*.a
 
+
 %files devel
 %doc README 
 %{_includedir}/*
-%{tcl_sitearch}/*.sh
+%{_libdir}/*.sh
 %{tcl_sitearch}/Img1.3/*.a
 
 %changelog
+* 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