fix bug 192754: remove multilib conflicts; fix upstream bugs 5115 & 5119

This commit is contained in:
jvdias 2006-06-10 03:14:18 +00:00
parent b0af1c6844
commit 13bc570e96

View File

@ -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 'mak/' > ghost_arch_devel;
%{SOURCE4} --list '%ghost' | grep 'test/'> ghost_arch_test; %{SOURCE4} --list '%ghost' | grep 'test/'> ghost_arch_test;
cp -fp %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/Pegasus/scripts; cp -fp %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/Pegasus/scripts;
%else
touch ghost_arch_binaries;
touch ghost_arch_devel;
touch ghost_arch_test;
%endif %endif
%if %{NODEBUGINFO} %if %{NODEBUGINFO}
/usr/lib/rpm/brp-compress; /usr/lib/rpm/brp-compress;
@ -216,11 +220,8 @@ make -f RedHat.OpenPegasus.Makefile install prefix=$RPM_BUILD_ROOT libdir=%{_lib
%endif %endif
:; :;
%if %{multilib}
%files -f ghost_arch_binaries %files -f ghost_arch_binaries
%else
%files
%endif
%defattr(0750, root, pegasus, 0750) %defattr(0750, root, pegasus, 0750)
%if !%{NODEBUGINFO} %if !%{NODEBUGINFO}
%exclude /usr/lib/debug %exclude /usr/lib/debug
@ -262,22 +263,15 @@ make -f RedHat.OpenPegasus.Makefile install prefix=$RPM_BUILD_ROOT libdir=%{_lib
/usr/share/man/man1/* /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 %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 %files devel -f ghost_arch_devel
%else
%files
%endif
%defattr(0644,root,pegasus,0755) %defattr(0644,root,pegasus,0755)
/usr/include/Pegasus /usr/include/Pegasus
/usr/share/Pegasus/samples /usr/share/Pegasus/samples
/usr/share/Pegasus/html /usr/share/Pegasus/html
%if %{PEGASUS_BUILD_TEST_RPM}
%if %{multilib}
%files test -f ghost_arch_test %files test -f ghost_arch_test
%else
%files test
%endif
%defattr(0644,root,pegasus,0755) %defattr(0644,root,pegasus,0755)
%dir /usr/share/Pegasus/test %dir /usr/share/Pegasus/test
/usr/share/Pegasus/test/Makefile%{bsx} /usr/share/Pegasus/test/Makefile%{bsx}