[tkimg/f16] unbundle libpng libtiff
Tom Callaway
spot at fedoraproject.org
Mon Aug 1 20:40:13 UTC 2011
commit 865469dbda595f26f29f3faeb22ace7c9a99a93b
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Mon Aug 1 16:40:00 2011 -0400
unbundle libpng libtiff
tkimg-libpng.patch | 186 +++++++++++++++++++++++++++++++++++++++++++++++++++
tkimg-libtiff.patch | 116 ++++++++++++++++++++++++++++++++
tkimg.spec | 62 +++++++++--------
3 files changed, 335 insertions(+), 29 deletions(-)
---
diff --git a/tkimg-libpng.patch b/tkimg-libpng.patch
new file mode 100644
index 0000000..5921503
--- /dev/null
+++ b/tkimg-libpng.patch
@@ -0,0 +1,186 @@
+diff -up tkimg1.4/libpng/configure.in.libpng tkimg1.4/libpng/configure.in
+--- tkimg1.4/libpng/configure.in.libpng 2010-07-07 07:08:08.000000000 -0400
++++ tkimg1.4/libpng/configure.in 2011-08-01 16:10:57.459585090 -0400
+@@ -65,14 +65,6 @@ IMG_SRCPATH(zlibtcl)
+
+ TEA_ADD_SOURCES([pngtcl.c pngtclStubInit.c])
+
+-TEA_ADD_SOURCES([
+- ../compat/libpng/png.c ../compat/libpng/pngerror.c ../compat/libpng/pngmem.c
+- ../compat/libpng/pngpread.c ../compat/libpng/pngread.c ../compat/libpng/pngrio.c
+- ../compat/libpng/pngrtran.c ../compat/libpng/pngrutil.c ../compat/libpng/pngset.c
+- ../compat/libpng/pngtrans.c ../compat/libpng/pngwio.c ../compat/libpng/pngwrite.c
+- ../compat/libpng/pngwtran.c ../compat/libpng/pngwutil.c ../compat/libpng/pngget.c
+-])
+-
+ TEA_ADD_HEADERS([pngtcl.h pngtclDecls.h])
+ TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${zlibtcl_SRC_PATH}`\"])
+ TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${zlibtcl_BUILD_PATH}`\"])
+diff -up tkimg1.4/libpng/configure.libpng tkimg1.4/libpng/configure
+--- tkimg1.4/libpng/configure.libpng 2010-07-13 11:44:38.000000000 -0400
++++ tkimg1.4/libpng/configure 2011-08-01 16:10:57.466585002 -0400
+@@ -5235,11 +5235,6 @@ fi
+
+
+ vars="
+- ../compat/libpng/png.c ../compat/libpng/pngerror.c ../compat/libpng/pngmem.c
+- ../compat/libpng/pngpread.c ../compat/libpng/pngread.c ../compat/libpng/pngrio.c
+- ../compat/libpng/pngrtran.c ../compat/libpng/pngrutil.c ../compat/libpng/pngset.c
+- ../compat/libpng/pngtrans.c ../compat/libpng/pngwio.c ../compat/libpng/pngwrite.c
+- ../compat/libpng/pngwtran.c ../compat/libpng/pngwutil.c ../compat/libpng/pngget.c
+ "
+ for i in $vars; do
+ case $i in
+@@ -6046,7 +6041,7 @@ $as_echo "$tcl_cv_cc_visibility_hidden"
+ if test $tcl_cv_cc_visibility_hidden = yes; then :
+
+
+-$as_echo "#define MODULE_SCOPE extern __attribute__((__visibility__(\"hidden\")))" >>confdefs.h
++$as_echo "#define MODULE_SCOPE extern" >>confdefs.h
+
+
+ fi
+diff -up tkimg1.4/libpng/Makefile.in.libpng tkimg1.4/libpng/Makefile.in
+--- tkimg1.4/libpng/Makefile.in.libpng 2010-07-06 09:36:37.000000000 -0400
++++ tkimg1.4/libpng/Makefile.in 2011-08-01 16:10:57.466585002 -0400
+@@ -111,7 +111,7 @@ RANLIB = @RANLIB@
+ RANLIB_STUB = @RANLIB_STUB@
+ SHLIB_CFLAGS = @SHLIB_CFLAGS@
+ SHLIB_LD = @SHLIB_LD@
+-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -lpng
+ STLIB_LD = @STLIB_LD@
+ TCL_DEFS = @TCL_DEFS@
+ TCL_BIN_DIR = @TCL_BIN_DIR@
+@@ -154,7 +154,7 @@ CONFIG_CLEAN_FILES = Makefile
+ CPPFLAGS = @CPPFLAGS@
+ LIBS = @PKG_LIBS@ @LIBS@
+ AR = @AR@
+-CFLAGS = @CFLAGS@ -DPNG_IMPEXP=MODULE_SCOPE -DPNG_EXTERN=MODULE_SCOPE
++CFLAGS = @CFLAGS@ -DPNG_IMPEXP= -DPNG_EXTERN=MODULE_SCOPE
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+
+ #========================================================================
+diff -up tkimg1.4/libpng/pngtclDecls.h.libpng tkimg1.4/libpng/pngtclDecls.h
+--- tkimg1.4/libpng/pngtclDecls.h.libpng 2010-08-28 08:57:50.000000000 -0400
++++ tkimg1.4/libpng/pngtclDecls.h 2011-08-01 16:26:45.653678748 -0400
+@@ -16,11 +16,11 @@
+
+ #include <tcl.h>
+
++
+ #ifdef PNG_IMPEXP
+ # undef TCL_STORAGE_CLASS
+ # define TCL_STORAGE_CLASS DLLEXPORT
+ #else
+-# define PNG_IMPEXP extern
+ # undef USE_PNGTCL_STUBS
+ # define USE_PNGTCL_STUBS 1
+ #endif
+@@ -28,7 +28,7 @@
+ EXTERN int Pngtcl_Init(Tcl_Interp *interp);
+ EXTERN int Pngtcl_SafeInit(Tcl_Interp *interp);
+
+-#include "../compat/libpng/png.h"
++#include </usr/include/png.h>
+
+ /* !BEGIN!: Do not edit below this line. */
+
+@@ -53,10 +53,10 @@ PNG_IMPEXP png_structp png_create_write_
+ png_voidp error_ptr, png_error_ptr error_fn,
+ png_error_ptr warn_fn);
+ /* 6 */
+-PNG_IMPEXP png_size_t png_get_compression_buffer_size(png_structp png_ptr);
++PNG_IMPEXP png_uint_32 png_get_compression_buffer_size(png_structp png_ptr);
+ /* 7 */
+ PNG_IMPEXP void png_set_compression_buffer_size(png_structp png_ptr,
+- png_size_t size);
++ png_uint_32 size);
+ /* 8 */
+ PNG_IMPEXP int png_reset_zstream(png_structp png_ptr);
+ /* 9 */
+@@ -158,11 +158,12 @@ PNG_IMPEXP void png_set_background(png_
+ double background_gamma);
+ /* 44 */
+ PNG_IMPEXP void png_set_strip_16(png_structp png_ptr);
+-/* 45 */
+-PNG_IMPEXP void png_set_quantize(png_structp png_ptr,
++/* Slot 45 is reserved */
++/* PNG_IMPEXP void png_set_quantize(png_structp png_ptr,
+ png_colorp palette, int num_palette,
+ int maximum_colors, png_uint_16p histogram,
+ int full_dither);
++*/
+ /* 46 */
+ PNG_IMPEXP void png_set_gamma(png_structp png_ptr,
+ double screen_gamma,
+@@ -304,7 +305,7 @@ PNG_IMPEXP void png_progressive_combine
+ png_bytep old_row, png_bytep new_row);
+ /* 94 */
+ PNG_IMPEXP png_voidp png_malloc(png_structp png_ptr,
+- png_alloc_size_t size);
++ png_uint_32 size);
+ /* 95 */
+ PNG_IMPEXP void png_free(png_structp png_ptr, png_voidp ptr);
+ /* 96 */
+@@ -317,7 +318,7 @@ PNG_IMPEXP void png_data_freer(png_stru
+ png_uint_32 mask);
+ /* 98 */
+ PNG_IMPEXP png_voidp png_malloc_default(png_structp png_ptr,
+- png_alloc_size_t size);
++ png_uint_32 size);
+ /* 99 */
+ PNG_IMPEXP void png_free_default(png_structp png_ptr, png_voidp ptr);
+ /* Slot 100 is reserved */
+@@ -340,7 +341,7 @@ PNG_IMPEXP void png_chunk_warning(png_s
+ PNG_IMPEXP png_uint_32 png_get_valid(png_structp png_ptr,
+ png_infop info_ptr, png_uint_32 flag);
+ /* 108 */
+-PNG_IMPEXP png_size_t png_get_rowbytes(png_structp png_ptr,
++PNG_IMPEXP png_uint_32 png_get_rowbytes(png_structp png_ptr,
+ png_infop info_ptr);
+ /* 109 */
+ PNG_IMPEXP png_bytepp png_get_rows(png_structp png_ptr, png_infop info_ptr);
+@@ -1058,7 +1059,8 @@ typedef struct PngtclStubs {
+ void (*png_set_invert_monoPtr) (png_structp png_ptr); /* 42 */
+ void (*png_set_backgroundPtr) (png_structp png_ptr, png_color_16p background_color, int background_gamma_code, int need_expand, double background_gamma); /* 43 */
+ void (*png_set_strip_16Ptr) (png_structp png_ptr); /* 44 */
+- void (*png_set_quantizePtr) (png_structp png_ptr, png_colorp palette, int num_palette, int maximum_colors, png_uint_16p histogram, int full_dither); /* 45 */
++ /* void (*png_set_quantizePtr) (png_structp png_ptr, png_colorp palette, int num_palette, int maximum_colors, png_uint_16p histogram, int full_dither); */
++ void (*reserved45)(void);
+ void (*png_set_gammaPtr) (png_structp png_ptr, double screen_gamma, double default_file_gamma); /* 46 */
+ void (*png_permit_empty_pltePtr) (png_structp png_ptr, int empty_plte_permitted); /* 47 */
+ void (*png_set_flushPtr) (png_structp png_ptr, int nrows); /* 48 */
+@@ -1107,7 +1109,7 @@ typedef struct PngtclStubs {
+ png_voidp (*png_get_progressive_ptrPtr) (png_structp png_ptr); /* 91 */
+ void (*png_process_dataPtr) (png_structp png_ptr, png_infop info_ptr, png_bytep buffer, png_size_t buffer_size); /* 92 */
+ void (*png_progressive_combine_rowPtr) (png_structp png_ptr, png_bytep old_row, png_bytep new_row); /* 93 */
+- png_voidp (*png_mallocPtr) (png_structp png_ptr, png_alloc_size_t size); /* 94 */
++ png_voidp (*png_mallocPtr) (png_structp png_ptr, png_uint_32 size); /* 94 */
+ void (*png_freePtr) (png_structp png_ptr, png_voidp ptr); /* 95 */
+ void (*png_free_dataPtr) (png_structp png_ptr, png_infop info_ptr, png_uint_32 free_me, int num); /* 96 */
+ void (*png_data_freerPtr) (png_structp png_ptr, png_infop info_ptr, int freer, png_uint_32 mask); /* 97 */
+@@ -1435,8 +1437,9 @@ PNG_IMPEXP const PngtclStubs *pngtclStub
+ (pngtclStubsPtr->png_set_backgroundPtr) /* 43 */
+ #define png_set_strip_16 \
+ (pngtclStubsPtr->png_set_strip_16Ptr) /* 44 */
+-#define png_set_quantize \
+- (pngtclStubsPtr->png_set_quantizePtr) /* 45 */
++/* Slot 45 is reserved */
++/* #define png_set_quantize \
++ (pngtclStubsPtr->png_set_quantizePtr) */
+ #define png_set_gamma \
+ (pngtclStubsPtr->png_set_gammaPtr) /* 46 */
+ #define png_permit_empty_plte \
+diff -up tkimg1.4/libpng/pngtclStubInit.c.libpng tkimg1.4/libpng/pngtclStubInit.c
+--- tkimg1.4/libpng/pngtclStubInit.c.libpng 2010-07-08 04:26:15.000000000 -0400
++++ tkimg1.4/libpng/pngtclStubInit.c 2011-08-01 16:10:57.473584914 -0400
+@@ -163,7 +163,7 @@ const PngtclStubs pngtclStubs = {
+ #if !defined(PNG_READ_DITHER_SUPPORTED)
+ 0, /* 45 */
+ #else /* !PNG_READ_DITHER_SUPPORTED */
+- png_set_quantize, /* 45 */
++ 0, /* 45 */
+ #endif /* !PNG_READ_DITHER_SUPPORTED */
+ #if !defined(PNG_READ_GAMMA_SUPPORTED) || !defined(PNG_FLOATING_POINT_SUPPORTED)
+ 0, /* 46 */
diff --git a/tkimg-libtiff.patch b/tkimg-libtiff.patch
new file mode 100644
index 0000000..765e962
--- /dev/null
+++ b/tkimg-libtiff.patch
@@ -0,0 +1,116 @@
+diff -up tkimg1.4/libtiff/configure.libtiff tkimg1.4/libtiff/configure
+--- tkimg1.4/libtiff/configure.libtiff 2010-07-07 04:09:46.000000000 -0400
++++ tkimg1.4/libtiff/configure 2011-08-01 15:49:04.039079729 -0400
+@@ -5183,17 +5183,6 @@ mv -f tifftcl_confdefs.h confdefs.h
+
+
+ vars="
+- ../compat/libtiff/libtiff/tif_aux.c ../compat/libtiff/libtiff/tif_close.c ../compat/libtiff/libtiff/tif_codec.c
+- ../compat/libtiff/libtiff/tif_compress.c ../compat/libtiff/libtiff/tif_dir.c ../compat/libtiff/libtiff/tif_dirinfo.c
+- ../compat/libtiff/libtiff/tif_dirread.c ../compat/libtiff/libtiff/tif_dirwrite.c ../compat/libtiff/libtiff/tif_dumpmode.c
+- ../compat/libtiff/libtiff/tif_error.c ../compat/libtiff/libtiff/tif_fax3.c
+- ../compat/libtiff/libtiff/tif_getimage.c ../compat/libtiff/libtiff/tif_flush.c ../compat/libtiff/libtiff/tif_luv.c
+- ../compat/libtiff/libtiff/tif_lzw.c ../compat/libtiff/libtiff/tif_next.c ../compat/libtiff/libtiff/tif_open.c
+- ../compat/libtiff/libtiff/tif_packbits.c ../compat/libtiff/libtiff/tif_predict.c ../compat/libtiff/libtiff/tif_print.c
+- ../compat/libtiff/libtiff/tif_read.c ../compat/libtiff/libtiff/tif_swab.c ../compat/libtiff/libtiff/tif_strip.c
+- ../compat/libtiff/libtiff/tif_thunder.c ../compat/libtiff/libtiff/tif_tile.c ../compat/libtiff/libtiff/tif_version.c
+- ../compat/libtiff/libtiff/tif_warning.c ../compat/libtiff/libtiff/tif_write.c
+- ../compat/libtiff/libtiff/tif_color.c ../compat/libtiff/libtiff/tif_extension.c
+ "
+ for i in $vars; do
+ case $i in
+@@ -5574,7 +5563,7 @@ if test "${TEA_PLATFORM}" = "windows" ;
+ else
+ CLEANFILES=""
+
+- vars="../compat/libtiff/libtiff/tif_unix.c"
++ vars=""
+ for i in $vars; do
+ case $i in
+ \$*)
+@@ -6053,7 +6042,7 @@ $as_echo "$tcl_cv_cc_visibility_hidden"
+ if test $tcl_cv_cc_visibility_hidden = yes; then :
+
+
+-$as_echo "#define MODULE_SCOPE extern __attribute__((__visibility__(\"hidden\")))" >>confdefs.h
++$as_echo "#define MODULE_SCOPE extern" >>confdefs.h
+
+
+ fi
+diff -up tkimg1.4/libtiff/Makefile.in.libtiff tkimg1.4/libtiff/Makefile.in
+--- tkimg1.4/libtiff/Makefile.in.libtiff 2010-07-07 07:08:08.000000000 -0400
++++ tkimg1.4/libtiff/Makefile.in 2011-08-01 15:49:04.040079716 -0400
+@@ -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@
+@@ -109,7 +109,7 @@ RANLIB = @RANLIB@
+ 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 -up tkimg1.4/libtiff/tifftclDecls.h.libtiff tkimg1.4/libtiff/tifftclDecls.h
+--- tkimg1.4/libtiff/tifftclDecls.h.libtiff 2010-07-07 07:08:08.000000000 -0400
++++ tkimg1.4/libtiff/tifftclDecls.h 2011-08-01 15:49:04.041079703 -0400
+@@ -34,9 +34,13 @@ EXTERN int Tifftcl_SafeInit(Tcl_Interp *
+ */
+ #undef INLINE
+
+-#include "../compat/libtiff/libtiff/tiffio.h"
+-#include "../compat/libtiff/libtiff/tiffiop.h"
+-#include "../compat/libtiff/libtiff/tif_predict.h"
++#include </usr/include/tiffio.h>
++
++/*
++ * Typedefs for ``method pointers'' used internally.
++ */
++typedef unsigned char tidataval_t; /* internal image data value type */
++typedef tidataval_t* tidata_t; /* reference to internal image data */
+
+ /* !BEGIN!: Do not edit below this line. */
+
+diff -up tkimg1.4/tiff/configure.libtiff tkimg1.4/tiff/configure
+--- tkimg1.4/tiff/configure.libtiff 2010-07-13 11:44:38.000000000 -0400
++++ tkimg1.4/tiff/configure 2011-08-01 15:49:04.044079664 -0400
+@@ -5753,7 +5753,7 @@ fi
+ #-----------------------------------------------------------------------
+
+
+- vars="tiff.c tiffJpeg.c tiffZip.c tiffPixar.c"
++ vars="tiff.c"
+ for i in $vars; do
+ case $i in
+ \$*)
+diff -up tkimg1.4/tiff/tiff.c.libtiff tkimg1.4/tiff/tiff.c
+--- tkimg1.4/tiff/tiff.c.libtiff 2010-07-08 06:41:55.000000000 -0400
++++ tkimg1.4/tiff/tiff.c 2011-08-01 15:51:27.451272526 -0400
+@@ -124,14 +124,14 @@ SetupTiffLibrary (interp)
+ if (Zlibtcl_InitStubs(interp, ZLIBTCL_VERSION, 0) == NULL) {
+ return TCL_ERROR;
+ }
+- TIFFRegisterCODEC (COMPRESSION_DEFLATE, "Deflate", TkimgTIFFInitZip);
+- TIFFRegisterCODEC (COMPRESSION_ADOBE_DEFLATE, "AdobeDeflate", TkimgTIFFInitZip);
++ TIFFRegisterCODEC (COMPRESSION_DEFLATE, "Deflate", TIFFInitZIP);
++ TIFFRegisterCODEC (COMPRESSION_ADOBE_DEFLATE, "AdobeDeflate", TIFFInitZIP);
+
+ if (Jpegtcl_InitStubs(interp, JPEGTCL_VERSION, 0) == NULL) {
+ return TCL_ERROR;
+ }
+- TIFFRegisterCODEC (COMPRESSION_JPEG, "JPEG", TkimgTIFFInitJpeg);
+- TIFFRegisterCODEC (COMPRESSION_PIXARLOG, "PixarLog", TkimgTIFFInitPixar);
++ TIFFRegisterCODEC (COMPRESSION_JPEG, "JPEG", TIFFInitJPEG);
++ TIFFRegisterCODEC (COMPRESSION_PIXARLOG, "PixarLog", TIFFInitPixarLog);
+ }
+ }
+ return TCL_OK;
diff --git a/tkimg.spec b/tkimg.spec
index 0d13798..a39c936 100644
--- a/tkimg.spec
+++ b/tkimg.spec
@@ -1,25 +1,25 @@
%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
-Name: tkimg
-Version: 1.4
-Release: 3%{?dist}
-Summary: More Image Formats for Tk
-
-Group: Development/Libraries
-License: BSD
-URL: http://sourceforge.net/projects/tkimg
-Source0: https://downloads.sourceforge.net/project/tkimg/tkimg/1.4/tkimg1.4.tar.bz2
-Patch0: tkimg-zlib.patch
-Patch1: tkimg-jpg.patch
-
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Name: tkimg
+Version: 1.4
+Release: 4%{?dist}
+Summary: Image support library for Tk
+Group: Development/Libraries
+License: BSD
+URL: http://sourceforge.net/projects/tkimg
+Source0: https://downloads.sourceforge.net/project/tkimg/tkimg/1.4/%{name}%{version}.tar.bz2
+Patch0: tkimg-zlib.patch
+Patch1: tkimg-jpg.patch
+Patch2: tkimg-libpng.patch
+Patch3: tkimg-libtiff.patch
# 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
-BuildRequires: tcl-devel tk-devel tcllib
-BuildRequires: zlib-devel libjpeg-devel
-#BuildRequires: libtiff-devel libpng-devel libjpeg-devel zlib-devel libXft-devel
+BuildRequires: tcl-devel tk-devel tcllib
+BuildRequires: zlib-devel libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
Requires: tcl(abi) = 8.5
@@ -30,21 +30,27 @@ 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: libjpeg-devel zlib-devel
-#Requires: libtiff-devel libpng-devel libjpeg-devel zlib-devel
+Summary: Libraries, includes, etc. used to develop an application with %{name}
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: tcl-devel tk-devel
+Requires: libjpeg-devel zlib-devel
+Requires: libtiff-devel
+Requires: libpng-devel
+
%description devel
These are the header files needed to develop a %{name} application
%prep
%setup -q -n %{name}%{version}
-%patch0 -p1
+%patch0 -p1 -b .zlib
rm -rf compat/zlib
-%patch1 -p1
+%patch1 -p1 -b .jpeg
rm -rf compat/libjpeg
+%patch2 -p1 -b .libpng
+rm -rf compat/libpng
+%patch3 -p1 -b .libtiff
+rm -rf compat/libtiff
%build
%configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --libdir=%{tcl_sitearch} --disable-threads --enable-64bit
@@ -68,15 +74,11 @@ btcllibs=`basename $tcllibs`
ln -s tcl%{tcl_version}/Img1.4/$btcllibs %{buildroot}/%{_libdir}/$btcllibs
done
-%clean
-rm -rf %{buildroot}
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
%doc README
%{_libdir}/*.so
%{tcl_sitearch}/Img1.4
@@ -84,13 +86,15 @@ rm -rf %{buildroot}
%exclude %{tcl_sitearch}/Img1.4/*.a
%files devel
-%defattr(-,root,root,-)
%doc README
%{_includedir}/*
%{_libdir}/*.sh
%{tcl_sitearch}/Img1.4/*.a
%changelog
+* Mon Aug 1 2011 Tom Callaway <spot at fedoraproject.org> - 1.4-4
+- Unbundled libpng and libtiff
+
* Sun Feb 20 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4-3
- Unbundled zlib and libjpeg
More information about the scm-commits
mailing list