packages: libassuan1/libassuan1.spec - Conflicts with libassuan

[shadzik]

Author: shadzik                      Date: Mon Mar 29 22:53:11 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Conflicts with libassuan

---- Files affected:
packages/libassuan1:
   libassuan1.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/libassuan1/libassuan1.spec
diff -u packages/libassuan1/libassuan1.spec:1.2 packages/libassuan1/libassuan1.spec:1.3
--- packages/libassuan1/libassuan1.spec:1.2	Tue Mar 30 00:51:37 2010
+++ packages/libassuan1/libassuan1.spec	Tue Mar 30 00:53:05 2010
@@ -21,6 +21,7 @@
 BuildRequires:	libtool
 BuildRequires:	pth-devel >= 1.2.0
 BuildRequires:	texinfo
+Conflicts:	libassuan
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -39,7 +40,8 @@
 Summary:	Header files for assuan library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki assuan
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Conflicts:	libassuan-devel
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 Header files for assuan library.
@@ -51,7 +53,8 @@
 Summary:	Static assuan library
 Summary(pl.UTF-8):	Statyczna biblioteka assuan
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+Conflicts:	libassuan-static
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static assuan library.
@@ -127,6 +130,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/03/29 22:53:05  shadzik
+- Conflicts with libassuan
+
 Revision 1.2  2010/03/29 22:51:37  shadzik
 - change name and co
 
================================================================

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