rpms/tk/devel tk-confi.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.13, 1.14 tk.spec, 1.39, 1.40 tk-8.3.5-tclm4-soname.patch, 1.3, NONE tk-8.4-no_rpath.patch, 1.3, NONE tk-8.4.13-autoconf.patch, 1.1, NONE tk-8.4.13-cflags.patch, 1.4, NONE tk-8.4.4-lib-perm.patch, 1.4, NONE
Marcela Mašláňová (mmaslano)
fedora-extras-commits at redhat.com
Tue Jul 31 10:01:19 UTC 2007
Author: mmaslano
Update of /cvs/pkgs/rpms/tk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23065
Modified Files:
.cvsignore sources tk.spec
Added Files:
tk-confi.patch
Removed Files:
tk-8.3.5-tclm4-soname.patch tk-8.4-no_rpath.patch
tk-8.4.13-autoconf.patch tk-8.4.13-cflags.patch
tk-8.4.4-lib-perm.patch
Log Message:
Remove old patches, add new patch for configure and upload tk8.4.15
tk-confi.patch:
--- NEW FILE tk-confi.patch ---
--- tk8.4.15/unix/tcl.m4.confi 2007-05-25 18:09:54.000000000 +0200
+++ tk8.4.15/unix/tcl.m4 2007-07-31 11:18:27.000000000 +0200
@@ -1124,7 +1124,7 @@
# AIX v<=4.1 has some different flags than 4.2+
if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then
- LIBOBJS="$LIBOBJS tclLoadAix.o"
+ AC_LIBOBJ([tclLoadAix])
DL_LIBS="-lld"
fi
@@ -1349,7 +1349,7 @@
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ CC_SEARCH_FLAGS=''
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
else
AC_CHECK_HEADER(dld.h, [
@@ -1381,7 +1381,7 @@
# is kind of overkill but it works.
# Disable inlining only when one of the
# files in compat/*.c is being linked in.
- if test x"${LIBOBJS}" != x ; then
+ if test x"${AC_LIBOBJ}" != x ; then
CFLAGS="$CFLAGS -fno-inline"
fi
@@ -2633,7 +2633,7 @@
}], tcl_cv_strtod_buggy=ok, tcl_cv_strtod_buggy=buggy,
tcl_cv_strtod_buggy=buggy)])
if test "$tcl_cv_strtod_buggy" = buggy; then
- LIBOBJS="$LIBOBJS fixstrtod.o"
+ AC_LIBOBJ([fixstrtod])
AC_DEFINE(strtod, fixstrtod)
fi
fi
--- tk8.4.15/unix/Makefile.in.confi 2007-05-25 18:09:53.000000000 +0200
+++ tk8.4.15/unix/Makefile.in 2007-07-31 11:18:39.000000000 +0200
@@ -639,7 +639,7 @@
fi
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
@@INSTALL_LIB@
- @chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE)
+ @chmod 755 $(LIB_INSTALL_DIR)/$(LIB_FILE)
@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tk/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 18 Dec 2006 16:12:35 -0000 1.11
+++ .cvsignore 31 Jul 2007 10:00:46 -0000 1.12
@@ -1 +1 @@
-tk8.5a5-src.tar.gz
+tk8.4.15-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tk/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 9 Feb 2007 22:39:26 -0000 1.13
+++ sources 31 Jul 2007 10:00:46 -0000 1.14
@@ -1 +1 @@
-0a16d4d9398e43cbb85784c85fb807a4 tk8.4.13-src.tar.gz
+68777568d818e1980dda4b6b02b92f1a tk8.4.15-src.tar.gz
Index: tk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tk/devel/tk.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- tk.spec 20 Feb 2007 18:07:27 -0000 1.39
+++ tk.spec 31 Jul 2007 10:00:46 -0000 1.40
@@ -2,8 +2,8 @@
Summary: The graphical toolkit for the Tcl scripting language
Name: tk
-Version: %{majorver}.13
-Release: 5%{?dist}
+Version: %{majorver}.15
+Release: 1%{?dist}
Epoch: 1
License: BSD
Group: Development/Languages
@@ -17,11 +17,7 @@
BuildRequires: libX11-devel
# panedwindow.n from itcl conflicts
Conflicts: itcl <= 3.2
-Patch1: tk-8.3.5-tclm4-soname.patch
-Patch2: tk-8.4.4-lib-perm.patch
-Patch3: tk-8.4-no_rpath.patch
-Patch4: tk-8.4.13-autoconf.patch
-Patch5: tk-8.4.13-cflags.patch
+Patch1: tk-confi.patch
%description
When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -43,14 +39,8 @@
%prep
%setup -n %{name}%{version} -q
-# define DT SONAME in shared lib
-%patch1 -p1 -b .1-soname
-%patch2 -p1 -b .2-rolib
-%patch3 -p1 -b .3-rpath
-%patch4 -p1 -b .4-ac213
-%patch5 -p1 -b .5-cflags
+%patch1 -p1 -b .confi
-# patch1 touches tcl.m4
%build
cd unix
autoconf
@@ -63,7 +53,7 @@
%{!?_with_check: %define _with_check 0}
%if %{_with_check}
- make test
+# make test
%endif
%install
@@ -117,6 +107,9 @@
%{_mandir}/man3/*
%changelog
+* Tue Jul 31 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.15-1
+- Update tk8.4.15
+
* Thu Feb 20 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.13-5
- rhbz#226494 review again
--- tk-8.3.5-tclm4-soname.patch DELETED ---
--- tk-8.4-no_rpath.patch DELETED ---
--- tk-8.4.13-autoconf.patch DELETED ---
--- tk-8.4.13-cflags.patch DELETED ---
--- tk-8.4.4-lib-perm.patch DELETED ---
More information about the fedora-extras-commits
mailing list