rpms/libmlx4/devel libmlx4.spec,1.5,1.6

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/libmlx4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22489

Modified Files:
	libmlx4.spec 
Log Message:
* Sat Dec 05 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-3
- Tweak the provides and obsoletes a little bit to make sure we only pull in
  the -static package to replace past -devel-static packages, and not past
  -devel packages.



Index: libmlx4.spec
===================================================================
RCS file: /cvs/extras/rpms/libmlx4/devel/libmlx4.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libmlx4.spec	2 Dec 2009 01:15:12 -0000	1.5
+++ libmlx4.spec	5 Dec 2009 19:01:55 -0000	1.6
@@ -16,6 +16,7 @@ Patch2: libmlx4-0003-mmap-needs-some-inc
 Patch3: libmlx4-0004-Fix-version-in-taball-filename-in-RPM-spec-file.patch
 Patch4: libmlx4-0005-Update-function-prototypes-to-match-libibverbs-enum-.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Provides: libmlx4-devel = %{version}-%{release}
 BuildRequires: libibverbs-devel >= 1.1.3
 %ifnarch ia64
 BuildRequires: valgrind-devel
@@ -28,9 +29,9 @@ ConnectX HCAs for use with the libibverb
 %package static
 Summary: Static version of the libmlx4 driver
 Group: System Environment/Libraries
+Provides: %{name}-devel-static = %{version}-%{release}
+Obsoletes: %{name}-devel-static <= 1.0.1-1
 Requires: %{name} = %{version}-%{release}
-Provides: libmlx4-devel = %{version}-%{release}
-Obsoletes: libmlx4-devel <= 1.0
 
 %description static
 Static version of libmlx4 that may be linked directly to an
@@ -78,6 +79,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libmlx4.a
 
 %changelog
+* Sat Dec 05 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-3
+- Tweak the provides and obsoletes a little bit to make sure we only pull in
+  the -static package to replace past -devel-static packages, and not past
+  -devel packages.
+
 * Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-2
 - Merge various bits from Red Hat package into Fedora package