rpms/libmodman/devel libmodman.spec,1.1,1.2

[Nathaniel McCallum]

Author: npmccallum

Update of /cvs/pkgs/rpms/libmodman/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2532

Modified Files:
	libmodman.spec 
Log Message:
remove unnecessary conflict in libmodman


Index: libmodman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmodman/devel/libmodman.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libmodman.spec	3 Jul 2010 13:19:29 -0000	1.1
+++ libmodman.spec	3 Jul 2010 20:59:16 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           libmodman
 Version:        1.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A simple library for managing C++ modules (plug-ins)
 
 Group:          System Environment/Libraries
@@ -12,10 +12,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires:  cmake >= 2.8.0
 BuildRequires:  zlib-devel
 
-# libproxy currently ships libmodman bundled
-# libproxy >= 0.4.4 can build against external libmodman
-Conflicts:      libproxy < 0.4.4
-
 %description
 libmodman is a simple library for managing C++ modules (plug-ins).
 
@@ -65,6 +61,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/cmake/Modules/Findlibmodman.cmake
 
 %changelog
+* Sat Jul 03 2010 Nathaniel McCallum <nathaniel at natemccallum.com> - 1.0.1-5
+- Remove conflict with libproxy, its not really necessary since
+  we already have the latest libproxy in rawhide.
+
 * Sun Jun 20 2010 Nathaniel McCallum <nathaniel at natemccallum.com> - 1.0.1-4
 - Remove docs from -devel package
 - Upgrade cmake requirement to 2.8.0