devel/x3270 x3270.spec,1.11,1.12

[Karsten Hopp (karsten)]

Author: karsten

Update of /cvs/extras/devel/x3270
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25944

Modified Files:
	x3270.spec 
Log Message:
- gccmakedep is currently not available, use makedepend wrapper instead


Index: x3270.spec
===================================================================
RCS file: /cvs/extras/devel/x3270/x3270.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- x3270.spec	17 Nov 2005 12:58:27 -0000	1.11
+++ x3270.spec	23 Nov 2005 14:10:45 -0000	1.12
@@ -18,7 +18,8 @@
 Patch2: c3270-332-ncursesw.patch
 Patch3: x3270-3.3-syntax.patch
 Patch4: x3270-3.3-encoding.patch
-Prereq:  %{_prefix}/X11R6/bin/mkfontdir
+Patch5: x3270-3.3-modularX.patch
+Prereq: xorg-x11-font-utils
 BuildPreReq: ncurses-devel readline-devel glibc-devel openssl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{desktop_file}
@@ -30,9 +31,10 @@
 %package x11
 Summary: IBM 3278/3279 terminal emulator for the X Window System
 Group: Applications/Internet
-BuildRequires: xorg-x11-font-utils imake
+BuildRequires: xorg-x11-font-utils imake xorg-x11-xbitmaps
 BuildRequires: libXmu-devel libXaw-devel libXt-devel libICE-devel
 BuildRequires: libXext-devel libX11-devel libXpm-devel libSM-devel
+BuildRequires: libXt-devel
 Requires: %{name} = %{version}
 Prereq: gtk2 >= 2.6
 
@@ -74,13 +76,21 @@
 %patch4 -p1
 
 %build
-export PATH=$PATH:%{_prefix}/X11R6/bin
 export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 # Set LIBX3270DIR to something we can share with x3270-text
 perl -pi -e "s,LIBX3270DIR =.*,LIBX3270DIR = /usr/lib/x3270,g" Imakefile.in
 libtoolize --copy --force
-%configure --prefix=%{_prefix}/ --with-fontdir=%{_datadir}/fonts/x3270
-xmkmf -a
+%configure --prefix=%{_prefix}/ --with-fontdir=%{_datadir}/fonts/x3270 --x-includes=/usr/include/X11 --x-libraries=/usr/lib/X11
+# Work around broken imake:
+echo 'makedepend "$@"' > gccmakedep
+chmod +x gccmakedep
+export PATH="$PATH:`pwd`"
+xmkmf
+patch -p1 < %{PATCH5}
+make Makefiles
+make includes
+make depend
+
 make %{?_smp_mflags}
 cd c3270-3.3
 autoconf
@@ -89,13 +99,11 @@
 make %{?_smp_mflags}
 
 %install
-export PATH=$PATH:%{_prefix}/X11R6/bin
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/bin
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/x3270
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/fonts/x3270
-#mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/X11R6/lib/X11/app-defaults
 mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/icons/hicolor/48x48/apps
 
 # XXX Hack around mkfontdir madness on install.
@@ -200,6 +208,7 @@
 - drop obsolete segfault patch
 - build with modular X
 - build with current openssl
+- gccmakedep is gone, use makedepend wrapper instead
 
 * Wed Oct 19 2005 Karsten Hopp <karsten at redhat.de> 3.3.4-6
 - move x3270-x11 files from /usr/X11R6 to /usr (#170938)