[x3270] updated to 3.3.12ga7

Dan Horák sharkcz at fedoraproject.org
Thu Apr 12 16:04:54 UTC 2012 

commit 8643c64823c6c2186c8dba84807141b0fa59e1f7
Author: Dan Horák <dan at danny.cz>
Date:   Thu Apr 12 18:04:50 2012 +0200

    updated to 3.3.12ga7
    
    - spec cleanup

 .gitignore    |    1 +
 sources       |    2 +-
 x3270.desktop |    2 +-
 x3270.spec    |   98 ++++++++++++++++++++-------------------------------------
 4 files changed, 37 insertions(+), 66 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0ad89ca..5d3a227 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 suite3270-3.3.10ga4-src.tgz
+/suite3270-3.3.12ga7-src.tgz
diff --git a/sources b/sources
index 7607a62..01ab195 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13d904e46cf7cea1dd9b0cdb5d1a3ebd  suite3270-3.3.10ga4-src.tgz
+5a501ed84d522c02d3c7ed3e36a00d0a  suite3270-3.3.12ga7-src.tgz
diff --git a/x3270.desktop b/x3270.desktop
index 7178444..d87ab9f 100644
--- a/x3270.desktop
+++ b/x3270.desktop
@@ -6,4 +6,4 @@ Comment=3270 terminal emulator
 Exec=x3270
 Icon=x3270
 StartupNotify=true
-
+Categories=System;Utility;TerminalEmulator;
diff --git a/x3270.spec b/x3270.spec
index f599801..90bad29 100644
--- a/x3270.spec
+++ b/x3270.spec
@@ -1,19 +1,15 @@
-%define desktop_file 1
 %define fontdir %{_datadir}/x3270/fonts
 %define catalogue /etc/X11/fontpath.d
-%if %{desktop_file}
-%define desktop_file_utils_version 0.2.93
-%endif
 
 %define majorver 3.3
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
-Version: 3.3.10ga4
-Release: 3%{?dist}
+Version: 3.3.12ga7
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: http://x3270.sourceforge.net/
-Source0: http://downloads.sourceforge.net/project/x3270/x3270/3.3.10ga4/suite3270-%{version}-src.tgz
+Source0: http://downloads.sourceforge.net/%{name}/suite3270-%{version}-src.tgz
 # c3270-3.3  pr3287-3.3  s3270-3.3  tcl3270-3.3  wc3270-3.3  wpr3287-3.3  ws3270-3.3  x3270-3.3
 #
 Source1: x3270.png
@@ -21,14 +17,11 @@ Source2: x3270.desktop
 Patch0: x3270-3.3.10-paths.patch
 Patch1: x3270-3.3.10-ibmhostpath.patch
 
-Prereq: xorg-x11-font-utils
-BuildPreReq: ncurses-devel readline-devel glibc-devel openssl-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ncurses-devel readline-devel glibc-devel openssl-devel libtool
-BuildRequires: perl
-%if %{desktop_file}
-BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-%endif
+BuildRequires: ncurses-devel
+BuildRequires: readline-devel
+BuildRequires: openssl-devel
+BuildRequires: libtool
+BuildRequires: desktop-file-utils
 
 %package x11
 Summary: IBM 3278/3279 terminal emulator for the X Window System
@@ -38,7 +31,6 @@ BuildRequires: libXmu-devel libXaw-devel libXt-devel libICE-devel
 BuildRequires: libXext-devel libX11-devel libXpm-devel libSM-devel
 BuildRequires: libXt-devel
 Requires: %{name} = %{version}
-Requires: gtk2 >= 2.6
 Requires(post): /usr/bin/mkfontdir
 Requires(postun): /usr/bin/mkfontdir
 
@@ -72,17 +64,13 @@ Install the %{name}-text package if you need to access IBM hosts using an IBM
 3278/3279 terminal emulator without running X.
 
 %prep
-rm -rf x3270-%{version}
-mkdir x3270-%{version}
-tar -xz -C x3270-%{version} -f %{SOURCE0}
-cd x3270-%{version}
+%setup -q -c
 # delete windows and tcl sources:
 rm -rf wpr3287* wc3270* ws3270* tcl3270*
 %patch0 -p1
 %patch1 -p1
 
 %build
-cd x3270-%{version}
 # Fix end of line encodings
 perl -pi -e "s/
//" */html/Keymap.html */html/Build.html
 # Set LIBX3270DIR to something we can share with x3270-text
@@ -92,49 +80,44 @@ perl -pi -e 's/ -o x3270if x3270if.c/ \$(CCOPTIONS) -o x3270if x3270if.c/g' x327
 
 for i in x3270-%{majorver} c3270-%{majorver} pr3287-%{majorver} s3270-%{majorver}; do
 ( cd $i
-%configure --prefix=%{_prefix}/ --with-fontdir=%{fontdir} --x-includes=/usr/include/X11 --x-libraries=/%{_libdir}/X11 --enable-app-defaults
+%configure --with-fontdir=%{fontdir} --x-includes=/usr/include/X11 --x-libraries=/%{_libdir}/X11 --enable-app-defaults
 make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS"
 )
 done
 
 %install
-cd x3270-%{version}
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/x3270
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/bin
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/x3270
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
-mkdir -p ${RPM_BUILD_ROOT}%{fontdir}
-mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/icons/hicolor/48x48/apps
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
-mkdir -p ${RPM_BUILD_ROOT}%{catalogue}
+mkdir -p $RPM_BUILD_ROOT%{fontdir}
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
+mkdir -p $RPM_BUILD_ROOT%{catalogue}
 
-install -m755 x3270-%{majorver}/x3270 $RPM_BUILD_ROOT%{_prefix}/bin
-install -m755 x3270-%{majorver}/x3270if $RPM_BUILD_ROOT%{_prefix}/bin
+install -m755 x3270-%{majorver}/x3270 $RPM_BUILD_ROOT%{_bindir}
+install -m755 x3270-%{majorver}/x3270if $RPM_BUILD_ROOT%{_bindir}
 install -m644 x3270-%{majorver}/*pcf.gz $RPM_BUILD_ROOT%{fontdir}
 install -m644 x3270-%{majorver}/ibm_hosts $RPM_BUILD_ROOT%{_sysconfdir}/
-install -m644 x3270-%{majorver}/X3270.xad ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/X3270
+install -m644 x3270-%{majorver}/X3270.xad $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/X3270
 install -m644 x3270-%{majorver}/x3270.man $RPM_BUILD_ROOT%{_mandir}/man1/x3270.1
 install -m644 x3270-%{majorver}/x3270if.man $RPM_BUILD_ROOT%{_mandir}/man1/x3270if.1
 install -m644 x3270-%{majorver}/x3270-script.man $RPM_BUILD_ROOT%{_mandir}/man1/x3270-script.1
 install -m644 x3270-%{majorver}/ibm_hosts.man $RPM_BUILD_ROOT%{_mandir}/man5/ibm_hosts.5
 
-install -m755 pr3287-%{majorver}/pr3287 $RPM_BUILD_ROOT%{_prefix}/bin
+install -m755 pr3287-%{majorver}/pr3287 $RPM_BUILD_ROOT%{_bindir}
 install -m644 pr3287-%{majorver}/pr3287.man $RPM_BUILD_ROOT%{_mandir}/man1/pr3287.1x
 
-install -m755 c3270-%{majorver}/c3270 $RPM_BUILD_ROOT%{_prefix}/bin
+install -m755 c3270-%{majorver}/c3270 $RPM_BUILD_ROOT%{_bindir}
 install -m644 c3270-%{majorver}/c3270.man $RPM_BUILD_ROOT%{_mandir}/man1/c3270.1
 
-install -m755 s3270-%{majorver}/s3270 $RPM_BUILD_ROOT%{_prefix}/bin
+install -m755 s3270-%{majorver}/s3270 $RPM_BUILD_ROOT%{_bindir}
 install -m644 s3270-%{majorver}/s3270.man $RPM_BUILD_ROOT%{_mandir}/man1/s3270.1
 
 install -m644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities
-install -m644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/X11/applnk/Utilities
 ln -sf %{fontdir} $RPM_BUILD_ROOT%{catalogue}/x3270
 mv x3270-%{majorver}/README* x3270-%{majorver}/LICENSE x3270-%{majorver}/Examples x3270-%{majorver}/html .
-#mv c3270-%{majorver}/Examples/* Examples
 mv c3270-%{majorver}/README README.c3270
 mv c3270-%{majorver}/html html_c3270
 mv pr3287-%{majorver}/README README.pr3287
@@ -142,24 +125,14 @@ mv pr3287-%{majorver}/html html_pr3287
 mv s3270-%{majorver}/README README.s3270
 mv s3270-%{majorver}/html html_s3270
 
-%if %{desktop_file}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 desktop-file-install --vendor fedora \
         --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-        --add-category "Application;System;X-Fedora-Extra" \
-        $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities/x3270.desktop
-
-# remove x3270.desktop from the buildroot now that we're done with it
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk
-%endif
-
+        %{SOURCE2}
 
 rm -f */Examples/*.rh */Examples/*.orig
 chmod -x Examples/* html*/*
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post x11
 cd %{fontdir} && %{_prefix}/bin/mkfontdir
 touch --no-create %{_datadir}/icons/hicolor
@@ -177,11 +150,10 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
 fi
 
 %files
-%defattr(-,root,root)
-%doc %{name}-%{version}/{README*,LICENSE,Examples,html*}
-%{_prefix}/bin/s3270
-%{_prefix}/bin/pr3287
-%{_prefix}/bin/x3270if
+%doc README* LICENSE Examples html*
+%{_bindir}/s3270
+%{_bindir}/pr3287
+%{_bindir}/x3270if
 %exclude %{_mandir}/man1/c3270*
 %{_mandir}/man1/*
 %{_mandir}/man5/*
@@ -189,25 +161,23 @@ fi
 %config(noreplace) %{_sysconfdir}/ibm_hosts
 
 %files x11
-%defattr(-,root,root)
-%{_prefix}/bin/x3270
+%{_bindir}/x3270
 %dir %{fontdir}
 %{fontdir}/*
 %{catalogue}/x3270
 %{_datadir}/icons/hicolor/48x48/apps/x3270.png
 %{_datadir}/X11/app-defaults/X3270
-%if %{desktop_file}
 %{_datadir}/applications/*
-%else
-%config(missingok) %{_sysconfdir}/X11/applnk/Utilities/*
-%endif
 
 %files text
-%defattr(-,root,root)
-%{_prefix}/bin/c3270
+%{_bindir}/c3270
 %{_mandir}/man1/c3270*
 
 %changelog
+* Thu Apr 12 2012 Dan Horák <dan[at]danny.cz> - 3.3.12ga7-1
+- updated to 3.3.12ga7
+- spec cleanup
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.10ga4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
@@ -446,7 +416,7 @@ fi
 - 3.2.14
 - Add c3270 (textmode x3270) in x3270-text package
 - Fix build
-- Make ibm_hosts a %config(noreplace)
+- Make ibm_hosts a %%config(noreplace)
 
 * Tue Oct 24 2000 Jeff Johnson <jbj at redhat.com>
 - remove /usr/local paths in Examples.
@@ -476,7 +446,7 @@ fi
 - auto rebuild in the new build environment (release 7)
 
 * Tue Jan 12 1999 Jeff Johnson <jbj at redhat.com>
-- ibm_hosts needed %config (#788)
+- ibm_hosts needed %%config (#788)
 
 * Fri Aug  7 1998 Jeff Johnson <jbj at redhat.com>
 - build root

More information about the scm-commits mailing list