rpms/tn5250/devel xt5250.desktop,NONE,1.1 tn5250.spec,1.22,1.23

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Feb 13 11:54:44 UTC 2007


Author: karsten

Update of /cvs/dist/rpms/tn5250/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14234

Modified Files:
	tn5250.spec 
Added Files:
	xt5250.desktop 
Log Message:
- merge review changes (#226496):
- move icons into hicolor subdir
- require fedora-logos for the icons directory
- require xterm for xt5250
- -devel subpackage requires automake, openssl-devel, ncurses-devel, pkgconfig
- Requires(post): /usr/bin/tic
- Requires(preun): coreutils
- disable static libs



--- NEW FILE xt5250.desktop ---
[Desktop Entry]
Name=tn5250 terminal emulation
Comment=tn5250 emulates IBM’s 5250 compatible terminals to connect over TCP/IP to an IBM AS/400
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
Exec=xt5250
Icon=tn5250
Type=Application
Terminal=0
XClassHintResName=xt5250
MapNotify=false


Index: tn5250.spec
===================================================================
RCS file: /cvs/dist/rpms/tn5250/devel/tn5250.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- tn5250.spec	1 Feb 2007 12:19:26 -0000	1.22
+++ tn5250.spec	13 Feb 2007 11:54:42 -0000	1.23
@@ -1,17 +1,19 @@
-Summary: 	5250 Telnet protocol and Terminal
-Name: 		tn5250
-Version: 	0.17.3
-Release:	7
-License: 	GPL 
-Group: 		Applications/Internet
-Source:		http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		tn5250-0.16.5-bhc.patch
-Patch1:		tn5250-0.17.3-multilib.patch
-Url: 		http://tn5250.sourceforge.net/
-BuildRoot: 	/var/tmp/%{name}-root
-Prefix: 	/usr
-Requires:	ncurses, dialog
-BuildRequires:	ncurses-devel, openssl-devel, automake, libtool
+Summary:   5250 Telnet protocol and Terminal
+Name:      tn5250
+Version:   0.17.3
+Release:   8%{?dist}
+License:   GPL 
+Group:     Applications/Internet
+Source:    http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source1:   xt5250.desktop
+Patch0:    tn5250-0.16.5-bhc.patch
+Patch1:    tn5250-0.17.3-multilib.patch
+Url:       http://tn5250.sourceforge.net/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:  dialog, fedora-logos, xterm
+Requires(post): /usr/bin/tic
+Requires(preun): coreutils
+BuildRequires: ncurses-devel, openssl-devel, libtool, desktop-file-utils
 
 %description
 tn5250 is an implementation of the 5250 Telnet protocol.
@@ -19,7 +21,9 @@
 
 %package devel
 Group: Development/Libraries
-Summary: development tools for the 5250 protocol.
+Summary: Development tools for the 5250 protocol
+Requires: automake, pkgconfig, ncurses-devel, openssl-devel
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 Libraries and header files to use with lib5250.
@@ -30,23 +34,26 @@
 %patch1 -p1
 
 %build
-aclocal
-libtoolize --copy --force
-%configure CPPFLAGS="-I/usr/kerberos/include" CFLAGS="$RPM_OPT_FLAGS" --with-x=yes
-make
+#aclocal
+#libtoolize --copy --force
+%configure CPPFLAGS="-I/usr/kerberos/include" CFLAGS="$RPM_OPT_FLAGS" --with-x=yes --disable-static
+make %{?_smp_mflags}
 mv linux/README README.Linux
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/%{_datadir}/%{name}
-install -d $RPM_BUILD_ROOT/%{_datadir}/icons
-install linux/5250.tcap $RPM_BUILD_ROOT/%{_datadir}/%{name}
-install linux/5250.terminfo $RPM_BUILD_ROOT/%{_datadir}/%{name}
-install *.png $RPM_BUILD_ROOT/%{_datadir}/icons
-install *.xpm $RPM_BUILD_ROOT/%{_datadir}/icons
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48
+install -p linux/5250.tcap $RPM_BUILD_ROOT/%{_datadir}/%{name}
+install -p linux/5250.terminfo $RPM_BUILD_ROOT/%{_datadir}/%{name}
+install -p *x48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48
+install -p *x48.xpm $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48
 rm -f $RPM_BUILD_ROOT/%{_libdir}/lib5250.la
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
+desktop-file-install --vendor net --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
+  --add-category "Application;Network;X-Red-Hat-Base" %{SOURCE1}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,25 +74,36 @@
 %files
 %defattr(-,root,root)
 %exclude %{_bindir}/tn5250-config
-%attr( - ,root,root)       %{_mandir}/man1/*
-%attr( - ,root,root)       %{_mandir}/man5/*
-%attr( - ,root,root)       %{_libdir}/*.so.*
-%attr( - ,root,root)       %{_bindir}/*
-%attr( - ,root,root)       %{_datadir}/icons/*
-%attr( - ,root,root)  %dir %{_datadir}/%{name}
-%attr( - ,root,root)       %{_datadir}/%{name}/*
-%attr( - ,root,root)  %doc AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO README.Linux
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%{_libdir}/*.so.*
+%{_bindir}/*
+%{_datadir}/icons/*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
+%{_datadir}/applications/*
 
 %files devel
 %defattr(644, root, root, 755)
-%attr( - ,root,root)  %{_includedir}/*
-%attr( - ,root,root)  %{_libdir}/*.a
-%attr( - ,root,root)  %{_libdir}/*.so
-%attr( - ,root,root)  %{_libdir}/pkgconfig/tn5250.pc
-%attr( - ,root,root)  %{_datadir}/aclocal/*
-%attr( - ,root,root)  %{_bindir}/tn5250-config
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/tn5250.pc
+%{_datadir}/aclocal/*
+%{_bindir}/tn5250-config
 
 %changelog
+* Tue Feb 13 2007 Karsten Hopp <karsten at redhat.com> 0.17.3-8
+- merge review changes (#226496):
+- move icons into hicolor subdir
+- require fedora-logos for the icons directory
+- require xterm for xt5250
+- -devel subpackage requires automake, openssl-devel, ncurses-devel, pkgconfig
+- Requires(post): /usr/bin/tic
+- Requires(preun): coreutils
+- disable static libs
+
+
 * Thu Feb 01 2007 Karsten Hopp <karsten at redhat.com> 0.17.3-7
 - move tn5250,m4 and lib5250.so to -devel subpackage (#203639)
 - move tn5250-config, too
@@ -150,7 +168,7 @@
 - remove obsolete patch
 
 * Wed Sep 18 2002 Guy Streeter <streeter at redhat.com>
-- unset the TERMINFO env var before running tic in %post, so
+- unset the TERMINFO env var before running tic in %%post, so
   it puts the compiled files in the right place.
 - require ncurses and dialog
 




More information about the fedora-cvs-commits mailing list