From 7dd5529bb92d1b22ae14f06e3c5621beee859247 Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Aug 12 2009 04:27:51 +0000 Subject: - Revert the last change, it doesn't solve the problem. --- diff --git a/atlas.spec b/atlas.spec index 6b08e56..71dec13 100644 --- a/atlas.spec +++ b/atlas.spec @@ -2,7 +2,7 @@ Name: atlas Version: 3.8.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Automatically Tuned Linear Algebra Software Group: System Environment/Libraries @@ -35,20 +35,12 @@ see the documentation for information. Summary: Development libraries for ATLAS Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: %name-header = %version-%release +Obsoletes: %name-header = %version-%release %description devel -This package contains the shared and static libraries for development +This package contains the libraries and headers for development with ATLAS (Automatically Tuned Linear Algebra Software). -%package header -Summary: atlas header files -Group: Development/Libraries -BuildArch: noarch - -%description header -This package contains the header files for for development with ATLAS. - %define types base %if "%{?enable_native_atlas}" == "0" @@ -76,12 +68,12 @@ extensions. Summary: Development libraries for ATLAS with SSE extensions Group: Development/Libraries Requires: %{name}-sse = %{version}-%{release} -Requires: %name-header = %version-%release +Obsoletes: %name-header = %version-%release Obsoletes: %{name}-3dnow-devel < 3.7 Provides: %{name}-3dnow-devel = %{version}-%{release} %description sse-devel -This package contains shared and static versions of the ATLAS +This package contains headers and shared and static versions of the ATLAS (Automatically Tuned Linear Algebra Software) libraries compiled with optimizations for the SSE(1) extensions to the ix86 architecture. @@ -101,7 +93,7 @@ SSE(1) and SSE3 extensions. Summary: Development libraries for ATLAS with SSE2 extensions Group: Development/Libraries Requires: %{name}-sse2 = %{version}-%{release} -Requires: %name-header = %version-%release +Obsoletes: %name-header = %version-%release Obsoletes: %{name}-devel < 3.7 Provides: %{name}-devel = %{version}-%{release} @@ -123,7 +115,7 @@ Fedora also produces ATLAS build with SSE(1) and SSE2 extensions. Summary: Development libraries for ATLAS with 3DNow extensions Group: Development/Libraries Requires: %{name}-sse3 = %{version}-%{release} -Requires: %name-header = %version-%release +Obsoletes: %name-header = %version-%release %description sse3-devel This package contains shared and static versions of the ATLAS @@ -224,6 +216,8 @@ rm -rf %{buildroot} %doc doc %{_libdir}/atlas/*.so %{_libdir}/atlas/*.a +%{_includedir}/atlas +%{_includedir}/*.h %else @@ -251,6 +245,8 @@ rm -rf %{buildroot} %doc doc %{_libdir}/atlas-sse/*.so %{_libdir}/atlas-sse/*.a +%{_includedir}/atlas +%{_includedir}/*.h %files sse2 %defattr(-,root,root,-) @@ -268,6 +264,8 @@ rm -rf %{buildroot} %{_libdir}/atlas-sse2/*.a %{_libdir}/atlas/*.so %{_libdir}/atlas/*.a +%{_includedir}/atlas +%{_includedir}/*.h %files sse3 %defattr(-,root,root,-) @@ -281,15 +279,15 @@ rm -rf %{buildroot} %doc doc %{_libdir}/atlas-sse3/*.so %{_libdir}/atlas-sse3/*.a - -%endif - -%files header -%defattr(-,root,root,-) %{_includedir}/atlas %{_includedir}/*.h +%endif + %changelog +* Wed Aug 13 2009 Deji Akingunola - 3.8.3-8 +- Revert the last change, it doesn't solve the problem. + * Tue Aug 04 2009 Deji Akingunola - 3.8.3-7 - Create a -header subpackage to avoid multilib conflicts (BZ#508565).