rpms/libmthca/F-12 libmthca.spec,1.14,1.15

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/libmthca/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20841

Modified Files:
	libmthca.spec 
Log Message:
* Sat Dec 05 2009 Doug Ledford <dledford at redhat.com> - 1.0.5-6
- 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: libmthca.spec
===================================================================
RCS file: /cvs/extras/rpms/libmthca/F-12/libmthca.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- libmthca.spec	2 Dec 2009 19:35:46 -0000	1.14
+++ libmthca.spec	5 Dec 2009 18:57:19 -0000	1.15
@@ -1,6 +1,6 @@
 Name: libmthca
 Version: 1.0.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Mellanox InfiniBand HCA Userspace Driver
 Provides: libibverbs-driver
 Group: System Environment/Libraries
@@ -12,6 +12,7 @@ Patch1: libmthca-Remove-empty-stubs-for-
 Patch2: libmthca-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch
 Patch3: libmthca-Update-function-prototypes-to-match-libibverbs-enum-.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Provides: %{name}-devel = %{version}-%{release}
 BuildRequires: libibverbs-devel >= 1.1.3
 %ifnarch ia64
 BuildRequires: valgrind-devel
@@ -27,8 +28,6 @@ Summary: Development files for the libmt
 Group: System Environment/Libraries
 Provides: %{name}-devel-static = %{version}-%{release}
 Obsoletes: %{name}-devel-static <= 1.0.5-3
-Provides: %{name}-devel = %{version}-%{release}
-Obsoletes: %{name}-devel <= 1.0.5-3
 Requires: %{name} = %{version}-%{release}
 
 %description static
@@ -70,6 +69,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libmthca.a
 
 %changelog
+* Sat Dec 05 2009 Doug Ledford <dledford at redhat.com> - 1.0.5-6
+- 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.
+
 * Wed Dec 02 2009 Doug Ledford <dledford at redhat.com> - 1.0.5-5
 - Rename devel-static package to just -static, it only has a single static
   lib in it and no actual devel files (like headers, those are part of