Author: undefine                     Date: Thu Feb 24 13:14:47 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 3.3.3b

---- Files affected:
SPECS:
   x3270.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/x3270.spec
diff -u SPECS/x3270.spec:1.19 SPECS/x3270.spec:1.20
--- SPECS/x3270.spec:1.19       Mon Nov 29 18:27:57 2004
+++ SPECS/x3270.spec    Thu Feb 24 14:14:42 2005
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+%define                fversion        %(echo %{version} |tr -d .)
+%define                mversion        %(echo %{version} |cut -f -2 -d .)
 Summary:       An X Window System based IBM 3278/3279 terminal emulator
 Summary(de):   X-basierter 3270-Emulator
 Summary(fr):   Emulateur 3270 pour X
@@ -8,20 +10,18 @@
 Summary(uk):   ĺÍŐĚŃÔĎŇ ÔĹŇÍŚÎÁĚŐ IBM 3278/3279 ÄĚŃ X Window
 Summary(zh_CN):        Ňť¸öÄŁÄâ IBM 3278/3279 ÖŐśËľÄ X ´°żÚϾͳ.Ł
 Name:          x3270
-Version:       3.1.1.9
+Version:       3.3.3b2
 Release:       1
 License:       MIT
 Group:         X11/Applications
-Source0:       ftp://ftp.x.org/contrib/applications/%{name}-%{version}.tgz
-# Source0-md5: a629c31359bf4533224f13fd8bc7cb83
+Source0:       ftp://ftp.x.org/contrib/applications/%{name}-%{fversion}.tgz
+# Source0-md5: b991b7352ae4f6b4004c85fc1c0db47f
+Source1:       %{name}.desktop
 BuildRequires: XFree86
 BuildRequires: XFree86-devel
 Requires(post,postun):/usr/X11R6/bin/mkfontdir
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _prefix         /usr/X11R6
-%define                _mandir         %{_prefix}/man
-
 %description
 The x3270 program opens a window in the X Window System which emulates
 the actual look of an IBM 3278/3279 terminal, commonly used with
@@ -56,37 +56,26 @@
 ÄĎÚ×ĎĚѤ "telnet-ÉÔÉÓŃ" ÎÁ ČĎÓÔÉ IBM.
 
 %prep
-%setup -q -n x3270-3.1.1
+%setup -q -n %{name}-%{mversion}
 
 %build
-xmkmf
-# "LIB" is misleading - LIBX3270DIR contains only ibm_hosts configuration file
-%{__make} CXXDEBUGFLAGS="%{rpmcflags}" \
-       CDEBUGFLAGS="%{rpmcflags}" \
-       LIBX3270DIR=%{_sysconfdir}/%{name}
+%configure
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d 
$RPM_BUILD_ROOT{%{_libdir}/X11/app-defaults,%{_applnkdir}/Network,%{_mandir}/man5}
+install -d 
$RPM_BUILD_ROOT{%{_libdir}/X11/app-defaults,%{_desktopdir},%{_mandir}/man5}
 
 %{__make} install install.man \
-       DESTDIR=$RPM_BUILD_ROOT \
-       LIBX3270DIR=%{_sysconfdir}/%{name} \
-       MKFONTDIR=mkfontdir
+       BINDIR=%{_bindir} \
+       MANDIR=%{_mandir} \
+       DESTDIR=$RPM_BUILD_ROOT
 
 install X3270.xad $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/X3270
 
-cat > $RPM_BUILD_ROOT%{_applnkdir}/Network/x3270.desktop <<EOF
-[Desktop Entry]
-Name=x3270
-Type=Application
-Comment=3270 Terminal Emulator
-Comment[pl]=Emulator Terminala 3270
-Exec=x3270
-Terminal=false
-EOF
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
-mv -f $RPM_BUILD_ROOT%{_mandir}/man{1/ibm_hosts.1x,5/ibm_hosts.5x}
+mv -f $RPM_BUILD_ROOT%{_mandir}/{x3270.1*,man1}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,34 +88,17 @@
 
 %files
 %defattr(644,root,root,755)
-%doc Docs/*
+#%doc Docs/*
 %attr(755,root,root) %{_bindir}/x3270
 %attr(755,root,root) %{_bindir}/x3270if
+%attr(755,root,root) %{_bindir}/pr3287
 %dir %{_sysconfdir}/x3270
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/x3270/ibm_hosts
-%{_applnkdir}/Network/x3270.desktop
+%{_desktopdir}/%{name}.desktop
 %config %{_libdir}/X11/app-defaults/X3270
-%{_fontsdir}/misc/3270.pcf.gz
-%{_fontsdir}/misc/3270b.pcf.gz
-%{_fontsdir}/misc/3270-12.pcf.gz
-%{_fontsdir}/misc/3270-12b.pcf.gz
-%{_fontsdir}/misc/3270-20.pcf.gz
-%{_fontsdir}/misc/3270-20b.pcf.gz
-%{_fontsdir}/misc/3270d.pcf.gz
-%{_fontsdir}/misc/3270h.pcf.gz
-%{_fontsdir}/misc/3270gt8.pcf.gz
-%{_fontsdir}/misc/3270gt12.pcf.gz
-%{_fontsdir}/misc/3270gt12b.pcf.gz
-%{_fontsdir}/misc/3270gt16.pcf.gz
-%{_fontsdir}/misc/3270gt16b.pcf.gz
-%{_fontsdir}/misc/3270gt24.pcf.gz
-%{_fontsdir}/misc/3270gt24b.pcf.gz
-%{_fontsdir}/misc/3270gt32.pcf.gz
-%{_fontsdir}/misc/3270gt32b.pcf.gz
-%{_mandir}/man1/x3270.1x*
-%{_mandir}/man1/x3270if.1x*
-%{_mandir}/man1/x3270-script.1x*
-%{_mandir}/man5/ibm_hosts.5x*
+%{_fontsdir}/misc/3270*.pcf.gz
+#%{_mandir}/man1/x3270.1*
+%{_mandir}/man?/*
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -134,6 +106,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2005/02/24 13:14:42  undefine
+- up to 3.3.3b
+
 Revision 1.19  2004/11/29 17:27:57  zbyniu
 - BR: XFree86
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/x3270.spec?r1=1.19&r2=1.20&f=u


_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to