Author: glen                         Date: Fri Jul  6 08:43:01 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- conflict before split

---- Files affected:
packages/cloog-ppl:
   cloog-ppl.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/cloog-ppl/cloog-ppl.spec
diff -u packages/cloog-ppl/cloog-ppl.spec:1.8 
packages/cloog-ppl/cloog-ppl.spec:1.9
--- packages/cloog-ppl/cloog-ppl.spec:1.8       Fri Jul  6 10:42:09 2012
+++ packages/cloog-ppl/cloog-ppl.spec   Fri Jul  6 10:42:56 2012
@@ -11,8 +11,8 @@
 URL:           http://www.cloog.org/
 BuildRequires: autoconf >= 2.13
 BuildRequires: automake
-BuildRequires: gmp-devel >= 4.1.3
 BuildRequires: gmp-c++-devel >= 4.1.3
+BuildRequires: gmp-devel >= 4.1.3
 BuildRequires: libtool
 BuildRequires: ppl-devel >= 0.10
 BuildRequires: texinfo >= 4.12
@@ -44,6 +44,7 @@
 Summary:       Chunky Loop Generator shared library - ppl based version
 Summary(pl.UTF-8):     Biblioteka współdzielona Chunky Loop Generatora - 
wersja oparta na ppl
 Group:         Libraries
+Conflicts:     %{name} < 0.16.1-1
 
 %description libs
 Chunky Loop Generator shared library - ppl based version.
@@ -57,8 +58,8 @@
 Summary(pl.UTF-8):     Pliki nagłówkowe opartej na ppl wersji Chunky Loop 
Generatora
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      gmp-devel >= 4.1.3
 Requires:      gmp-c++-devel >= 4.1.3
+Requires:      gmp-devel >= 4.1.3
 Requires:      ppl-devel >= 0.10
 Provides:      cloog-devel = %{version}
 
@@ -132,6 +133,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2012/07/06 08:42:56  glen
+- conflict before split
+
 Revision 1.8  2012/07/06 08:42:09  glen
 - versioned obsoletes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/cloog-ppl/cloog-ppl.spec?r1=1.8&r2=1.9

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to