rpms/tkimg/devel tkimg-20091129-mandir.patch, NONE, 1.1 tkimg.spec, 1.15, 1.16

[Sergio Pascual]

Author: sergiopr

Update of /cvs/pkgs/rpms/tkimg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3251

Modified Files:
	tkimg.spec 
Added Files:
	tkimg-20091129-mandir.patch 
Log Message:
* Sat Feb 06 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4-0.7.20091129svn
- Patch to obey mandir configure option


tkimg-20091129-mandir.patch:
 Makefile.in |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE tkimg-20091129-mandir.patch ---
diff -ur tkimg-20091129/Makefile.in tkimg-20091129.new/Makefile.in
--- tkimg-20091129/Makefile.in	2009-03-12 15:42:17.000000000 +0100
+++ tkimg-20091129.new/Makefile.in	2010-02-06 16:09:28.000000000 +0100
@@ -34,6 +34,7 @@
 exec_prefix	=	@exec_prefix@
 libdir          =	@libdir@
 includedir      =	@includedir@
+mandir          =	@mandir@
 
 # Directory containing scripts supporting the work of this makefile
 tool		=	$(srcdir)/tools
@@ -64,7 +65,7 @@
 INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
 
 # Top-level directory in which to install manual entries:
-MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
+MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(mandir)
 
 # Directory where libz, libpng and libjpeg are (or will be) installed.
 IMG_INSTALL_DIR	=	$(INSTALL_ROOT)$(IMG_RUNTIME_DIR)


Index: tkimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/devel/tkimg.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- tkimg.spec	2 Dec 2009 17:46:32 -0000	1.15
+++ tkimg.spec	6 Feb 2010 15:22:51 -0000	1.16
@@ -5,7 +5,7 @@
 
 Name: tkimg
 Version: 1.4
-Release: 0.6.%{svnversion}svn%{?dist}
+Release: 0.7.%{svnversion}svn%{?dist}
 Summary: More Image Formats for Tk
 
 Group: Development/Libraries
@@ -21,6 +21,11 @@ Source0: %{name}-%{svnversion}.tar.gz
 # A request to allow building with system libraries has been submitted
 # https://sourceforge.net/tracker/index.php?func=detail&aid=2292032&group_id=52039&atid=465495
 
+# configure ignores mandir
+# bug report
+# https://sourceforge.net/tracker/?func=detail&aid=2907616&group_id=52039&atid=465492
+Patch0: tkimg-20091129-mandir.patch
+
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: tcl-devel tk-devel tcllib
@@ -41,10 +46,11 @@ Requires: %{name} = %{version}-%{release
 Requires: tcl-devel tk-devel
 Requires: libtiff-devel libpng-devel libjpeg-devel zlib-devel
 %description devel
-This are the header files needed to develop a %{name} application
+These are the header files needed to develop a %{name} application
 
 %prep
 %setup -q -n %{name}-%{svnversion}
+%patch0 -p1
 
 %build
 %configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --libdir=%{tcl_sitearch} --disable-threads --enable-64bit
@@ -55,12 +61,6 @@ make %{?_smp_mflags}
 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
 find %{buildroot}/%{tcl_sitearch} -name "*.tcl" |xargs chmod 644
@@ -97,6 +97,9 @@ rm -rf %{buildroot}
 %{tcl_sitearch}/Img1.4/*.a
 
 %changelog
+* Sat Feb 06 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4-0.7.20091129svn
+- Patch to obey mandir configure option
+
 * 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