From 13bc570e9660dadd36e5dfc4fd19fc5383c8a512 Mon Sep 17 00:00:00 2001
From: jvdias <jvdias@fedoraproject.org>
Date: Sat, 10 Jun 2006 03:14:18 +0000
Subject: [PATCH] fix bug 192754: remove multilib conflicts; fix upstream bugs
 5115 & 5119

---
 tog-pegasus.spec | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/tog-pegasus.spec b/tog-pegasus.spec
index d5c3ea2..3641265 100644
--- a/tog-pegasus.spec
+++ b/tog-pegasus.spec
@@ -209,6 +209,10 @@ make -f RedHat.OpenPegasus.Makefile install prefix=$RPM_BUILD_ROOT libdir=%{_lib
     %{SOURCE4} --list '%ghost' | grep 'mak/' > ghost_arch_devel;
     %{SOURCE4} --list '%ghost' | grep 'test/'> ghost_arch_test;
     cp -fp %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/Pegasus/scripts;
+%else
+    touch ghost_arch_binaries;
+    touch ghost_arch_devel;
+    touch ghost_arch_test;
 %endif
 %if %{NODEBUGINFO}
     /usr/lib/rpm/brp-compress;
@@ -216,11 +220,8 @@ make -f RedHat.OpenPegasus.Makefile install prefix=$RPM_BUILD_ROOT libdir=%{_lib
 %endif
 :;
 
-%if %{multilib}
+
 %files -f ghost_arch_binaries
-%else
-%files
-%endif
 %defattr(0750, root, pegasus, 0750)
 %if !%{NODEBUGINFO}
 %exclude /usr/lib/debug
@@ -262,22 +263,15 @@ make -f RedHat.OpenPegasus.Makefile install prefix=$RPM_BUILD_ROOT libdir=%{_lib
 /usr/share/man/man1/*
 %doc doc/license.txt doc/Admin_Guide_Release.pdf doc/PegasusSSLGuidelines.htm doc/SecurityGuidelinesForDevelopers.html doc/README.RedHat.Security src/Clients/repupgrade/doc/repupgrade.html 
 
-%if %{multilib}
+
 %files devel -f ghost_arch_devel
-%else
-%files
-%endif
 %defattr(0644,root,pegasus,0755)
 /usr/include/Pegasus
 /usr/share/Pegasus/samples
 /usr/share/Pegasus/html
 
-%if %{PEGASUS_BUILD_TEST_RPM}
-%if %{multilib}
+
 %files test -f ghost_arch_test
-%else
-%files test
-%endif
 %defattr(0644,root,pegasus,0755)
 %dir /usr/share/Pegasus/test
 /usr/share/Pegasus/test/Makefile%{bsx}