rpms/tkimg/F-12 sources,1.4,1.5 tkimg.spec,1.14,1.15

[Sergio Pascual]

Author: sergiopr

Update of /cvs/pkgs/rpms/tkimg/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15091

Modified Files:
	sources tkimg.spec 
Log Message:
* Tue Dec 01 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4-0.6.20091129svn
- New upstream source, version 228 from trunk
- Provides man pages
- Passing tests for sgi format
- Fixes bz #542356



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	16 Nov 2008 12:23:42 -0000	1.4
+++ sources	2 Dec 2009 18:20:07 -0000	1.5
@@ -1 +1 @@
-5da60e405571cb81d66ae0bb88b93f8f  tkimg-20081115.tar.gz
+bd975c977f6ec59d905ffeebe52431c9  tkimg-20091129.tar.gz


Index: tkimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/F-12/tkimg.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- tkimg.spec	27 Jul 2009 06:01:47 -0000	1.14
+++ tkimg.spec	2 Dec 2009 18:20:07 -0000	1.15
@@ -1,11 +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 20081115
+%define svnversion 20091129
 
 Name: tkimg
 Version: 1.4
-Release: 0.5.%{svnversion}svn%{?dist}
+Release: 0.6.%{svnversion}svn%{?dist}
 Summary: More Image Formats for Tk
 
 Group: Development/Libraries
@@ -13,8 +13,8 @@ License: BSD
 URL: http://sourceforge.net/projects/tkimg
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-# svn export -r 173 https://tkimg.svn.sourceforge.net/svnroot/tkimg/trunk tkimg-20081115
-#  tar -czvf tkimg-20081115.tar.gz  tkimg-20081115
+# svn export -r 228 https://tkimg.svn.sourceforge.net/svnroot/tkimg/trunk tkimg-20091129
+#  tar -czvf tkimg-20091129.tar.gz  tkimg-20091129
 
 # Data from subversion
 Source0: %{name}-%{svnversion}.tar.gz
@@ -23,7 +23,7 @@ Source0: %{name}-%{svnversion}.tar.gz
 
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires: tcl-devel tk-devel
+BuildRequires: tcl-devel tk-devel tcllib
 BuildRequires: libtiff-devel libpng-devel libjpeg-devel zlib-devel libXft-devel
 
 Requires: tcl(abi) = 8.5
@@ -47,12 +47,19 @@ This are the header files needed to deve
 %setup -q -n %{name}-%{svnversion}
 
 %build
-%configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --libdir=%{tcl_sitearch}
-%{__make} %{?_smp_mflags}
+%configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --libdir=%{tcl_sitearch} --disable-threads --enable-64bit
+
+make %{?_smp_mflags}
 
 %install
-%{__rm} -fr %{buildroot}
-%{__make} %{?_smp_mflags} INSTALL_ROOT=%{buildroot} install
+rm -rf %{buildroot}
+make %{?_smp_mflags} INSTALL_ROOT=%{buildroot} install
+
+# configure ignores mandir
+# bug report
+# https://sourceforge.net/tracker/?func=detail&aid=2907616&group_id=52039&atid=465492
+mkdir -p %{buildroot}/%{_mandir}/mann
+mv %{buildroot}/usr/man/mann/* %{buildroot}/%{_mandir}/mann
 
 # Fixing some permissions
 find %{buildroot}/%{tcl_sitearch} -name "*.sh" |xargs chmod 644
@@ -61,14 +68,14 @@ find %{buildroot}/%{tcl_sitearch} -name 
 find %{buildroot}/%{tcl_sitearch} -name "*.so" |xargs chmod 755
 
 # Make library links
-%{__mv} %{buildroot}/%{tcl_sitearch}/*.sh %{buildroot}/%{_libdir}
+mv %{buildroot}/%{tcl_sitearch}/*.sh %{buildroot}/%{_libdir}
 for tcllibs in %{buildroot}/%{tcl_sitearch}/Img1.4/*tcl*.so; do
 btcllibs=`basename $tcllibs`
-%{__ln_s} tcl%{tcl_version}/Img1.4/$btcllibs %{buildroot}/%{_libdir}/$btcllibs
+ln -s tcl%{tcl_version}/Img1.4/$btcllibs %{buildroot}/%{_libdir}/$btcllibs
 done
 
 %clean
-%{__rm} -fr %{buildroot}
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -79,6 +86,7 @@ done
 %doc README
 %{_libdir}/*.so
 %{tcl_sitearch}/Img1.4
+%{_mandir}/mann/img*
 %exclude %{tcl_sitearch}/Img1.4/*.a
 
 %files devel
@@ -89,6 +97,12 @@ done
 %{tcl_sitearch}/Img1.4/*.a
 
 %changelog
+* Tue Dec 01 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4-0.6.20091129svn
+- New upstream source, version 228 from trunk
+- Provides man pages
+- Passing tests for sgi format
+- Fixes bz #542356
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-0.5.20081115svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild