rpms/tn5250/devel tn5250.spec,1.24,1.25 xt5250.desktop,1.2,1.3

[fedora-cvs-commits at redhat.com]

Author: karsten

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

Modified Files:
	tn5250.spec xt5250.desktop 
Log Message:
- rename icon files to tn5250.{png,xpm}
- remove Mimetype from desktop file
- move category to desktop file
- use vendor fedora for desktop-file-install
- touch files to avoid autotools run



Index: tn5250.spec
===================================================================
RCS file: /cvs/dist/rpms/tn5250/devel/tn5250.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- tn5250.spec	13 Feb 2007 12:46:02 -0000	1.24
+++ tn5250.spec	14 Feb 2007 14:33:57 -0000	1.25
@@ -1,7 +1,7 @@
 Summary:   5250 Telnet protocol and Terminal
 Name:      tn5250
 Version:   0.17.3
-Release:   9%{?dist}
+Release:   10%{?dist}
 License:   GPL 
 Group:     Applications/Internet
 Source:    http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  dialog, fedora-logos, xterm
 Requires(post): /usr/bin/tic
+Requires(post): /sbin/ldconfig
 Requires(preun): coreutils
 BuildRequires: ncurses-devel, openssl-devel, libtool, desktop-file-utils
 
@@ -36,6 +37,7 @@
 %build
 #aclocal
 #libtoolize --copy --force
+find . -type f | xargs touch -r tn5250.spec.in
 %configure CPPFLAGS="-I/usr/kerberos/include" CFLAGS="$RPM_OPT_FLAGS" --with-x=yes --disable-static
 make %{?_smp_mflags}
 mv linux/README README.Linux
@@ -45,15 +47,18 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/{48x48,64x64}/apps
 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/apps/
-install -p *x48.xpm $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
+install -p tn5250-48x48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/tn5250.png
+install -p tn5250-62x48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/64x64/apps/tn5250.png
+install -p tn5250-48x48.xpm $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/tn5250.xpm
+install -p tn5250-62x48.xpm $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/64x64/apps/tn5250.xpm
 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}
+desktop-file-install --vendor fedora \
+   --dir $RPM_BUILD_ROOT/%{_datadir}/applications %{SOURCE1}
+  #--add-category "Application;Network;X-Red-Hat-Base" 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,7 +84,7 @@
 %{_mandir}/man5/*
 %{_libdir}/*.so.*
 %{_bindir}/*
-%{_datadir}/icons/*
+%{_datadir}/icons/hicolor/*/apps/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_datadir}/applications/*
@@ -93,6 +98,13 @@
 %{_bindir}/tn5250-config
 
 %changelog
+* Wed Feb 14 2007 Karsten Hopp <karsten at redhat.com> 0.17.3-10
+- rename icon files to tn5250.{png,xpm}
+- remove Mimetype from desktop file
+- move category to desktop file
+- use vendor fedora for desktop-file-install
+- touch files to avoid autotools run
+
 * Tue Feb 13 2007 Karsten Hopp <karsten at redhat.com> 0.17.3-9
 - fix icon name
 - fix icon path


Index: xt5250.desktop
===================================================================
RCS file: /cvs/dist/rpms/tn5250/devel/xt5250.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xt5250.desktop	13 Feb 2007 12:43:35 -0000	1.2
+++ xt5250.desktop	14 Feb 2007 14:33:57 -0000	1.3
@@ -1,10 +1,10 @@
 [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-48x48.png
+Icon=tn5250.png
 Type=Application
+Categories=Network
 Terminal=0
 XClassHintResName=xt5250
 MapNotify=false