rpms/tkimg/F-8 tkimg-build.patch, NONE, 1.1 tkimg-systemlibs.patch, NONE, 1.1 tkimg.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Sergio Pascual (sergiopr)
fedora-extras-commits at redhat.com
Mon Oct 29 20:37:17 UTC 2007
Author: sergiopr
Update of /cvs/pkgs/rpms/tkimg/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16902/F-8
Modified Files:
.cvsignore sources
Added Files:
tkimg-build.patch tkimg-systemlibs.patch tkimg.spec
Log Message:
Initial commit
tkimg-build.patch:
--- NEW FILE tkimg-build.patch ---
diff -ur tkimg-1.3/Makefile.in tkimg-1.3.new/Makefile.in
--- tkimg-1.3/Makefile.in 2007-10-18 13:12:52.000000000 +0200
+++ tkimg-1.3.new/Makefile.in 2007-10-18 15:19:08.000000000 +0200
@@ -117,33 +117,35 @@
here=`pwd` && \
cd $$sub && \
$(MAKE) install \
- exec_prefix=$$here/Img/exec_prefix \
- prefix=$$here/Img/prefix \
- pkglibdir=$$here/Img/exec_prefix/lib/Img \
- libdir=$$here/Img/exec_prefix/lib \
+ exec_prefix=$$here/Img/$(exec_prefix) \
+ prefix=$$here/Img/$(prefix) \
+ pkglibdir=$$here/Img/$(libdir)/Img \
+ includedir=$(DESTDIR)$(includedir) \
+ libdir=$$here/Img/$(libdir) \
DESTDIR= \
|| exit $$? && \
cd $$here && \
- cat Img/exec_prefix/lib/Img/pkgIndex.tcl >> pkgIndex.tcl ; \
+ cat Img/$(libdir)/Img/pkgIndex.tcl >> pkgIndex.tcl ; \
done
- mv pkgIndex.tcl Img/exec_prefix/lib/Img/pkgIndex.tcl
- for p in Img/exec_prefix/lib/*.sh ; do \
+ mkdir -p $(DESTDIR)$(libdir)/Img
+ mv pkgIndex.tcl $(DESTDIR)$(libdir)/Img/pkgIndex.tcl
+ for p in Img/$(libdir)/*.sh ; do \
sed -e 's#$(libdir)/[^/ ]*\([/ ]\)#$(LIB_RUNTIME_DIR)\1#' \
$$p > $$p.1 && mv -f $$p.1 $$p ; \
done
install: collate
mkdir -p $(INSTALL_ROOT)$(LIB_RUNTIME_DIR)
- for p in Img/exec_prefix/lib/Img/* ; do \
+ for p in Img/$(libdir)/Img/* ; do \
$(INSTALL_PROGRAM) $$p $(INSTALL_ROOT)$(LIB_RUNTIME_DIR)/`basename $$p` ; \
done
mkdir -p $(INSTALL_ROOT)$(libdir)
- for p in Img/exec_prefix/lib/*.sh ; do \
+ for p in Img/$(libdir)/*.sh ; do \
$(INSTALL_PROGRAM) $$p $(INSTALL_ROOT)$(libdir)/`basename $$p` ; \
done
- if [ -n "`ls Img/prefix/include`" ]; then \
+ if [ -n "`ls Img/$(prefix)/include`" ]; then \
mkdir -p $(INSTALL_ROOT)$(includedir) && \
- for p in Img/prefix/include/* ; do \
+ for p in Img/$(prefix)/include/* ; do \
$(INSTALL_PROGRAM) $$p $(INSTALL_ROOT)$(includedir)/`basename $$p` ; \
done; fi
tkimg-systemlibs.patch:
--- NEW FILE tkimg-systemlibs.patch ---
diff -ur tkimg-1.3/libjpeg/tcl/configure tkimg-1.3.new/libjpeg/tcl/configure
--- tkimg-1.3/libjpeg/tcl/configure 2007-10-18 13:12:39.000000000 +0200
+++ tkimg-1.3.new/libjpeg/tcl/configure 2007-10-24 18:50:41.000000000 +0200
@@ -7184,60 +7184,6 @@
- vars="
- ../jcapimin.c ../jcapistd.c ../jccoefct.c
- ../jccolor.c ../jcdctmgr.c ../jchuff.c
- ../jcinit.c ../jcmainct.c ../jcmarker.c
- ../jcmaster.c ../jcomapi.c ../jcparam.c
- ../jcphuff.c ../jcprepct.c ../jcsample.c
- ../jctrans.c ../jdapimin.c ../jdapistd.c
- ../jdatadst.c ../jdatasrc.c ../jdcoefct.c
- ../jdcolor.c ../jddctmgr.c ../jdhuff.c
- ../jdinput.c ../jdmainct.c ../jdmarker.c
- ../jdmaster.c ../jdmerge.c ../jdphuff.c
- ../jdpostct.c ../jdsample.c ../jdtrans.c
- ../jerror.c ../jfdctflt.c ../jfdctfst.c
- ../jfdctint.c ../jidctflt.c ../jidctfst.c
- ../jidctint.c ../jidctred.c ../jquant1.c
- ../jquant2.c ../jutils.c ../jmemmgr.c
- ../jmemansi.c
-"
- for i in $vars; do
- case $i in
- \$*)
- # allow $-var names
- PKG_SOURCES="$PKG_SOURCES $i"
- PKG_OBJECTS="$PKG_OBJECTS $i"
- ;;
- *)
- # check for existence - allows for generic/win/unix VPATH
- # To add more dirs here (like 'src'), you have to update VPATH
- # in Makefile.in as well
- if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
- -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
- ; then
- { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5
-echo "$as_me: error: could not find source file '$i'" >&2;}
- { (exit 1); exit 1; }; }
- fi
- PKG_SOURCES="$PKG_SOURCES $i"
- # this assumes it is in a VPATH dir
- i=`basename $i`
- # handle user calling this before or after TEA_SETUP_COMPILER
- if test x"${OBJEXT}" != x ; then
- j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}"
- else
- j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}"
- fi
- PKG_OBJECTS="$PKG_OBJECTS $j"
- ;;
- esac
- done
-
-
-
-
-
vars="jpegtcl.h jpegtclDecls.h"
for i in $vars; do
# check for existence, be strict because it is installed
diff -ur tkimg-1.3/libjpeg/tcl/jpegtclDecls.h tkimg-1.3.new/libjpeg/tcl/jpegtclDecls.h
--- tkimg-1.3/libjpeg/tcl/jpegtclDecls.h 2007-10-18 13:12:39.000000000 +0200
+++ tkimg-1.3.new/libjpeg/tcl/jpegtclDecls.h 2007-10-24 19:26:42.000000000 +0200
@@ -20,8 +20,8 @@
#undef EXTERN
#include <jpegtclDeclsMask.h>
-#include <../jpeglib.h>
-#include <../jerror.h>
+#include </usr/include/jpeglib.h>
+#include </usr/include/jerror.h>
#include <jpegtclDeclsUnmask.h>
/*
diff -ur tkimg-1.3/libjpeg/tcl/Makefile.in tkimg-1.3.new/libjpeg/tcl/Makefile.in
--- tkimg-1.3/libjpeg/tcl/Makefile.in 2007-10-18 13:12:39.000000000 +0200
+++ tkimg-1.3.new/libjpeg/tcl/Makefile.in 2007-10-24 18:55:50.000000000 +0200
@@ -106,7 +106,7 @@
RANLIB_STUB = @RANLIB_STUB@
SHLIB_CFLAGS = @SHLIB_CFLAGS@
SHLIB_LD = @SHLIB_LD@
-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
+SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -ljpeg
STLIB_LD = @STLIB_LD@
TCL_DEFS = @TCL_DEFS@
TCL_BIN_DIR = @TCL_BIN_DIR@
diff -ur tkimg-1.3/libpng/tcl/configure tkimg-1.3.new/libpng/tcl/configure
--- tkimg-1.3/libpng/tcl/configure 2007-10-18 13:12:50.000000000 +0200
+++ tkimg-1.3.new/libpng/tcl/configure 2007-10-24 18:51:02.000000000 +0200
@@ -7376,50 +7376,6 @@
- vars="
- ../png.c ../pngerror.c ../pngmem.c
- ../pngpread.c ../pngread.c ../pngrio.c
- ../pngrtran.c ../pngrutil.c ../pngset.c
- ../pngtrans.c ../pngwio.c ../pngwrite.c
- ../pngwtran.c ../pngwutil.c ../pngget.c
- ../pnggccrd.c
-"
- for i in $vars; do
- case $i in
- \$*)
- # allow $-var names
- PKG_SOURCES="$PKG_SOURCES $i"
- PKG_OBJECTS="$PKG_OBJECTS $i"
- ;;
- *)
- # check for existence - allows for generic/win/unix VPATH
- # To add more dirs here (like 'src'), you have to update VPATH
- # in Makefile.in as well
- if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
- -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
- ; then
- { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5
-echo "$as_me: error: could not find source file '$i'" >&2;}
- { (exit 1); exit 1; }; }
- fi
- PKG_SOURCES="$PKG_SOURCES $i"
- # this assumes it is in a VPATH dir
- i=`basename $i`
- # handle user calling this before or after TEA_SETUP_COMPILER
- if test x"${OBJEXT}" != x ; then
- j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}"
- else
- j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}"
- fi
- PKG_OBJECTS="$PKG_OBJECTS $j"
- ;;
- esac
- done
-
-
-
-
-
vars="pngtcl.h pngtclDecls.h"
for i in $vars; do
# check for existence, be strict because it is installed
diff -ur tkimg-1.3/libpng/tcl/Makefile.in tkimg-1.3.new/libpng/tcl/Makefile.in
--- tkimg-1.3/libpng/tcl/Makefile.in 2007-10-18 13:12:50.000000000 +0200
+++ tkimg-1.3.new/libpng/tcl/Makefile.in 2007-10-24 18:56:10.000000000 +0200
@@ -110,7 +110,7 @@
RANLIB_STUB = @RANLIB_STUB@
SHLIB_CFLAGS = @SHLIB_CFLAGS@
SHLIB_LD = @SHLIB_LD@
-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
+SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -lpng12
STLIB_LD = @STLIB_LD@
TCL_DEFS = @TCL_DEFS@
TCL_BIN_DIR = @TCL_BIN_DIR@
diff -ur tkimg-1.3/libpng/tcl/pngtclDecls.h tkimg-1.3.new/libpng/tcl/pngtclDecls.h
--- tkimg-1.3/libpng/tcl/pngtclDecls.h 2007-10-18 13:12:50.000000000 +0200
+++ tkimg-1.3.new/libpng/tcl/pngtclDecls.h 2007-10-24 19:03:30.000000000 +0200
@@ -16,7 +16,7 @@
#include <tcl.h>
#include <pngtclDeclsMask.h>
-#include <../png.h>
+#include </usr/include/png.h>
#include <pngtclDeclsUnmask.h>
/* !BEGIN!: Do not edit below this line. */
diff -ur tkimg-1.3/libtiff/tcl/configure tkimg-1.3.new/libtiff/tcl/configure
--- tkimg-1.3/libtiff/tcl/configure 2007-10-18 13:12:25.000000000 +0200
+++ tkimg-1.3.new/libtiff/tcl/configure 2007-10-24 19:18:08.000000000 +0200
@@ -7404,55 +7404,6 @@
- vars="
- ../libtiff/tif_aux.c ../libtiff/tif_close.c ../libtiff/tif_codec.c
- ../libtiff/tif_compress.c ../libtiff/tif_dir.c ../libtiff/tif_dirinfo.c
- ../libtiff/tif_dirread.c ../libtiff/tif_dirwrite.c ../libtiff/tif_dumpmode.c
- ../libtiff/tif_error.c ../libtiff/tif_fax3.c
- ../libtiff/tif_getimage.c ../libtiff/tif_flush.c ../libtiff/tif_luv.c
- ../libtiff/tif_lzw.c ../libtiff/tif_next.c ../libtiff/tif_open.c
- ../libtiff/tif_packbits.c ../libtiff/tif_predict.c ../libtiff/tif_print.c
- ../libtiff/tif_read.c ../libtiff/tif_swab.c ../libtiff/tif_strip.c
- ../libtiff/tif_thunder.c ../libtiff/tif_tile.c ../libtiff/tif_version.c
- ../libtiff/tif_warning.c ../libtiff/tif_write.c
- ../libtiff/tif_color.c ../libtiff/tif_extension.c
-"
- for i in $vars; do
- case $i in
- \$*)
- # allow $-var names
- PKG_SOURCES="$PKG_SOURCES $i"
- PKG_OBJECTS="$PKG_OBJECTS $i"
- ;;
- *)
- # check for existence - allows for generic/win/unix VPATH
- # To add more dirs here (like 'src'), you have to update VPATH
- # in Makefile.in as well
- if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
- -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
- ; then
- { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5
-echo "$as_me: error: could not find source file '$i'" >&2;}
- { (exit 1); exit 1; }; }
- fi
- PKG_SOURCES="$PKG_SOURCES $i"
- # this assumes it is in a VPATH dir
- i=`basename $i`
- # handle user calling this before or after TEA_SETUP_COMPILER
- if test x"${OBJEXT}" != x ; then
- j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}"
- else
- j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}"
- fi
- PKG_OBJECTS="$PKG_OBJECTS $j"
- ;;
- esac
- done
-
-
-
-
-
vars="tifftcl.h tifftclDecls.h"
for i in $vars; do
# check for existence, be strict because it is installed
@@ -7732,39 +7683,6 @@
else
CLEANFILES=""
- vars="../libtiff/tif_unix.c"
- for i in $vars; do
- case $i in
- \$*)
- # allow $-var names
- PKG_SOURCES="$PKG_SOURCES $i"
- PKG_OBJECTS="$PKG_OBJECTS $i"
- ;;
- *)
- # check for existence - allows for generic/win/unix VPATH
- # To add more dirs here (like 'src'), you have to update VPATH
- # in Makefile.in as well
- if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
- -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
- ; then
- { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5
-echo "$as_me: error: could not find source file '$i'" >&2;}
- { (exit 1); exit 1; }; }
- fi
- PKG_SOURCES="$PKG_SOURCES $i"
- # this assumes it is in a VPATH dir
- i=`basename $i`
- # handle user calling this before or after TEA_SETUP_COMPILER
- if test x"${OBJEXT}" != x ; then
- j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}"
- else
- j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}"
- fi
- PKG_OBJECTS="$PKG_OBJECTS $j"
- ;;
- esac
- done
-
fi
diff -ur tkimg-1.3/libtiff/tcl/Makefile.in tkimg-1.3.new/libtiff/tcl/Makefile.in
--- tkimg-1.3/libtiff/tcl/Makefile.in 2007-10-18 13:12:25.000000000 +0200
+++ tkimg-1.3.new/libtiff/tcl/Makefile.in 2007-10-24 19:21:01.000000000 +0200
@@ -35,8 +35,8 @@
# tif_fax3sm is special. It is generated.
-PKG_SOURCES = @PKG_SOURCES@ tif_fax3sm.c
-PKG_OBJECTS = @PKG_OBJECTS@ tif_fax3sm.$(OBJEXT)
+PKG_SOURCES = @PKG_SOURCES@
+PKG_OBJECTS = @PKG_OBJECTS@
PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
@@ -108,7 +108,7 @@
RANLIB_STUB = @RANLIB_STUB@
SHLIB_CFLAGS = @SHLIB_CFLAGS@
SHLIB_LD = @SHLIB_LD@
-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
+SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -ltiff
STLIB_LD = @STLIB_LD@
TCL_DEFS = @TCL_DEFS@
TCL_BIN_DIR = @TCL_BIN_DIR@
diff -ur tkimg-1.3/libtiff/tcl/tifftclDecls.h tkimg-1.3.new/libtiff/tcl/tifftclDecls.h
--- tkimg-1.3/libtiff/tcl/tifftclDecls.h 2007-10-18 13:12:25.000000000 +0200
+++ tkimg-1.3.new/libtiff/tcl/tifftclDecls.h 2007-10-24 19:17:01.000000000 +0200
@@ -22,11 +22,17 @@
#undef INLINE
#include <tifftclDeclsMask.h>
-#include <../libtiff/tiffio.h>
-#include <../libtiff/tiffiop.h>
-#include <../libtiff/tif_predict.h>
+#include <../libtiff/tiffiop.h>
+#include </usr/include/tiff.h>
+#include </usr/include/tiffio.h>
+#include <../libtiff/tiffiop.h>
+#include <../libtiff/tif_predict.h>
+
+
#include <tifftclDeclsUnmask.h>
+
+
/* !BEGIN!: Do not edit below this line. */
/*
diff -ur tkimg-1.3/libz/tcl/configure tkimg-1.3.new/libz/tcl/configure
--- tkimg-1.3/libz/tcl/configure 2007-10-18 13:12:44.000000000 +0200
+++ tkimg-1.3.new/libz/tcl/configure 2007-10-24 18:52:11.000000000 +0200
@@ -7180,152 +7180,6 @@
-
- vars="../adler32.c ../compress.c ../crc32.c"
- for i in $vars; do
- case $i in
- \$*)
- # allow $-var names
- PKG_SOURCES="$PKG_SOURCES $i"
- PKG_OBJECTS="$PKG_OBJECTS $i"
- ;;
- *)
- # check for existence - allows for generic/win/unix VPATH
- # To add more dirs here (like 'src'), you have to update VPATH
- # in Makefile.in as well
- if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
- -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
- ; then
- { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5
-echo "$as_me: error: could not find source file '$i'" >&2;}
- { (exit 1); exit 1; }; }
- fi
- PKG_SOURCES="$PKG_SOURCES $i"
- # this assumes it is in a VPATH dir
- i=`basename $i`
- # handle user calling this before or after TEA_SETUP_COMPILER
- if test x"${OBJEXT}" != x ; then
- j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}"
- else
- j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}"
- fi
- PKG_OBJECTS="$PKG_OBJECTS $j"
- ;;
- esac
- done
-
-
-
-
- vars="../deflate.c ../gzio.c ../infback.c"
- for i in $vars; do
- case $i in
- \$*)
- # allow $-var names
- PKG_SOURCES="$PKG_SOURCES $i"
- PKG_OBJECTS="$PKG_OBJECTS $i"
- ;;
- *)
- # check for existence - allows for generic/win/unix VPATH
- # To add more dirs here (like 'src'), you have to update VPATH
- # in Makefile.in as well
- if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
- -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
- ; then
- { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5
-echo "$as_me: error: could not find source file '$i'" >&2;}
- { (exit 1); exit 1; }; }
- fi
- PKG_SOURCES="$PKG_SOURCES $i"
- # this assumes it is in a VPATH dir
- i=`basename $i`
- # handle user calling this before or after TEA_SETUP_COMPILER
- if test x"${OBJEXT}" != x ; then
- j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}"
- else
- j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}"
- fi
- PKG_OBJECTS="$PKG_OBJECTS $j"
- ;;
- esac
- done
-
-
-
-
- vars="../inffast.c ../inflate.c ../inftrees.c"
- for i in $vars; do
- case $i in
- \$*)
- # allow $-var names
- PKG_SOURCES="$PKG_SOURCES $i"
- PKG_OBJECTS="$PKG_OBJECTS $i"
- ;;
- *)
- # check for existence - allows for generic/win/unix VPATH
- # To add more dirs here (like 'src'), you have to update VPATH
- # in Makefile.in as well
- if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
- -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
- ; then
- { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5
-echo "$as_me: error: could not find source file '$i'" >&2;}
- { (exit 1); exit 1; }; }
- fi
- PKG_SOURCES="$PKG_SOURCES $i"
- # this assumes it is in a VPATH dir
- i=`basename $i`
- # handle user calling this before or after TEA_SETUP_COMPILER
- if test x"${OBJEXT}" != x ; then
- j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}"
- else
- j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}"
- fi
- PKG_OBJECTS="$PKG_OBJECTS $j"
- ;;
- esac
- done
-
-
-
-
- vars="../trees.c ../uncompr.c ../zutil.c"
- for i in $vars; do
- case $i in
- \$*)
- # allow $-var names
- PKG_SOURCES="$PKG_SOURCES $i"
- PKG_OBJECTS="$PKG_OBJECTS $i"
- ;;
- *)
- # check for existence - allows for generic/win/unix VPATH
- # To add more dirs here (like 'src'), you have to update VPATH
- # in Makefile.in as well
- if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
- -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
- ; then
- { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5
-echo "$as_me: error: could not find source file '$i'" >&2;}
- { (exit 1); exit 1; }; }
- fi
- PKG_SOURCES="$PKG_SOURCES $i"
- # this assumes it is in a VPATH dir
- i=`basename $i`
- # handle user calling this before or after TEA_SETUP_COMPILER
- if test x"${OBJEXT}" != x ; then
- j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}"
- else
- j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}"
- fi
- PKG_OBJECTS="$PKG_OBJECTS $j"
- ;;
- esac
- done
-
-
-
-
-
vars="zlibtcl.h zlibtclDecls.h"
for i in $vars; do
# check for existence, be strict because it is installed
diff -ur tkimg-1.3/libz/tcl/Makefile.in tkimg-1.3.new/libz/tcl/Makefile.in
--- tkimg-1.3/libz/tcl/Makefile.in 2007-10-24 18:57:08.000000000 +0200
+++ tkimg-1.3.new/libz/tcl/Makefile.in 2007-10-24 18:56:59.000000000 +0200
@@ -106,7 +106,7 @@
RANLIB_STUB = @RANLIB_STUB@
SHLIB_CFLAGS = @SHLIB_CFLAGS@
SHLIB_LD = @SHLIB_LD@
-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
+SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -lz
STLIB_LD = @STLIB_LD@
TCL_DEFS = @TCL_DEFS@
TCL_BIN_DIR = @TCL_BIN_DIR@
diff -ur tkimg-1.3/libz/tcl/zlibtclDecls.h tkimg-1.3.new/libz/tcl/zlibtclDecls.h
--- tkimg-1.3/libz/tcl/zlibtclDecls.h 2007-10-18 13:12:44.000000000 +0200
+++ tkimg-1.3.new/libz/tcl/zlibtclDecls.h 2007-10-24 19:01:48.000000000 +0200
@@ -17,7 +17,7 @@
#include <tcl.h>
#include <zlibtclDeclsMask.h>
-#include <../zlib.h>
+#include </usr/include/zlib.h>
#include <zlibtclDeclsUnmask.h>
/* !BEGIN!: Do not edit below this line. */
diff -ur tkimg-1.3/libpng/tcl/pngtclDecls.h tkimg-1.3.new/libpng/tcl/pngtclDecls.h
--- tkimg-1.3/libpng/tcl/pngtclDecls.h 2007-10-25 16:32:30.000000000 +0200
+++ tkimg-1.3.new/libpng/tcl/pngtclDecls.h 2007-10-25 16:48:04.000000000 +0200
@@ -16,7 +16,7 @@
#include <tcl.h>
#include <pngtclDeclsMask.h>
-#include </usr/include/png.h>
+#include </usr/include/libpng12/png.h>
#include <pngtclDeclsUnmask.h>
/* !BEGIN!: Do not edit below this line. */
@@ -221,15 +221,15 @@
png_infopp info_ptr_ptr,
png_infopp end_info_ptr_ptr));
/* 62 */
-EXTERN void png_read_destroy _ANSI_ARGS_((png_structp png_ptr,
- png_infop info_ptr, png_infop end_info_ptr));
+/*EXTERN void png_read_destroy _ANSI_ARGS_((png_structp png_ptr,
+ png_infop info_ptr, png_infop end_info_ptr));*/
/* 63 */
EXTERN void png_destroy_write_struct _ANSI_ARGS_((
png_structpp png_ptr_ptr,
png_infopp info_ptr_ptr));
/* Slot 64 is reserved */
/* 65 */
-EXTERN void png_write_destroy _ANSI_ARGS_((png_structp png_ptr));
+/*EXTERN void png_write_destroy _ANSI_ARGS_((png_structp png_ptr));*/
/* 66 */
EXTERN void png_set_crc_action _ANSI_ARGS_((png_structp png_ptr,
int crit_action, int ancil_action));
@@ -1171,10 +1171,10 @@
void (*png_read_end) _ANSI_ARGS_((png_structp png_ptr, png_infop info_ptr)); /* 59 */
void (*png_destroy_info_struct) _ANSI_ARGS_((png_structp png_ptr, png_infopp info_ptr_ptr)); /* 60 */
void (*png_destroy_read_struct) _ANSI_ARGS_((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr)); /* 61 */
- void (*png_read_destroy) _ANSI_ARGS_((png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr)); /* 62 */
+/* void (*png_read_destroy) _ANSI_ARGS_((png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr)); */ /* 62 */
void (*png_destroy_write_struct) _ANSI_ARGS_((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)); /* 63 */
void *reserved64;
- void (*png_write_destroy) _ANSI_ARGS_((png_structp png_ptr)); /* 65 */
+/* void (*png_write_destroy) _ANSI_ARGS_((png_structp png_ptr));*/ /* 65 */
void (*png_set_crc_action) _ANSI_ARGS_((png_structp png_ptr, int crit_action, int ancil_action)); /* 66 */
void (*png_set_filter) _ANSI_ARGS_((png_structp png_ptr, int method, int filters)); /* 67 */
void (*png_set_filter_heuristics) _ANSI_ARGS_((png_structp png_ptr, int heuristic_method, int num_weights, png_doublep filter_weights, png_doublep filter_costs)); /* 68 */
diff -ur tkimg-1.3/libpng/tcl/pngtclStubInit.c tkimg-1.3.new/libpng/tcl/pngtclStubInit.c
--- tkimg-1.3/libpng/tcl/pngtclStubInit.c 2007-10-18 13:12:50.000000000 +0200
+++ tkimg-1.3.new/libpng/tcl/pngtclStubInit.c 2007-10-25 16:54:55.000000000 +0200
@@ -205,10 +205,10 @@
png_read_end, /* 59 */
png_destroy_info_struct, /* 60 */
png_destroy_read_struct, /* 61 */
- png_read_destroy, /* 62 */
+ NULL, /* 62 */
png_destroy_write_struct, /* 63 */
NULL, /* 64 */
- png_write_destroy, /* 65 */
+ NULL, /* 65 */
png_set_crc_action, /* 66 */
png_set_filter, /* 67 */
#if !defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) || !defined(PNG_FLOATING_POINT_SUPPORTED)
--- NEW FILE tkimg.spec ---
Name: tkimg
Version: 1.3
Release: 0.4.20071018svn%{?dist}
Summary: More Image Formats for Tk
Group: Development/Libraries
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 130 https://tkimg.svn.sourceforge.net/svnroot/tkimg/trunk tkimg-20071018
# tar -czvf tkimg-20071018.tar.gz tkimg-20071018
# Data from subversion
%define svnversion 20071018
Source0: %{name}-%{svnversion}.tar.gz
Patch0: tkimg-build.patch
Patch1: tkimg-systemlibs.patch
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: tcl-devel tk-devel
BuildRequires: libtiff-devel libpng-devel libjpeg-devel zlib-devel
%description
This package contains a collection of image format handlers for the Tk
photo image type, and a new image type, pixmaps.
The provided format handlers include bmp, gif, ico, jpeg, pcx, png,
ppm, ps, sgi, sun, tga, tiff, xbm, and xpm.
%package devel
Summary: Libraries, includes, etc. used to develop an application with %{name}
Group: Development/Libraries
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
%prep
%setup -q -n %{name}-%{svnversion}
%patch0 -p1
%patch1 -p1
%build
%configure --disable-static
%{__make} %{?_smp_mflags}
%install
%{__rm} -fr %{buildroot}
%{__make} DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} install
chmod -R 755 %{buildroot}/%{_libdir}/*
# Make library links
%{__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}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc README
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/*
%{_sysconfdir}/ld.so.conf.d/*
%{_libdir}/*.sh
%{_libdir}/Img1.3
%exclude %{_libdir}/Img
%exclude %{_libdir}/Img1.3/*.a
%files devel
%doc README
%{_includedir}/*
%changelog
* Mon Oct 29 2007 Sergio Pascual <sergiopr at fedoraproject.org> 1.3-0.4.20071018svn
- Giving instructions to duplicate my checkout
* Sun Oct 28 2007 Sergio Pascual <sergiopr at fedoraproject.org> 1.3-0.3.20071018svn
- Using dist tag
* Tue Oct 24 2007 Sergio Pascual <sergiopr at fedoraproject.org> 1.3-0.2.20071018svn
- Using external libraries
* Fri Mar 30 2007 Sergio Pascual <sergiopr at fedoraproject.org> 1.3-0.1.20071018svn
- Initial spec file
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 29 Oct 2007 18:10:51 -0000 1.1
+++ .cvsignore 29 Oct 2007 20:36:44 -0000 1.2
@@ -0,0 +1 @@
+tkimg-20071018.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 29 Oct 2007 18:10:51 -0000 1.1
+++ sources 29 Oct 2007 20:36:44 -0000 1.2
@@ -0,0 +1 @@
+2af12ce6c552e8a8127c040e3f663a63 tkimg-20071018.tar.gz
More information about the fedora-extras-commits
mailing list