Author: arekm Date: Fri Jul 10 12:27:16 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- conflicts with libjpeg6
---- Files affected:
packages/libjpeg:
libjpeg.spec (1.68 -> 1.69)
---- Diffs:
================================================================
Index: packages/libjpeg/libjpeg.spec
diff -u packages/libjpeg/libjpeg.spec:1.68 packages/libjpeg/libjpeg.spec:1.69
--- packages/libjpeg/libjpeg.spec:1.68 Fri Jul 10 14:14:57 2009
+++ packages/libjpeg/libjpeg.spec Fri Jul 10 14:27:11 2009
@@ -66,6 +66,7 @@
Summary(uk.UTF-8): Хедери для розробки програм, що використовують libjpeg
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Conflicts: libjpeg6-devel
%description devel
The libjpeg-devel package includes the header files necessary for
@@ -114,6 +115,7 @@
Summary(uk.UTF-8): Статична бібліотека для програмування з libjpeg
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
+Conflicts: libjpeg6-static
%description static
Static library for developing programs using libjpeg.
@@ -139,6 +141,7 @@
Summary(pl.UTF-8): Kilka prostych programów do manipulowania na plikach
JPEG
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Conflicts: libjpeg6-progs
%description progs
Simple clients for manipulating JPEG images. Libjpeg client programs
@@ -239,6 +242,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.69 2009/07/10 12:27:11 arekm
+- conflicts with libjpeg6
+
Revision 1.68 2009/07/10 12:14:57 arekm
- --disable-silent-rules so we know what's happening
@@ -412,8 +418,3 @@
Revision 1.21 1999/07/12 23:06:06 kloczek
- added using CVS keywords in %changelog (for automating them).
-* Thu May 20 1999 Tomasz Kłoczko <[email protected]>
- [6b-11]
-- spec based on RH spec,
-- pl translation by Wojtek Ślusarczyk <[email protected]>,
-- spec rewritten by Wojtek Ślusarczyk <[email protected]> and me.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libjpeg/libjpeg.spec?r1=1.68&r2=1.69&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
