packages: eio/eio.spec - -devel conflicts with libeio-devel (could be harml...

[glen]

Author: glen                         Date: Mon Jan 23 23:25:53 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- -devel conflicts with libeio-devel (could be harmless)

---- Files affected:
packages/eio:
   eio.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/eio/eio.spec
diff -u packages/eio/eio.spec:1.1 packages/eio/eio.spec:1.2
--- packages/eio/eio.spec:1.1	Tue Dec 13 16:15:02 2011
+++ packages/eio/eio.spec	Tue Jan 24 00:25:48 2012
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+# TODO
+# - -devel conflicts with libeio-devel
+#	file /usr/lib64/libeio.la from install of eio-devel-0.1.0.65643-1.x86_64 conflicts with file from package libeio-devel-1.0-1.x86_64
+#	file /usr/lib64/libeio.so from install of eio-devel-0.1.0.65643-1.x86_64 conflicts with file from package libeio-devel-1.0-1.x86_64
 #
 # Conditional build:
 %bcond_without	static_libs	# don't build static libraries
@@ -7,17 +11,17 @@
 Summary(pl.UTF-8):	Enlightenment Input Output - biblioteka wejścia/wyjścia z projektu Enlightenment
 Name:		eio
 Version:	0.1.0.65643
-Release:	1
+Release:	2
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://download.enlightenment.org/snapshots/LATEST/%{name}-%{version}.tar.bz2
 # Source0-md5:	244d07702020c919a6f99b2b1856da9a
 URL:		http://trac.enlightenment.org/e/wiki/Eio
-BuildRequires:	eina-devel >= 1.0.0
 BuildRequires:	ecore-devel >= 1.0.0
+BuildRequires:	eina-devel >= 1.0.0
 BuildRequires:	pkgconfig >= 1:0.22
-Requires:	eina >= 1.0.0
 Requires:	ecore >= 1.0.0
+Requires:	eina >= 1.0.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,8 +41,9 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Eio
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	eina-devel >= 1.0.0
 Requires:	ecore-devel >= 1.0.0
+Requires:	eina-devel >= 1.0.0
+Conflicts:	libeio-devel
 
 %description devel
 Header files for Eio library.
@@ -104,5 +109,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2012/01/23 23:25:48  glen
+- -devel conflicts with libeio-devel (could be harmless)
+
 Revision 1.1  2011/12/13 15:15:02  qboosh
 - new
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eio/eio.spec?r1=1.1&r2=1.2&f=u