rpms/tk/devel tk.spec,1.33,1.34

Wed Feb 14 09:50:16 UTC 2007

Author: mmaslano

Update of /cvs/dist/rpms/tk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13918

Modified Files:
	tk.spec 
Log Message:
Changes in spec file for review.



Index: tk.spec
===================================================================
RCS file: /cvs/dist/rpms/tk/devel/tk.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34

--- tk.spec	10 Feb 2007 20:07:22 -0000	1.33
+++ tk.spec	14 Feb 2007 09:50:08 -0000	1.34
@@ -4,19 +4,20 @@
 Summary: Tk graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{majorver}.13
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch:   %{epoch}
 License: BSD
 Group: Development/Languages
-URL: http://tcl.sourceforge.net/
+URL: http://tcl.sourceforge.net
 Source0: http://download.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: tcl = %{epoch}:%{version}
-Requires(post,postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 BuildRequires: tcl-devel = %{epoch}:%{version}, autoconf
-BuildRequires: libX11-devel, sed
+BuildRequires: libX11-devel
 # panedwindow.n from itcl conflicts
-Obsoletes: itcl <= 3.2
+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
@@ -28,10 +29,9 @@
 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/
+URL: http://tcl.sourceforge.net
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: tcl-devel = %{epoch}:%{version}
 Requires: libX11-devel
@@ -62,6 +62,7 @@
 %configure
 make %{?_smp_mflags} TK_LIBRARY=%{_datadir}/%{name}%{majorver}
 
+%check
 # do not run "make test" by default since it requires an X display
 %{?_with_check: %define _with_check 1}
 %{!?_with_check: %define _with_check 0}
@@ -89,23 +90,27 @@
 
 # remove buildroot traces
 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
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-[ ! -h %{_prefix}/lib/%{name}%{majorver} ] || rm %{_prefix}/lib/%{name}%{majorver}
+[ ! -h %{_prefix}/%{_lib}/%{name}%{majorver} ] || rm %{_prefix}/%{_lib}/%{name}%{majorver}
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
 %{_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}/%{name}%{majorver}
 %{_mandir}/man1/*
@@ -121,6 +126,9 @@
 %{_mandir}/mann/*
 
 %changelog
+* Thu Feb 14 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.13-4
+- rhbz#226494 review
+
 * Sat Feb 10 2007 David Cantrell <dcantrell at redhat.com> - 1:8.4.13-3
 - Require correct tcl package on tk
 
@@ -179,7 +187,7 @@
 - update to latest release
 
 * Fri Oct 15 2004 Jens Petersen <petersen at 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)
   - drop tk-8.4.5-pkgIndex-loc.patch
   - remove any compat symlink present before installing
@@ -207,20 +215,20 @@
   so that the package is X11 implementation agnostic for the inclusion of
   xorg-x11 (#118482)
 - 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 at 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
 
 * Wed Mar 10 2004 Jens Petersen <petersen at redhat.com> - 8.4.5-5
 - add tk-8.4.5-autoconf.patch and build with autoconf 2.5x
   (Robert Scheck, #116776)
 - 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
 - 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
 - add doc files
 
@@ -231,7 +239,7 @@
 - rebuilt
 
 * Fri Dec 12 2003 Jens Petersen <petersen at 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 at redhat.com> 8.4.5-2
 - remove rpath with tk-8.4.5-no_rpath.patch
@@ -278,7 +286,7 @@
 
 * Mon Dec  9 2002 Jens Petersen <petersen at redhat.com> 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
+- 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
@@ -320,7 +328,7 @@
 - added elf "needed" for tk, tclx, tix, itk
 
 * Thu Jul 19 2001 Adrian Havill <havill at 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)
 
 * Sun Jul  8 2001 Adrian Havill <havill at redhat.com>
@@ -360,7 +368,7 @@
 - automatic rebuild
 
 * Fri Jun 16 2000 Jeff Johnson <jbj at 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 at redhat.com>
 - FHS packaging changes.


