devel/x3270 x3270-3.3.4-path.patch,NONE,1.1 x3270.spec,1.21,1.22
Karsten Hopp (karsten)
fedora-extras-commits at redhat.com
Wed Jul 5 11:14:04 UTC 2006
Author: karsten
Update of /cvs/extras/devel/x3270
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24735
Modified Files:
x3270.spec
Added Files:
x3270-3.3.4-path.patch
Log Message:
- silence chkconfig
- rpmlint fixes:
- replace PreReq/BuildPrereq with Requires/BuildRequires
- move ibm_hosts to %%{_sysconfdir}
- fix end of line encodings in docs
x3270-3.3.4-path.patch:
--- NEW FILE x3270-3.3.4-path.patch ---
diff -urN x3270-3.3/Examples/cms_logon.bash x3270-3.3_new/Examples/cms_logon.bash
--- x3270-3.3/Examples/cms_logon.bash 2002-12-06 20:54:07.000000000 +0100
+++ x3270-3.3_new/Examples/cms_logon.bash 2006-07-05 10:59:04.000000000 +0200
@@ -1,4 +1,4 @@
-#! /usr/local/bin/bash
+#! /bin/bash
# Copyright 1995, 2000, 2002 by Paul Mattes.
# Permission to use, copy, modify, and distribute this software and its
diff -urN x3270-3.3/Examples/peer_script.expect x3270-3.3_new/Examples/peer_script.expect
--- x3270-3.3/Examples/peer_script.expect 2002-12-06 20:54:07.000000000 +0100
+++ x3270-3.3_new/Examples/peer_script.expect 2006-07-05 10:59:25.000000000 +0200
@@ -1,4 +1,4 @@
-#! /usr/local/bin/expect
+#! /usr/bin/expect
# TSO login script, which runs as a peer of x3270.
# expect version
Index: x3270.spec
===================================================================
RCS file: /cvs/extras/devel/x3270/x3270.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- x3270.spec 13 Jun 2006 11:36:59 -0000 1.21
+++ x3270.spec 5 Jul 2006 11:14:03 -0000 1.22
@@ -5,7 +5,7 @@
Summary: An X Window System based IBM 3278/3279 terminal emulator
Name: x3270
Version: 3.3.4p7
-Release: 1%{?dist}
+Release: 2%{?dist}
License: MIT
Group: Applications/Internet
URL: http://www.geocities.com/SiliconValley/Peaks/7814
@@ -13,18 +13,18 @@
Source1: http://x3270.bgp.nu/download/c3270-%{version}.tgz
Source2: x3270.png
Source3: x3270.desktop
-Patch0: x3270-3.2.16-redhat.patch
+Patch0: x3270-3.3.4-path.patch
Patch1: x3270-3.2.20-timeh.patch
Patch2: c3270-332-ncursesw.patch
Patch3: x3270-3.3-syntax.patch
Patch4: x3270-3.3-encoding.patch
Patch5: x3270-3.3-modularX.patch
-Prereq: xorg-x11-font-utils
-BuildPreReq: ncurses-devel readline-devel glibc-devel openssl-devel libtool
+Requires: xorg-x11-font-utils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: ncurses-devel readline-devel glibc-devel openssl-devel libtool
+BuildRequires: perl
%if %{desktop_file}
-Requires: /usr/bin/desktop-file-install
-BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version}
+BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
%endif
Obsoletes: x3270-tcl
@@ -36,7 +36,8 @@
BuildRequires: libXext-devel libX11-devel libXpm-devel libSM-devel
BuildRequires: libXt-devel
Requires: %{name} = %{version}
-Prereq: gtk2 >= 2.6
+Requires: gtk2 >= 2.6
+Requires(pre): chkfontpath
%package text
Summary: IBM 3278/3279 terminal emulator for text mode
@@ -78,9 +79,11 @@
%build
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
+perl -pi -e "s,LIBX3270DIR =.*,LIBX3270DIR = %{_datadir}/x3270,g" Imakefile.in
+# Fix end of line encodings
+perl -pi -e "s/
//" html/Keymap.html html/Build.html
libtoolize --copy --force
-%configure --prefix=%{_prefix}/ --with-fontdir=%{_datadir}/fonts/x3270 --x-includes=/usr/include/X11 --x-libraries=/usr/lib/X11
+%configure --prefix=%{_prefix}/ --with-fontdir=%{_datadir}/x3270/fonts --x-includes=%{_includedir}/X11 --x-libraries=%{_libdir}/X11
# Work around broken imake:
echo 'makedepend "$@"' > gccmakedep
chmod +x gccmakedep
@@ -100,18 +103,18 @@
%install
rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
mkdir -p $RPM_BUILD_ROOT%{_prefix}/bin
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/x3270
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/x3270
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/fonts/x3270
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/x3270/fonts
mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/icons/hicolor/48x48/apps
# XXX Hack around mkfontdir madness on install.
install -m755 x3270 $RPM_BUILD_ROOT%{_prefix}/bin
install -m755 x3270if $RPM_BUILD_ROOT%{_prefix}/bin
-install -m644 *pcf.gz $RPM_BUILD_ROOT%{_datadir}/fonts/x3270
-#install -m644 X3270.ad $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/app-defaults/X3270
-install -m644 ibm_hosts $RPM_BUILD_ROOT%{_prefix}/lib/x3270
+install -m644 *pcf.gz $RPM_BUILD_ROOT%{_datadir}/x3270/fonts
+install -m644 ibm_hosts $RPM_BUILD_ROOT%{_sysconfdir}/
for i in x3270 x3270if x3270-script ibm_hosts; do
install -m644 $i.man $RPM_BUILD_ROOT%{_mandir}/man1/$i.1x
done
@@ -119,8 +122,6 @@
install -m644 pr3287/pr3287.man $RPM_BUILD_ROOT%{_mandir}/man1/pr3287.1x
cd c3270-3.3
install -m755 c3270 $RPM_BUILD_ROOT%{_prefix}/bin
-#install -m755 x3270if $RPM_BUILD_ROOT%{_prefix}/bin
-#install -m755 pr3287/pr3287 $RPM_BUILD_ROOT%{_prefix}/bin
for i in c3270 x3270if x3270-script ibm_hosts; do
install -m644 $i.man $RPM_BUILD_ROOT%{_mandir}/man1/$i.1
done
@@ -137,27 +138,20 @@
--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, as a matter of fact remove all of %{_sysconfdir} since we don't
-# have anything there
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}
-
+# remove x3270.desktop from the buildroot now that we're done with it
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/X11
%endif
rm -f Examples/*.rh
chmod -x Examples/*
-#for i in pr3287 x3270if; do
- #mv $RPM_BUILD_ROOT/%{_prefix}/X11R6/bin/$i $RPM_BUILD_ROOT/%{_bindir}
- #ln -s ../../bin/$i $RPM_BUILD_ROOT/%{_prefix}/X11R6/bin
-#done
%clean
rm -rf $RPM_BUILD_ROOT
%post x11
-cd %{_datadir}/fonts/x3270 && %{_prefix}/bin/mkfontdir
-/usr/sbin/chkfontpath -a /usr/share/fonts/x3270
+cd %{_datadir}/x3270/fonts && %{_prefix}/bin/mkfontdir
+/usr/sbin/chkfontpath -a %{_datadir}/x3270/fonts 2>/dev/null
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -165,8 +159,8 @@
%postun x11
if [ "$1" = "0" ]; then
- cd %{_datadir}/fonts/x3270 && %{_prefix}/bin/mkfontdir
- /usr/sbin/chkfontpath -r /usr/share/fonts/x3270
+ cd %{_datadir}/x3270/fonts && %{_prefix}/bin/mkfontdir
+ /usr/sbin/chkfontpath -r %{_datadir}/x3270/fonts 2>/dev/null
fi
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -180,14 +174,14 @@
%{_prefix}/bin/x3270if
%{_mandir}/man1/ibm_hosts*
%{_mandir}/man1/x32*
-%dir %{_prefix}/lib/x3270
-%config(noreplace) %{_prefix}/lib/x3270/ibm_hosts
+%dir %{_datadir}/x3270
+%config(noreplace) %{_sysconfdir}/ibm_hosts
%files x11
%defattr(-,root,root)
%{_prefix}/bin/x3270
-%dir %{_datadir}/fonts/x3270
-%{_datadir}/fonts/x3270/*
+%dir %{_datadir}/x3270/fonts
+%{_datadir}/x3270/fonts/*
%{_mandir}/man1/*
%{_datadir}/icons/hicolor/48x48/apps/x3270.png
%if %{desktop_file}
@@ -195,7 +189,6 @@
%else
%config(missingok) %{_sysconfdir}/X11/applnk/Utilities/*
%endif
-#%config %{_prefix}/X11R6/lib/X11/app-defaults/X3270
%files text
%defattr(-,root,root)
@@ -203,6 +196,13 @@
%{_mandir}/man1/c3270*
%changelog
+* Wed Jul 05 2006 Karsten Hopp <karsten at redhat.de> 3.3.4p7-2
+- silence chkconfig
+- rpmlint fixes:
+ - replace PreReq/BuildPrereq with Requires/BuildRequires
+ - move ibm_hosts to %%{_sysconfdir}
+ - fix end of line encodings in docs
+
* Tue Jun 13 2006 Karsten Hopp <karsten at redhat.de> 3.3.4p6-6
- update to 3.3.4p7
- buildrequire libtool
More information about the fedora-extras-commits
mailing list