diff --git a/.cvsignore b/.cvsignore index e69de29..bd93fa8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +tk8.4.5-src.tar.gz diff --git a/sources b/sources index e69de29..be334c6 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +3bafe03fc79dc72c3c8bfbe2c54cc52a tk8.4.5-src.tar.gz diff --git a/tk-8.3.5-tclm4-soname.patch b/tk-8.3.5-tclm4-soname.patch new file mode 100644 index 0000000..9cf21b8 --- /dev/null +++ b/tk-8.3.5-tclm4-soname.patch @@ -0,0 +1,12 @@ +diff -u tk8.3.5/unix/tcl.m4~ tk8.3.5/unix/tcl.m4 +--- tk8.3.5/unix/tcl.m4~ 2003-01-14 21:22:12.000000000 +0900 ++++ tk8.3.5/unix/tcl.m4 2003-01-14 21:22:12.000000000 +0900 +@@ -949,7 +949,7 @@ + CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" + + if test "$have_dl" = yes; then +- SHLIB_LD="${CC} -shared" ++ SHLIB_LD='${CC} -shared -Wl,-soname,${@}' + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" + LDFLAGS="-rdynamic" diff --git a/tk-8.4.4-lib-perm.patch b/tk-8.4.4-lib-perm.patch new file mode 100644 index 0000000..4527920 --- /dev/null +++ b/tk-8.4.4-lib-perm.patch @@ -0,0 +1,12 @@ +diff -u tk8.4.4/unix/Makefile.in~ tk8.4.4/unix/Makefile.in +--- tk8.4.4/unix/Makefile.in~ 2003-11-25 16:51:37.000000000 +0900 ++++ tk8.4.4/unix/Makefile.in 2003-11-25 16:51:37.000000000 +0900 +@@ -531,7 +531,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) + @echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)" + @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION) + @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/" diff --git a/tk.spec b/tk.spec new file mode 100644 index 0000000..c4aa066 --- /dev/null +++ b/tk.spec @@ -0,0 +1,296 @@ +%define majorver 8.4 + +Summary: Tk graphical toolkit for the Tcl scripting language +Name: tk +Version: %{majorver}.5 +Release: 3 +License: BSD +Group: Development/Languages +URL: http://tcl.sourceforge.net/ +Source0: http://prdownloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires: tcl = %{version}, XFree86-libs +Buildrequires: tcl-devel = %{version}, autoconf213 +Patch1: tk-8.3.5-tclm4-soname.patch +Patch2: tk-8.4.4-lib-perm.patch +Patch3: tk-8.4.5-no_rpath.patch + +%description +When paired with the Tcl scripting language, Tk provides a fast and powerful +way to create cross-platform GUI applications. + +%package devel +Version: %{version} +Summary: Tk graphical toolkit development files +Group: Development/Languages +URL: http://tcl.sourceforge.net/ +Requires: tk = %{version}-%{release}, XFree86-devel + +%description devel +When paired with the Tcl scripting language, Tk provides a fast and powerful +way to create cross-platform GUI applications. + +The package contains the development files and man pages for tk. + +%prep +%setup -n %{name}%{version} -q + +# define DT SONAME in shared lib +%patch1 -p1 -b .soname +%patch2 -p1 -b .rolib +%patch3 -p1 -b .no_rpath +# patch1 touches tcl.m4 +cd unix +autoconf-2.13 + +%build +cd unix +%configure +make %{?_smp_mflags} TK_LIBRARY=%{_datadir}/tk%{majorver} + +%install +rm -rf $RPM_BUILD_ROOT +make install -C unix INSTALL_ROOT=%{buildroot} TK_LIBRARY=%{_datadir}/tk%{majorver} + +ln -s wish%{majorver} %{buildroot}%{_bindir}/wish + +# for linking with -ltk +ln -s libtk%{majorver}.so %{buildroot}%{_libdir}/libtk.so + +mkdirhier %buildroot/%{_includedir}/tk-private/{generic,unix} +cp -p generic/{default,tkInt,tkIntDecls,tkPort}.h %buildroot/%{_includedir}/tk-private/generic +cp -p unix/tkUnix{Default,Port}.h %buildroot/%{_includedir}/tk-private/unix + +# remove buildroot traces +perl -pi -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/tk-private|" %buildroot/%{_libdir}/tkConfig.sh + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{_bindir}/wish* +%{_datadir}/tk%{majorver} +%{_libdir}/libtk%{majorver}.so +%{_libdir}/tk%{majorver} +%{_libdir}/tkConfig.sh +%{_mandir}/man1/* +%doc + +%files devel +%defattr(-,root,root) +%{_includedir}/* +%{_libdir}/libtk.so +%{_libdir}/libtkstub%{majorver}.a +%{_mandir}/man3/* +%{_mandir}/mann/* + +%changelog +* Fri Dec 12 2003 Jens Petersen - 8.4.5-3 +- add private header files needed to build tix in /usr/include/tk-private + +* Mon Dec 1 2003 Thomas Woerner 8.4.5-2 +- removed rpath (patch 3) + +* Thu Nov 27 2003 Jens Petersen - 8.4.5-1 +- new package split out from tcltk +- update to tk 8.4.5 (#88429) +- filtered changelog for tk +- buildrequire autoconf213 (#110583) [mvd@mylinux.com.ua] +- remove build remnants from tkConfig.sh + +* Wed Oct 15 2003 Jens Petersen - 8.3.5-93 + +* Wed Sep 17 2003 Matt Wilson 8.3.5-92 +- rebuild again for #91211 + +* Wed Sep 17 2003 Matt Wilson 8.3.5-91 +- rebuild to fix gzipped file md5sums (#91211) + +* Fri Jul 04 2003 Jens Petersen - 8.3.5-90 +- split out devel files from tcl and tk into -devel subpackages (#90087) + +* Fri Jan 17 2003 Jens Petersen - 8.3.5-85 +- add some requires + +* Tue Jan 14 2003 Jens Petersen - 8.3.5-84 +- link all libs with DT_SONAME using tcl.m4 patch (#81297) +- drop synthetic lib provides +- remove obsolete patches from srpm +- update buildrequires +- use buildroot instead of RPM_BUILD_ROOT +- install all man pages under mandir, instead of moving some from /usr/man +- install libtcl and libtk mode 755 +- introduce _genfilelist macro for clean single-sweep find filelist generation + for each package +- use perl to remove buildroot prefix from filelists + +* Tue Jan 7 2003 Jeff Johnson 8.3.5-80 +- rebuild to generate deps for4 DSO's w/o DT_SONAME correctly. + +* Sat Jan 4 2003 Jeff Johnson 8.3.5-79 +- set execute bits on library so that requires are generated. + +* Tue Dec 10 2002 Jens Petersen 8.3.5-78 +- make lib symlinks to .so not .so.0 + +* Mon Dec 9 2002 Jens Petersen 8.3.5-76 +- make it build on x86_64 (details below) +- don't explicitly update config.{guess,sub} since %%configure does it for us +- added "--without check" rpmbuild option to disable running tests in future +- build and install tcl and tk with script files under datadir (not libdir) +- generate filelists from datadir and not from mandir from now on + +* Tue Dec 3 2002 Jens Petersen +- update to tcl-8.3.5, tk-8.3.5, tcl-html-8.3.5 +- update url for tcl, tk, tclx, itcl, tcllib +- build without all makecfg patches for now + - in particular use upstream versioned library name convention +- add backward compatible lib symlinks for now +- add unversioned symlinks for versioned bindir files +- use make's -C option rather than jumping in and out of source dirs + during install +- use INSTALL_ROOT destdir-like make variable instead of makeinstall + for all subpackages except tix and itcl + +* Mon Oct 21 2002 Jens Petersen +- update to tcl-8.3.4, tk-8.3.4 (#75600), tcllib-1.3, itcl-3.2.1, + tix-8.1.3 (#59098) +- drop the crud compat dir symlinks in libdir +- package now builds without tcl or tk installed (partly #52606) + - replace all relative paths by absolutes ones, using new tcltktop + - give absolute paths to tcl and tk when configuring + - give buildroot bindir path to tcllib make + - export buildroot libdir in LD_LIBRARY_PATH when installing +- replace tclvers and tkvers by tcltkvers and use it +- replace tcl_major and tk_major by tcltk_major and use it +- don't explicitly provide 64bit libs on ia64 and sparc64 + +* Mon Jan 07 2002 Florian La Roche +- fix config.guess and config.sub to newer versions + +* Mon Aug 29 2001 Adrian Havill + +* Mon Aug 8 2001 Adrian Havill +- re-enable glibc string and math inlines; recent gcc is a-ok. +- optimize at -O2 instead of -O +- rename "soname" patches related to makefile/autoconf changes +- added elf "needed" for tk, tclx, tix, itk + +* Thu Jul 19 2001 Adrian Havill +- used %%makeinstall to brute force fix any remaining unflexible makefile dirs +- revert --enable-threads, linux is (still) not ready (yet) (bug 49251) + +* Sun Jul 8 2001 Adrian Havill +- refresh all sources to latest stable (TODO: separate expect/expectk) +- massage out some build stuff to patches (TODO: libtoolize hacked constants) +- remove patches already rolled into the upstream +- removed RPATH (bugs 45569, 46085, 46086), added SONAMEs to ELFs +- changed shared object filenames to something less gross +- reenable threads which seem to work now +- made compile-friendly for IA64 + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild for 7.2. + +* Fri Mar 23 2001 Bill Nottingham +- bzip2 sources + +* Mon Mar 19 2001 Preston Brown +- build fix from ahavill. + +* Tue Feb 13 2001 Adrian Havill +- rebuild so make check passes + +* Fri Oct 20 2000 Than Ngo +- rebuild with -O0 on alpha (bug #19461) + +* Thu Aug 17 2000 Jeff Johnson +- summaries from specspo. + +* Thu Aug 3 2000 Jeff Johnson +- merge "best known" patches from searching, stubs were broken. + +* Thu Jul 27 2000 Jeff Johnson +- rebuild against "working" util-linux col. + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Fri Jun 16 2000 Jeff Johnson +- don't mess with %%{_libdir}, it's gonna be a FHS pita. + +* Fri Jun 2 2000 Jeff Johnson +- FHS packaging changes. +- revert --enable-threads, linux is not ready (yet) (#11789). +- tcl/tk: update to 8.3.1 (#10779). +- abstract major tcltk version for soname expansion etc. + +* Sat Mar 18 2000 Jeff Johnson +- update to (tcl,tk}-8.2.3, expect-5.31, and itcl-3.1.0, URL's as well. +- use perl to drill out pre-pended RPM_BUILD_ROOT. +- configure with --enable-threads (experimental). +- correct hierarchy spelling (#7082). + +* Tue Mar 7 2000 Jeff Johnson +- rebuild for sparc baud rates > 38400. + +* Mon Feb 7 2000 Bill Nottingham +- handle compressed manpages + +* Thu Feb 03 2000 Elliot Lee +- Make changes from bug number 7602 +- Apply patch from bug number 7537 +- Apply fix from bug number 7157 +- Add fixes from bug #7601 to the runtcl patch + +* Wed Feb 02 2000 Cristian Gafton +- fix descriptions +- man pages are compressed (whatapain) + +* Tue Nov 30 1999 Jakub Jelinek +- compile on systems where SIGPWR == SIGLOST. + +* Sat May 1 1999 Jeff Johnson +- update tcl/tk to 8.0.5. + +* Tue Feb 16 1999 Jeff Johnson +- upgrade tcl/tk/tclX to 8.0.4 + +* Tue Jan 12 1999 Cristian Gafton +- call libtoolize to allow building on the arm +- build for glibc 2.1 +- strip binaries + +* Thu Sep 10 1998 Jeff Johnson +- update tcl/tk/tclX to 8.0.3, expect is updated also. + +* Thu May 07 1998 Prospector System +- translations modified for de, fr, tr + +* Thu Apr 09 1998 Erik Troan +- updated version numbers of tcl/tk to relflect inclusion of p2 + +* Wed Mar 25 1998 Cristian Gafton +- updated tcl/tk to patch level 2 + +* Wed Oct 22 1997 Otto Hammersmith +- added patch to remove libieee test in configure.in for tcl and tk. + Shouldn't be needed anymore for glibc systems, but this isn't the "proper" + solution for all systems +- fixed src urls + +* Mon Oct 06 1997 Erik Troan +- removed version numbers from descriptions + +* Mon Sep 22 1997 Erik Troan +- updated to tcl/tk 8.0 and related versions of packages + +* Tue Jun 17 1997 Erik Troan +- built against glibc