rpm/tk
SHA256
1
0
Fork 0
forked from pool/tk
Code Pull Requests Activity

Accepting request 137207 from home:a_jaeger:FactoryFix

Browse Source 
Cleanup list of build requires.

OBS-URL: https://build.opensuse.org/request/show/137207
OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tk?expand=0&rev=28
This commit is contained in:
Reinhard Max 2012-10-05 13:32:49 +00:00 committed by Git OBS Bridge
parent 5865b5f363
commit 2405338881
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tk-8.5.12-fix-xft.patch Normal file
View File

@ -0,0 +1,13 @@
--- tk8.5.9/unix/configure.in.old 2010-09-02 20:12:14.000000000 +0200
+++ tk8.5.9/unix/configure.in 2011-02-17 13:32:22.719116636 +0100
@@ -530,8 +530,8 @@
XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
if test "$found_xft" = "no" ; then
found_xft=yes
- XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
- XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
+ XFT_CFLAGS=`pkg-config --cflags xft freetype2 2>/dev/null` || found_xft="no"
+ XFT_LIBS=`pkg-config --libs xft freetype2 2>/dev/null` || found_xft="no"
fi
AC_MSG_RESULT([$found_xft])
dnl make sure that compiling against Xft header file doesn't bomb

7
tk.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Oct 5 08:52:15 UTC 2012 - aj@suse.de
- Fix configure xft detection (add patch tk-8.5.12-fix-xft.patch).
- Replace build requires of xorg-x11-devel with those that are really
needed.
-------------------------------------------------------------------
Thu Aug 9 12:41:35 UTC 2012 - max@suse.com

9
tk.spec
View File

@ -17,8 +17,13 @@
Name: tk
BuildRequires: imake
BuildRequires: libX11-devel
BuildRequires: libXScrnSaver-devel
BuildRequires: libXft-devel
BuildRequires: libXt-devel
BuildRequires: pkg-config
BuildRequires: tcl-devel
BuildRequires: xorg-x11-devel
Url: http://www.tcl.tk
Version: 8.5.12
Release: 0
@ -42,6 +47,7 @@ Source0: %name%{version}%{rrc}-src.tar.gz
Source1: tk-rpmlintrc
Source2: baselibs.conf
Patch0: %name.patch
Patch1: tk-8.5.12-fix-xft.patch
%description
Tk is a graphical user interface toolkit that takes developing desktop
@ -88,6 +94,7 @@ Authors:
%prep
%setup -q -n %name%version
%patch0
%patch1 -p1
%build
cd unix