[tk/private-master-8.6] New version

[Jaroslav Škarvada]

commit 0b0e5d82dcff6509511502ea436713b6c4488227
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Thu Aug 15 17:19:12 2013 +0200

    New version
    
      Resolves: rhbz#889201
    - Removed seg_input patch (upstreamed)
    - Minor cleanups

 tk-8.5.14-conf.patch    |   19 -------------
 tk-8.5.14-fix-xft.patch |   15 ----------
 tk-seg_input.patch      |   68 -----------------------------------------------
 tk.spec                 |   50 +++++++++++++++++-----------------
 tk8.5-make.patch        |   13 ---------
 5 files changed, 25 insertions(+), 140 deletions(-)
---
diff --git a/tk.spec b/tk.spec
index e2ec3b9..3b4e7c8 100644
--- a/tk.spec
+++ b/tk.spec
@@ -1,5 +1,5 @@
-%define majorver 8.5
-%define vers %{majorver}.14
+%define majorver 8.6
+%define vers %{majorver}.0
 
 Summary: The graphical toolkit for the Tcl scripting language
 Name: tk
@@ -21,12 +21,10 @@ BuildRequires: libXft-devel
 Conflicts: itcl <= 3.2
 Obsoletes: tile <= 0.8.2
 Provides: tile = 0.8.2
-Patch1: tk8.5-make.patch
-Patch2: tk-8.5.14-conf.patch
-# this patch isn't needed since tk8.6b1
-Patch3: tk-seg_input.patch
+Patch1: tk8.6-make.patch
+Patch2: tk-8.6.0-conf.patch
 # fix implicit linkage of freetype that breaks xft detection (#677692)
-Patch4: tk-8.5.14-fix-xft.patch
+Patch3: tk-8.6.0-fix-xft.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -50,14 +48,13 @@ The package contains the development files and man pages for tk.
 
 %patch1 -p1 -b .make
 %patch2 -p1 -b .conf
-%patch3 -p1 -b .seg
-%patch4 -p1 -b .fix-xft
+%patch3 -p1 -b .fix-xft
 
 %build
 cd unix
 autoconf
 %configure
-make %{?_smp_mflags} TK_LIBRARY=%{_datadir}/%{name}%{majorver}
+make %{?_smp_mflags} CFLAGS="%{optflags}" TK_LIBRARY=%{_datadir}/%{name}%{majorver}
 
 %check
 # do not run "make test" by default since it requires an X display
@@ -69,27 +66,23 @@ make %{?_smp_mflags} TK_LIBRARY=%{_datadir}/%{name}%{majorver}
 %endif
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install -C unix INSTALL_ROOT=$RPM_BUILD_ROOT TK_LIBRARY=%{_datadir}/%{name}%{majorver}
+make install -C unix INSTALL_ROOT=%{buildroot} TK_LIBRARY=%{_datadir}/%{name}%{majorver}
 
-ln -s wish%{majorver} $RPM_BUILD_ROOT%{_bindir}/wish
+ln -s wish%{majorver} %{buildroot}%{_bindir}/wish
 
 # for linking with -l%%{name}
-ln -s lib%{name}%{majorver}.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so
+ln -s lib%{name}%{majorver}.so %{buildroot}%{_libdir}/lib%{name}.so
 
-mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/{generic/ttk,unix}
-find generic unix -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/'{}' ';'
-( cd $RPM_BUILD_ROOT/%{_includedir}
+mkdir -p %{buildroot}/%{_includedir}/%{name}-private/{generic/ttk,unix}
+find generic unix -name "*.h" -exec cp -p '{}' %{buildroot}/%{_includedir}/%{name}-private/'{}' ';'
+( cd %{buildroot}/%{_includedir}
   for i in *.h ; do
-    [ -f $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/generic/$i ] && ln -sf ../../$i $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/generic ;
+    [ -f %{buildroot}/%{_includedir}/%{name}-private/generic/$i ] && ln -sf ../../$i %{buildroot}/%{_includedir}/%{name}-private/generic ;
   done
 )
 
 # remove buildroot traces
-sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" $RPM_BUILD_ROOT/%{_libdir}/%{name}Config.sh
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{buildroot}/%{_libdir}/%{name}Config.sh
 
 %pre
 [ ! -h %{_prefix}/%{_lib}/%{name}%{majorver} ] || rm %{_prefix}/%{_lib}/%{name}%{majorver}
@@ -115,10 +108,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib%{name}.so
 %{_libdir}/lib%{name}stub%{majorver}.a
 %{_libdir}/%{name}Config.sh
+%{_libdir}/pkgconfig/tk.pc
 %{_mandir}/man3/*
 %{_datadir}/%{name}%{majorver}/tkAppInit.c
 
 %changelog
+* Thu Aug 15 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 1:8.6.0-1
+- New version
+  Resolves: rhbz#889201
+- Removed seg_input patch (upstreamed)
+- Minor cleanups
+
 * Thu Aug 15 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 1:8.5.14-1
 - New version
 
@@ -260,10 +260,10 @@ rm -rf $RPM_BUILD_ROOT
 * 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
+* Tue Feb 20 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.13-5
 - rhbz#226494 review again
 
-* Thu Feb 14 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.13-4
+* Wed 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
@@ -456,7 +456,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Jan 07 2002 Florian La Roche <Florian.LaRoche at redhat.de>
 - fix config.guess and config.sub to newer versions
 
-* Mon Aug 29 2001 Adrian Havill <havill at redhat.com>
+* Wed Aug 29 2001 Adrian Havill <havill at redhat.com>
 
 * Mon Aug  8 2001 Adrian Havill <havill at redhat.com>
 - re-enable glibc string and math inlines; recent gcc is a-ok.