From ff590f9de43aba7d09a37271d9164ee5ec7124cc Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@fedoraproject.org>
Date: Wed, 12 Jul 2006 09:26:06 +0000
Subject: [PATCH] - fix fileconflicts in subpackages

---
 x3270.spec | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/x3270.spec b/x3270.spec
index bc52758..b96ba0b 100644
--- a/x3270.spec
+++ b/x3270.spec
@@ -5,7 +5,7 @@
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
 Version: 3.3.4p7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: http://www.geocities.com/SiliconValley/Peaks/7814
@@ -115,9 +115,6 @@ install -m755 x3270 $RPM_BUILD_ROOT%{_prefix}/bin
 install -m755 x3270if $RPM_BUILD_ROOT%{_prefix}/bin
 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
 install -m755 pr3287/pr3287 $RPM_BUILD_ROOT%{_prefix}/bin
 install -m644 pr3287/pr3287.man $RPM_BUILD_ROOT%{_mandir}/man1/pr3287.1x
 cd c3270-3.3
@@ -172,8 +169,8 @@ fi
 %doc README Examples html LICENSE
 %{_prefix}/bin/pr3287
 %{_prefix}/bin/x3270if
-%{_mandir}/man1/ibm_hosts*
-%{_mandir}/man1/x32*
+%exclude %{_mandir}/man1/c3270*
+%{_mandir}/man1/*
 %dir %{_datadir}/x3270
 %config(noreplace) %{_sysconfdir}/ibm_hosts
 
@@ -182,7 +179,6 @@ fi
 %{_prefix}/bin/x3270
 %dir %{_datadir}/x3270/fonts
 %{_datadir}/x3270/fonts/*
-%{_mandir}/man1/*
 %{_datadir}/icons/hicolor/48x48/apps/x3270.png
 %if %{desktop_file}
 %{_datadir}/applications/*
@@ -196,6 +192,9 @@ fi
 %{_mandir}/man1/c3270*
 
 %changelog
+* Wed Jul 12 2006 Karsten Hopp <karsten@redhat.de> 3.3.4p7-3
+- fix fileconflicts in subpackages
+
 * Wed Jul 05 2006 Karsten Hopp <karsten@redhat.de> 3.3.4p7-2
 - silence chkconfig
 - rpmlint fixes: