SPECS: busybox.spec, cryptsetup-luks.spec, dmraid.spec, e2fsprogs.spec, lvm...

baggins baggins at pld-linux.org
Mon Mar 23 14:03:20 CET 2009


Author: baggins                      Date: Mon Mar 23 13:03:20 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)

---- Files affected:
SPECS:
   busybox.spec (1.162 -> 1.163) , cryptsetup-luks.spec (1.41 -> 1.42) , dmraid.spec (1.46 -> 1.47) , e2fsprogs.spec (1.204 -> 1.205) , lvm2.spec (1.132 -> 1.133) , mdadm.spec (1.86 -> 1.87) , module-init-tools.spec (1.71 -> 1.72) , udev.spec (1.288 -> 1.289) 

---- Diffs:

================================================================
Index: SPECS/busybox.spec
diff -u SPECS/busybox.spec:1.162 SPECS/busybox.spec:1.163
--- SPECS/busybox.spec:1.162	Mon Mar 23 13:59:05 2009
+++ SPECS/busybox.spec	Mon Mar 23 14:03:13 2009
@@ -140,7 +140,7 @@
 Summary:	Static busybox for initrd
 Summary(pl.UTF-8):	Statycznie skonsolidowany busybox dla initrd
 Group:		Applications
-Conflicts:	geninitrd < 3075
+Conflicts:	geninitrd <= 10000.3
 
 %description initrd
 Static busybox for initrd.
@@ -287,6 +287,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.163  2009/03/23 13:03:13  baggins
+- Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)
+
 Revision 1.162  2009/03/23 12:59:05  baggins
 - put programs for initrd into common directory _libdir/initrd
 

================================================================
Index: SPECS/cryptsetup-luks.spec
diff -u SPECS/cryptsetup-luks.spec:1.41 SPECS/cryptsetup-luks.spec:1.42
--- SPECS/cryptsetup-luks.spec:1.41	Mon Mar 23 13:59:05 2009
+++ SPECS/cryptsetup-luks.spec	Mon Mar 23 14:03:13 2009
@@ -113,6 +113,7 @@
 Summary:	LUKS for dm-crypt implemented in cryptsetup - initrd version
 Group:		Base
 Requires:	udev-initrd >= 1:115
+Conflicts:	geninitrd <= 10000.3
 
 %description initrd
 This package contains implementation of LUKS for dm-crypt implemented
@@ -250,6 +251,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2009/03/23 13:03:13  baggins
+- Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)
+
 Revision 1.41  2009/03/23 12:59:05  baggins
 - put programs for initrd into common directory _libdir/initrd
 

================================================================
Index: SPECS/dmraid.spec
diff -u SPECS/dmraid.spec:1.46 SPECS/dmraid.spec:1.47
--- SPECS/dmraid.spec:1.46	Mon Mar 23 13:59:05 2009
+++ SPECS/dmraid.spec	Mon Mar 23 14:03:13 2009
@@ -92,6 +92,7 @@
 Summary:	Device-mapper RAID tool - statically linked version
 Summary(pl.UTF-8):	Narzędzie do RAID-u opartego o device-mapper - wersja statyczna
 Group:		Base
+Conflicts:	geninitrd <= 10000.3
 
 %description initrd
 Statically linked version of dmraid utility.
@@ -211,6 +212,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2009/03/23 13:03:13  baggins
+- Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)
+
 Revision 1.46  2009/03/23 12:59:05  baggins
 - put programs for initrd into common directory _libdir/initrd
 

================================================================
Index: SPECS/e2fsprogs.spec
diff -u SPECS/e2fsprogs.spec:1.204 SPECS/e2fsprogs.spec:1.205
--- SPECS/e2fsprogs.spec:1.204	Mon Mar 23 13:59:05 2009
+++ SPECS/e2fsprogs.spec	Mon Mar 23 14:03:13 2009
@@ -615,6 +615,7 @@
 Summary:	blkid - initrd version
 Summary(pl.UTF-8):	blkid - wersja dla initrd
 Group:		Base
+Conflicts:	geninitrd <= 10000.3
 
 %description initrd
 This package includes a blkid utility to recognize partitions by label
@@ -1091,6 +1092,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.205  2009/03/23 13:03:13  baggins
+- Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)
+
 Revision 1.204  2009/03/23 12:59:05  baggins
 - put programs for initrd into common directory _libdir/initrd
 

================================================================
Index: SPECS/lvm2.spec
diff -u SPECS/lvm2.spec:1.132 SPECS/lvm2.spec:1.133
--- SPECS/lvm2.spec:1.132	Mon Mar 23 13:59:05 2009
+++ SPECS/lvm2.spec	Mon Mar 23 14:03:13 2009
@@ -87,6 +87,7 @@
 Summary:	The new version of Logical Volume Manager for Linux - initrd version
 Summary(pl.UTF-8):	Nowa wersja Logical Volume Managera dla Linuksa - wersja dla initrd
 Group:		Base
+Conflicts:	geninitrd <= 10000.3
 
 %description initrd
 This package includes a number of utilities for creating, checking,
@@ -164,6 +165,7 @@
 Summary(pl.UTF-8):	Wsparcie dla mapowania urządzeń w przestrzeni użytkownika - wersja dla initrd
 Group:		Base
 Obsoletes:	device-mapper-initrd-devel
+Conflicts:	geninitrd <= 10000.3
 
 %description -n device-mapper-initrd
 The goal of this driver is to support volume management. The driver
@@ -354,6 +356,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.133  2009/03/23 13:03:13  baggins
+- Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)
+
 Revision 1.132  2009/03/23 12:59:05  baggins
 - put programs for initrd into common directory _libdir/initrd
 

================================================================
Index: SPECS/mdadm.spec
diff -u SPECS/mdadm.spec:1.86 SPECS/mdadm.spec:1.87
--- SPECS/mdadm.spec:1.86	Mon Mar 23 13:59:05 2009
+++ SPECS/mdadm.spec	Mon Mar 23 14:03:13 2009
@@ -53,6 +53,7 @@
 Summary:	Tool for maintaining software RAID devices - initrd version
 Summary(pl.UTF-8):	Narzędzie do obsługi programowych macierzy RAID, wersja dla initrd
 Group:		Base
+Conflicts:	geninitrd <= 10000.3
 
 %description initrd
 Tool for maintaining software RAID devices - statically linked for
@@ -189,6 +190,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.87  2009/03/23 13:03:13  baggins
+- Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)
+
 Revision 1.86  2009/03/23 12:59:05  baggins
 - put programs for initrd into common directory _libdir/initrd
 

================================================================
Index: SPECS/module-init-tools.spec
diff -u SPECS/module-init-tools.spec:1.71 SPECS/module-init-tools.spec:1.72
--- SPECS/module-init-tools.spec:1.71	Mon Mar 23 13:59:05 2009
+++ SPECS/module-init-tools.spec	Mon Mar 23 14:03:13 2009
@@ -60,6 +60,7 @@
 Summary(pl.UTF-8):	Narzędzia do modułów jądra systemu bez kerneld - statyczne binarki dla initrd
 Group:		Applications/System
 Requires:	%{name} = %{version}-%{release}
+Conflicts:	geninitrd <= 10000.3
 
 %description initrd
 Module utilities without kerneld - static binary for initrd.
@@ -158,6 +159,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72  2009/03/23 13:03:13  baggins
+- Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)
+
 Revision 1.71  2009/03/23 12:59:05  baggins
 - put programs for initrd into common directory _libdir/initrd
 

================================================================
Index: SPECS/udev.spec
diff -u SPECS/udev.spec:1.288 SPECS/udev.spec:1.289
--- SPECS/udev.spec:1.288	Mon Mar 23 13:59:05 2009
+++ SPECS/udev.spec	Mon Mar 23 14:03:13 2009
@@ -111,6 +111,7 @@
 Summary(pl.UTF-8):	Implementacja devfs w przestrzeni użytkownika - statyczna binarka dla initrd
 Group:		Base
 Requires:	%{name}-core = %{epoch}:%{version}-%{release}
+Conflicts:	geninitrd <= 10000.3
 
 %description initrd
 A userspace implementation of devfs - static binary for initrd.
@@ -456,6 +457,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.289  2009/03/23 13:03:13  baggins
+- Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)
+
 Revision 1.288  2009/03/23 12:59:05  baggins
 - put programs for initrd into common directory _libdir/initrd
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/busybox.spec?r1=1.162&r2=1.163&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cryptsetup-luks.spec?r1=1.41&r2=1.42&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dmraid.spec?r1=1.46&r2=1.47&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/e2fsprogs.spec?r1=1.204&r2=1.205&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lvm2.spec?r1=1.132&r2=1.133&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mdadm.spec?r1=1.86&r2=1.87&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/module-init-tools.spec?r1=1.71&r2=1.72&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/udev.spec?r1=1.288&r2=1.289&f=u



More information about the pld-cvs-commit mailing list