rpms
/
tk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Changes in spec file for review.

This commit is contained in:
Marcela Mašláňová 2007-02-14 09:50:08 +00:00
parent 3e1dd001aa
commit 47658172bf
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
tk.spec
View File

@ -4,19 +4,20 @@
Summary: Tk graphical toolkit for the Tcl scripting language Summary: Tk graphical toolkit for the Tcl scripting language
Name: tk Name: tk
Version: %{majorver}.13 Version: %{majorver}.13
Release: 3%{?dist} Release: 4%{?dist}
Epoch: %{epoch} Epoch: %{epoch}
License: BSD License: BSD
Group: Development/Languages Group: Development/Languages
URL: http://tcl.sourceforge.net/ URL: http://tcl.sourceforge.net
Source0: http://download.sourceforge.net/tcl/%{name}%{version}-src.tar.gz Source0: http://download.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: tcl = %{epoch}:%{version} Requires: tcl = %{epoch}:%{version}
Requires(post,postun): /sbin/ldconfig Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: tcl-devel = %{epoch}:%{version}, autoconf BuildRequires: tcl-devel = %{epoch}:%{version}, autoconf
BuildRequires: libX11-devel, sed BuildRequires: libX11-devel
# panedwindow.n from itcl conflicts # panedwindow.n from itcl conflicts
Obsoletes: itcl <= 3.2 Conflicts: itcl <= 3.2
Patch1: tk-8.3.5-tclm4-soname.patch Patch1: tk-8.3.5-tclm4-soname.patch
Patch2: tk-8.4.4-lib-perm.patch Patch2: tk-8.4.4-lib-perm.patch
Patch3: tk-8.4-no_rpath.patch Patch3: tk-8.4-no_rpath.patch
@ -28,10 +29,9 @@ When paired with the Tcl scripting language, Tk provides a fast and powerful
way to create cross-platform GUI applications. way to create cross-platform GUI applications.
%package devel %package devel
Version: %{version}
Summary: Tk graphical toolkit development files Summary: Tk graphical toolkit development files
Group: Development/Languages Group: Development/Languages
URL: http://tcl.sourceforge.net/ URL: http://tcl.sourceforge.net
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: tcl-devel = %{epoch}:%{version} Requires: tcl-devel = %{epoch}:%{version}
Requires: libX11-devel Requires: libX11-devel
@ -62,6 +62,7 @@ cd unix
%configure %configure
make %{?_smp_mflags} TK_LIBRARY=%{_datadir}/%{name}%{majorver} make %{?_smp_mflags} TK_LIBRARY=%{_datadir}/%{name}%{majorver}
%check
# do not run "make test" by default since it requires an X display # do not run "make test" by default since it requires an X display
%{?_with_check: %define _with_check 1} %{?_with_check: %define _with_check 1}
%{!?_with_check: %define _with_check 0} %{!?_with_check: %define _with_check 0}
@ -89,23 +90,27 @@ find generic unix -name "*.h" -exec cp -p '{}' %buildroot/%{_includedir}/%{name}
# remove buildroot traces # remove buildroot traces
sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %buildroot/%{_libdir}/%{name}Config.sh sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %buildroot/%{_libdir}/%{name}Config.sh
rm -rf %buildroot/%{_datadir}/%{name}%{majorver}/tkAppInit.c
rm -rf %buildroot/%{_datadir}/%{name}%{majorver}/prolog.ps
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%pre %pre
[ ! -h %{_prefix}/lib/%{name}%{majorver} ] || rm %{_prefix}/lib/%{name}%{majorver} [ ! -h %{_prefix}/%{_lib}/%{name}%{majorver} ] || rm %{_prefix}/%{_lib}/%{name}%{majorver}
%post %post -p /sbin/ldconfig
/sbin/ldconfig
%postun %postun -p /sbin/ldconfig
/sbin/ldconfig
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/wish* %{_bindir}/wish*
%{_datadir}/%{name}%{majorver} %{_datadir}/%{name}%{majorver}/demos/
%{_datadir}/%{name}%{majorver}/images/
%{_datadir}/%{name}%{majorver}/msgs/
%{_datadir}/%{name}%{majorver}/*.tcl
%{_datadir}/%{name}%{majorver}/tclIndex
%{_libdir}/lib%{name}%{majorver}.so %{_libdir}/lib%{name}%{majorver}.so
%{_libdir}/%{name}%{majorver} %{_libdir}/%{name}%{majorver}
%{_mandir}/man1/* %{_mandir}/man1/*
@ -121,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/mann/* %{_mandir}/mann/*
%changelog %changelog
* Thu Feb 14 2007 Marcela Maslanova <mmaslano@redhat.com> - 1:8.4.13-4
- rhbz#226494 review
* Sat Feb 10 2007 David Cantrell <dcantrell@redhat.com> - 1:8.4.13-3 * Sat Feb 10 2007 David Cantrell <dcantrell@redhat.com> - 1:8.4.13-3
- Require correct tcl package on tk - Require correct tcl package on tk
@ -179,7 +187,7 @@ rm -rf $RPM_BUILD_ROOT
- update to latest release - update to latest release
* Fri Oct 15 2004 Jens Petersen <petersen@redhat.com> - 8.4.7-2 * Fri Oct 15 2004 Jens Petersen <petersen@redhat.com> - 8.4.7-2
- move pkgIndex.tcl back into %{_libdir}/%{name}%{majorver} so that multilib - move pkgIndex.tcl back into {_libdir}/{name}{majorver} so that multilib
parallel installs works (135310) parallel installs works (135310)
- drop tk-8.4.5-pkgIndex-loc.patch - drop tk-8.4.5-pkgIndex-loc.patch
- remove any compat symlink present before installing - remove any compat symlink present before installing
@ -207,20 +215,20 @@ rm -rf $RPM_BUILD_ROOT
so that the package is X11 implementation agnostic for the inclusion of so that the package is X11 implementation agnostic for the inclusion of
xorg-x11 (#118482) xorg-x11 (#118482)
- Added Requires(post,postun): /sbin/ldconfig - Added Requires(post,postun): /sbin/ldconfig
- Added BuildRequires: perl, as perl is used during %%install - Added BuildRequires: perl, as perl is used during install
* Thu Mar 11 2004 Jens Petersen <petersen@redhat.com> - 8.4.5-6 * Thu Mar 11 2004 Jens Petersen <petersen@redhat.com> - 8.4.5-6
- generate compat symlink instead in %%post if /usr/lib/tk%{majorver} - generate compat symlink instead in post if /usr/lib/tk{majorver}
does not exist does not exist
* Wed Mar 10 2004 Jens Petersen <petersen@redhat.com> - 8.4.5-5 * Wed Mar 10 2004 Jens Petersen <petersen@redhat.com> - 8.4.5-5
- add tk-8.4.5-autoconf.patch and build with autoconf 2.5x - add tk-8.4.5-autoconf.patch and build with autoconf 2.5x
(Robert Scheck, #116776) (Robert Scheck, #116776)
- add tk-8.4.5-pkgIndex-loc.patch to install pkgIndex.tcl in the script dir - add tk-8.4.5-pkgIndex-loc.patch to install pkgIndex.tcl in the script dir
- use %%{name} throughout for greater portability - use {name} throughout for greater portability
- add a "--with check" rpmbuild option - add a "--with check" rpmbuild option
- use "mkdir -p" instead of "mkdirhier" (Robert Scheck, #116774) - use "mkdir -p" instead of "mkdirhier" (Robert Scheck, #116774)
- /usr/lib/tk8.4 is now a compat symlink to %{_datadir}/tk8.4 - /usr/lib/tk8.4 is now a compat symlink to {_datadir}/tk8.4
- include all the private header files under /usr/include/tk-private - include all the private header files under /usr/include/tk-private
- add doc files - add doc files
@ -231,7 +239,7 @@ rm -rf $RPM_BUILD_ROOT
- rebuilt - rebuilt
* Fri Dec 12 2003 Jens Petersen <petersen@redhat.com> - 8.4.5-3 * Fri Dec 12 2003 Jens Petersen <petersen@redhat.com> - 8.4.5-3
- add private header files needed to build tix in %{_includedir}/%{name}-private - add private header files needed to build tix in {_includedir}/{name}-private
* Mon Dec 1 2003 Thomas Woerner <twoerner@redhat.com> 8.4.5-2 * Mon Dec 1 2003 Thomas Woerner <twoerner@redhat.com> 8.4.5-2
- remove rpath with tk-8.4.5-no_rpath.patch - remove rpath with tk-8.4.5-no_rpath.patch
@ -278,7 +286,7 @@ rm -rf $RPM_BUILD_ROOT
* Mon Dec 9 2002 Jens Petersen <petersen@redhat.com> 8.3.5-76 * Mon Dec 9 2002 Jens Petersen <petersen@redhat.com> 8.3.5-76
- make it build on x86_64 (details below) - make it build on x86_64 (details below)
- don't explicitly update config.{guess,sub} since %%configure does it for us - don't explicitly update config.{guess,sub} since configure does it for us
- added "--without check" rpmbuild option to disable running tests in future - added "--without check" rpmbuild option to disable running tests in future
- build and install tcl and tk with script files under datadir (not libdir) - build and install tcl and tk with script files under datadir (not libdir)
- generate filelists from datadir and not from mandir from now on - generate filelists from datadir and not from mandir from now on
@ -320,7 +328,7 @@ rm -rf $RPM_BUILD_ROOT
- added elf "needed" for tk, tclx, tix, itk - added elf "needed" for tk, tclx, tix, itk
* Thu Jul 19 2001 Adrian Havill <havill@redhat.com> * Thu Jul 19 2001 Adrian Havill <havill@redhat.com>
- used %%makeinstall to brute force fix any remaining unflexible makefile dirs - used makeinstall to brute force fix any remaining unflexible makefile dirs
- revert --enable-threads, linux is (still) not ready (yet) (bug 49251) - revert --enable-threads, linux is (still) not ready (yet) (bug 49251)
* Sun Jul 8 2001 Adrian Havill <havill@redhat.com> * Sun Jul 8 2001 Adrian Havill <havill@redhat.com>
@ -360,7 +368,7 @@ rm -rf $RPM_BUILD_ROOT
- automatic rebuild - automatic rebuild
* Fri Jun 16 2000 Jeff Johnson <jbj@redhat.com> * Fri Jun 16 2000 Jeff Johnson <jbj@redhat.com>
- don't mess with %%{_libdir}, it's gonna be a FHS pita. - don't mess with {_libdir}, it's gonna be a FHS pita.
* Fri Jun 2 2000 Jeff Johnson <jbj@redhat.com> * Fri Jun 2 2000 Jeff Johnson <jbj@redhat.com>
- FHS packaging changes. - FHS packaging changes.