rpms/tkimg/F-10 tkimg-20081115-syslibs-jpg.patch, NONE, 1.1 tkimg-20081115-syslibs-png.patch, NONE, 1.1 tkimg-20081115-syslibs-tiff.patch, NONE, 1.1 tkimg-20081115-syslibs-zlib.patch, NONE, 1.1 sources, 1.3, 1.4 tkimg.spec, 1.9, 1.10 tkimg-20080505-more-syslibs-fixes.patch, 1.1, NONE tkimg-build.patch, 1.2, NONE tkimg-systemlibs.patch, 1.1, NONE
Sergio Pascual
sergiopr at fedoraproject.org
Sun Nov 16 12:41:43 UTC 2008
- Previous message: rpms/python-wikimarkup/devel import.log, NONE, 1.1 python-wikimarkup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/python-wikimarkup/F-9 import.log, NONE, 1.1 python-wikimarkup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sergiopr
Update of /cvs/pkgs/rpms/tkimg/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32507
Modified Files:
sources tkimg.spec
Added Files:
tkimg-20081115-syslibs-jpg.patch
tkimg-20081115-syslibs-png.patch
tkimg-20081115-syslibs-tiff.patch
tkimg-20081115-syslibs-zlib.patch
Removed Files:
tkimg-20080505-more-syslibs-fixes.patch tkimg-build.patch
tkimg-systemlibs.patch
Log Message:
* Sat Nov 15 2008 Sergio Pascual <sergiopr at fedoraproject.org> 1.4-0.1.20081115svn
- New upstream source, version 173 from trunk, release 1.4
- Relative links in libdir
- Removed ignored disable-static option in configure
- Patches simplified and separated by library
tkimg-20081115-syslibs-jpg.patch:
--- NEW FILE tkimg-20081115-syslibs-jpg.patch ---
diff -ur tkimg-20081115/libjpeg/tcl/jpegtclDecls.h tkimg-20081115.jpg/libjpeg/tcl/jpegtclDecls.h
--- tkimg-20081115/libjpeg/tcl/jpegtclDecls.h 2008-10-22 12:55:37.000000000 +0200
+++ tkimg-20081115.jpg/libjpeg/tcl/jpegtclDecls.h 2008-11-16 10:05:19.000000000 +0100
@@ -19,10 +19,10 @@
/* undef Tcl macros that conflict with libjpeg stuff (sigh) */
#undef EXTERN
-#include <jpegtclDeclsMask.h>
-#include <../jpeglib.h>
-#include <../jerror.h>
-#include <jpegtclDeclsUnmask.h>
+#include "jpegtclDeclsMask.h"
+#include </usr/include/jpeglib.h>
+#include </usr/include/jerror.h>
+#include "jpegtclDeclsUnmask.h"
/*
* And recreate the definition of "tcl.h", we need it below.
diff -ur tkimg-20081115/libjpeg/tcl/Makefile.in tkimg-20081115.jpg/libjpeg/tcl/Makefile.in
--- tkimg-20081115/libjpeg/tcl/Makefile.in 2008-10-23 18:09:37.000000000 +0200
+++ tkimg-20081115.jpg/libjpeg/tcl/Makefile.in 2008-11-16 10:04:25.000000000 +0100
@@ -33,8 +33,8 @@
# $(srcdir) or in the generic, win or unix subdirectory.
#========================================================================
-PKG_SOURCES = @PKG_SOURCES@
-PKG_OBJECTS = @PKG_OBJECTS@
+PKG_SOURCES = jpegtcl.c jpegtclStubInit.c
+PKG_OBJECTS = jpegtcl.o jpegtclStubInit.o
PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
@@ -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@
tkimg-20081115-syslibs-png.patch:
--- NEW FILE tkimg-20081115-syslibs-png.patch ---
diff -ur tkimg-20081115/libpng/tcl/Makefile.in tkimg-20081115.png/libpng/tcl/Makefile.in
--- tkimg-20081115/libpng/tcl/Makefile.in 2008-10-23 18:09:37.000000000 +0200
+++ tkimg-20081115.png/libpng/tcl/Makefile.in 2008-11-15 18:36:12.000000000 +0100
@@ -37,8 +37,8 @@
# $(srcdir) or in the generic, win or unix subdirectory.
#========================================================================
-PKG_SOURCES = @PKG_SOURCES@
-PKG_OBJECTS = @PKG_OBJECTS@
+PKG_SOURCES = pngtcl.c pngtclStubInit.c
+PKG_OBJECTS = pngtcl.o pngtclStubInit.o
PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
@@ -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-20081115/libpng/tcl/pngtclDecls.h tkimg-20081115.png/libpng/tcl/pngtclDecls.h
--- tkimg-20081115/libpng/tcl/pngtclDecls.h 2008-10-22 12:55:37.000000000 +0200
+++ tkimg-20081115.png/libpng/tcl/pngtclDecls.h 2008-11-15 18:34:48.000000000 +0100
@@ -16,7 +16,7 @@
#include <tcl.h>
#include <pngtclDeclsMask.h>
-#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-20081115/libpng/tcl/pngtclStubInit.c tkimg-20081115.png/libpng/tcl/pngtclStubInit.c
--- tkimg-20081115/libpng/tcl/pngtclStubInit.c 2008-10-22 14:06:38.000000000 +0200
+++ tkimg-20081115.png/libpng/tcl/pngtclStubInit.c 2008-11-15 18:35:22.000000000 +0100
@@ -205,10 +205,10 @@
png_read_end, /* 59 */
png_destroy_info_struct, /* 60 */
png_destroy_read_struct, /* 61 */
- png_read_destroy, /* 62 */
+/* png_read_destroy, */ /* 62 */
png_destroy_write_struct, /* 63 */
NULL, /* 64 */
- png_write_destroy, /* 65 */
+/* png_write_destroy, */ /* 65 */
png_set_crc_action, /* 66 */
png_set_filter, /* 67 */
#if !defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) || !defined(PNG_FLOATING_POINT_SUPPORTED)
tkimg-20081115-syslibs-tiff.patch:
--- NEW FILE tkimg-20081115-syslibs-tiff.patch ---
diff -ur tkimg-20081115/libtiff/tcl/Makefile.in tkimg-20081115.tiff/libtiff/tcl/Makefile.in
--- tkimg-20081115/libtiff/tcl/Makefile.in 2008-10-23 18:09:37.000000000 +0200
+++ tkimg-20081115.tiff/libtiff/tcl/Makefile.in 2008-11-16 10:49:49.000000000 +0100
@@ -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 = tifftcl.c tifftclStubInit.c
+PKG_OBJECTS = tifftcl.o tifftclStubInit.o
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-20081115/libtiff/tcl/tifftclDecls.h tkimg-20081115.tiff/libtiff/tcl/tifftclDecls.h
--- tkimg-20081115/libtiff/tcl/tifftclDecls.h 2008-10-22 12:55:37.000000000 +0200
+++ tkimg-20081115.tiff/libtiff/tcl/tifftclDecls.h 2008-11-16 10:53:05.000000000 +0100
@@ -24,9 +24,11 @@
#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. */
tkimg-20081115-syslibs-zlib.patch:
--- NEW FILE tkimg-20081115-syslibs-zlib.patch ---
diff -ur tkimg-20081115/libz/tcl/configure.in tkimg-20081115.libz/libz/tcl/configure.in
--- tkimg-20081115/libz/tcl/configure.in 2007-10-13 01:39:51.000000000 +0200
+++ tkimg-20081115.libz/libz/tcl/configure.in 2008-11-15 18:22:45.000000000 +0100
@@ -47,16 +47,12 @@
#-----------------------------------------------------------------------
TEA_ADD_SOURCES([zlibtcl.c zlibtclStubInit.c])
-TEA_ADD_SOURCES([../adler32.c ../compress.c ../crc32.c])
-TEA_ADD_SOURCES([../deflate.c ../gzio.c ../infback.c])
-TEA_ADD_SOURCES([../inffast.c ../inflate.c ../inftrees.c])
-TEA_ADD_SOURCES([../trees.c ../uncompr.c ../zutil.c])
TEA_ADD_HEADERS([zlibtcl.h zlibtclDecls.h])
TEA_ADD_HEADERS([zlibtclDeclsMask.h zlibtclDeclsUnmask.h])
TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"])
-TEA_ADD_LIBS([])
+TEA_ADD_LIBS([-lz])
TEA_ADD_CFLAGS([])
TEA_ADD_STUB_SOURCES([zlibtclStubLib.c])
TEA_ADD_SOURCES([zlibtclStubLib.c])
diff -ur tkimg-20081115/libz/tcl/Makefile.in tkimg-20081115.libz/libz/tcl/Makefile.in
--- tkimg-20081115/libz/tcl/Makefile.in 2008-10-23 18:09:37.000000000 +0200
+++ tkimg-20081115.libz/libz/tcl/Makefile.in 2008-11-15 18:24:13.000000000 +0100
@@ -33,8 +33,8 @@
# $(srcdir) or in the generic, win or unix subdirectory.
#========================================================================
-PKG_SOURCES = @PKG_SOURCES@
-PKG_OBJECTS = @PKG_OBJECTS@
+PKG_SOURCES = zlibtcl.c zlibtclStubInit.c
+PKG_OBJECTS = zlibtcl.o zlibtclStubInit.o
PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
@@ -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-20081115/libz/tcl/zlibtclDecls.h tkimg-20081115.libz/libz/tcl/zlibtclDecls.h
--- tkimg-20081115/libz/tcl/zlibtclDecls.h 2008-10-22 12:55:37.000000000 +0200
+++ tkimg-20081115.libz/libz/tcl/zlibtclDecls.h 2008-11-15 18:15:01.000000000 +0100
@@ -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. */
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 5 May 2008 10:53:16 -0000 1.3
+++ sources 16 Nov 2008 12:41:12 -0000 1.4
@@ -1 +1 @@
-ddac07532734ac9ef3ea5dfaaf35ad58 tkimg-20080505.tar.bz2
+5da60e405571cb81d66ae0bb88b93f8f tkimg-20081115.tar.gz
Index: tkimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tkimg/F-10/tkimg.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tkimg.spec 16 Oct 2008 16:43:14 -0000 1.9
+++ tkimg.spec 16 Nov 2008 12:41:13 -0000 1.10
@@ -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 20080505
+%define svnversion 20081115
Name: tkimg
-Version: 1.3
-Release: 0.12.%{svnversion}svn%{?dist}
+Version: 1.4
+Release: 0.1.%{svnversion}svn%{?dist}
Summary: More Image Formats for Tk
Group: Development/Libraries
@@ -13,14 +13,18 @@
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
+# svn export -r 173 https://tkimg.svn.sourceforge.net/svnroot/tkimg/trunk tkimg-20081115
+# tar -czvf tkimg-20081115.tar.gz tkimg-20081115
# Data from subversion
-Source0: %{name}-%{svnversion}.tar.bz2
-Patch0: tkimg-build.patch
-Patch1: tkimg-systemlibs.patch
-Patch2: tkimg-20080505-more-syslibs-fixes.patch
+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
+Patch0: tkimg-20081115-syslibs-zlib.patch
+Patch1: tkimg-20081115-syslibs-png.patch
+Patch2: tkimg-20081115-syslibs-tiff.patch
+Patch3: tkimg-20081115-syslibs-jpg.patch
+
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: tcl-devel tk-devel
@@ -48,10 +52,10 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
-%configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --disable-static \
- --libdir=%{tcl_sitearch}
+%configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --libdir=%{tcl_sitearch}
%{__make} %{?_smp_mflags}
%install
@@ -66,10 +70,9 @@
# Make library links
%{__mv} %{buildroot}/%{tcl_sitearch}/*.sh %{buildroot}/%{_libdir}
-for tcllibs in %{buildroot}/%{tcl_sitearch}/Img1.3/*tcl*.so
-do
+for tcllibs in %{buildroot}/%{tcl_sitearch}/Img1.4/*tcl*.so; do
btcllibs=`basename $tcllibs`
-%{__ln_s} %{tcl_sitearch}/Img1.3/$btcllibs %{buildroot}/%{_libdir}/$btcllibs
+%{__ln_s} tcl%{tcl_version}/Img1.4/$btcllibs %{buildroot}/%{_libdir}/$btcllibs
done
%clean
@@ -81,19 +84,25 @@
%files
%defattr(-,root,root,-)
-%doc README
+%doc README
%{_libdir}/*.so
-%{tcl_sitearch}/Img1.3
-%exclude %{tcl_sitearch}/Img1.3/*.a
-
+%{tcl_sitearch}/Img1.4
+%exclude %{tcl_sitearch}/Img1.4/*.a
%files devel
-%doc README
+%defattr(-,root,root,-)
+%doc README
%{_includedir}/*
%{_libdir}/*.sh
-%{tcl_sitearch}/Img1.3/*.a
+%{tcl_sitearch}/Img1.4/*.a
%changelog
+* Sat Nov 15 2008 Sergio Pascual <sergiopr at fedoraproject.org> 1.4-0.1.20081115svn
+- New upstream source, version 173 from trunk, release 1.4
+- Relative links in libdir
+- Removed ignored disable-static option in configure
+- Patches simplified and separated by library
+
* Thu Jul 03 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.3-0.12.200805005svn
- more syslibs fixes (note: this code is held together with spit and chewing gum)
--- tkimg-20080505-more-syslibs-fixes.patch DELETED ---
--- tkimg-build.patch DELETED ---
--- tkimg-systemlibs.patch DELETED ---
- Previous message: rpms/python-wikimarkup/devel import.log, NONE, 1.1 python-wikimarkup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/python-wikimarkup/F-9 import.log, NONE, 1.1 python-wikimarkup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list