4.10.7

3 files changed, 89 insertions, 1 deletions

diff --git a/MANIFEST b/MANIFEST
index 81938474..fb39dd96 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -169,6 +169,38 @@ t/data/SPECS/arch_to_noarch_1.spec
 t/data/SPECS/arch_to_noarch_2.spec
 t/data/SPECS/arch_to_noarch_3.spec
 t/data/SPECS/arch_to_noarch_4.spec
+t/data/SPECS/file-conflicts/a.spec
+t/data/SPECS/file-conflicts/b.spec
+t/data/SPECS/file-conflicts/c.spec
+t/data/SPECS/file-conflicts/d.spec
+t/data/SPECS/file-conflicts/e.spec
+t/data/SPECS/file-conflicts/ga.spec
+t/data/SPECS/file-conflicts/gc.spec
+t/data/SPECS/file-conflicts/gc_.spec
+t/data/SPECS/file-conflicts/gd.spec
+t/data/SPECS/handle-conflict-deps/a-sup.spec
+t/data/SPECS/handle-conflict-deps/a.spec
+t/data/SPECS/handle-conflict-deps/b-sub.spec
+t/data/SPECS/handle-conflict-deps/b.spec
+t/data/SPECS/obsolete-and-conflict/a.spec
+t/data/SPECS/obsolete-and-conflict/b.spec
+t/data/SPECS/obsolete-and-conflict/c.spec
+t/data/SPECS/obsolete-and-conflict/d.spec
+t/data/SPECS/ordering-scriptlets/ash_1.spec
+t/data/SPECS/ordering-scriptlets/ash_2.spec
+t/data/SPECS/ordering-scriptlets/requires_post_1.spec
+t/data/SPECS/ordering-scriptlets/requires_post_2.spec
+t/data/SPECS/ordering-scriptlets/requires_postun_1.spec
+t/data/SPECS/ordering-scriptlets/requires_postun_2.spec
+t/data/SPECS/ordering-scriptlets/requires_pre_1.spec
+t/data/SPECS/ordering-scriptlets/requires_pre_2.spec
+t/data/SPECS/ordering-scriptlets/requires_preun_1.spec
+t/data/SPECS/ordering-scriptlets/requires_preun_2.spec
+t/data/SPECS/prefer/a.spec
+t/data/SPECS/prefer/b.spec
+t/data/SPECS/prefer/b_foo.spec
+t/data/SPECS/prefer/c.spec
+t/data/SPECS/prefer/c_foo.spec
 t/data/SPECS/priority-upgrade-1/a-strict_1.spec
 t/data/SPECS/priority-upgrade-1/a_1.spec
 t/data/SPECS/priority-upgrade-1/b_1.spec
@@ -177,7 +209,49 @@ t/data/SPECS/priority-upgrade-2/a_2.spec
 t/data/SPECS/priority-upgrade-2/b_2.spec
 t/data/SPECS/priority-upgrade-2/bb1_2.spec
 t/data/SPECS/priority-upgrade-2/bb2_2.spec
+t/data/SPECS/provide-and-no-obsolete/a-1.spec
+t/data/SPECS/provide-and-no-obsolete/a-2.spec
+t/data/SPECS/provide-and-no-obsolete/b-3.spec
+t/data/SPECS/README-urpmi/a.spec
+t/data/SPECS/README-urpmi/b.spec
+t/data/SPECS/README-urpmi/b_2.spec
+t/data/SPECS/README-urpmi/b_3.spec
+t/data/SPECS/README-urpmi/c.spec
+t/data/SPECS/README-urpmi/d.spec
+t/data/SPECS/README-urpmi/d_.spec
+t/data/SPECS/rpmnew/a-1.spec
+t/data/SPECS/rpmnew/a-2.spec
+t/data/SPECS/rpmnew/a-3.spec
+t/data/SPECS/split-transactions--conflict-1/a.spec
+t/data/SPECS/split-transactions--conflict-1/b.spec
+t/data/SPECS/split-transactions--conflict-1/c.spec
+t/data/SPECS/split-transactions--conflict-2/b.spec
+t/data/SPECS/split-transactions--conflict-2/d.spec
+t/data/SPECS/split-transactions--strict-require-1/a.spec
+t/data/SPECS/split-transactions--strict-require-1/b.spec
+t/data/SPECS/split-transactions--strict-require-2/a.spec
+t/data/SPECS/split-transactions--strict-require-2/b.spec
+t/data/SPECS/split-transactions--strict-require-and-obsolete-1/a.spec
+t/data/SPECS/split-transactions--strict-require-and-obsolete-1/bb.spec
+t/data/SPECS/split-transactions--strict-require-and-obsolete-1/c-1.spec
+t/data/SPECS/split-transactions--strict-require-and-obsolete-2/a.spec
+t/data/SPECS/split-transactions--strict-require-and-obsolete-2/b.spec
+t/data/SPECS/split-transactions--strict-require-and-obsolete-2/c-2.spec
+t/data/SPECS/split-transactions/a.spec
+t/data/SPECS/split-transactions/b.spec
+t/data/SPECS/split-transactions/c.spec
+t/data/SPECS/split-transactions/d.spec
 t/data/SPECS/srpm-bootstrapping.spec
+t/data/SPECS/suggests/a-1.spec
+t/data/SPECS/suggests/a-2.spec
+t/data/SPECS/suggests/a-3.spec
+t/data/SPECS/suggests/b.spec
+t/data/SPECS/suggests/bb.spec
+t/data/SPECS/suggests/c.spec
+t/data/SPECS/suggests/cc.spec
+t/data/SPECS/suggests/suggested_b.spec
+t/data/SPECS/suggests/suggested_c.spec
+t/data/SPECS/suggests/with-invalid.spec
 t/data/SPECS/various.spec
 t/data/SPECS/various2.spec
 t/data/SPECS/various3.spec
@@ -189,11 +263,23 @@ t/superuser--addmedia.t
 t/superuser--arch_to_noarch.t
 t/superuser--buggy-rpms.t
 t/superuser--exclude.t
+t/superuser--file-conflicts.t
+t/superuser--handle-conflict-deps.t
 t/superuser--http.t
 t/superuser--media_info_dir.t
+t/superuser--obsolete-and-conflict.t
+t/superuser--ordering-scriptlets.t
+t/superuser--prefer.t
 t/superuser--priority-upgrade.t
+t/superuser--provide-and-no-obsolete.t
+t/superuser--README-urpmi.t
+t/superuser--rpmnew.t
 t/superuser--specify-media.t
+t/superuser--split-transactions--conflict.t
+t/superuser--split-transactions--strict-require-and-obsolete.t
+t/superuser--split-transactions.t
 t/superuser--srpm-bootstrapping.t
+t/superuser--suggests.t
 urpm.pm
 urpm/args.pm
 urpm/bug_report.pm
diff --git a/NEWS b/NEWS
index 8255acfd..65c4d602 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+Version 4.10.7 - 6 September 2007, by Pascal "Pixel" Rigaux
+
 - urpmi
   o fix rpmdb locking with --root
   o handle --searchmedia <media1>,...,<mediaN>
diff --git a/urpm.pm b/urpm.pm
index a75e333d..d89581a6 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -12,7 +12,7 @@ use urpm::sys;
 use urpm::cfg;
 use urpm::md5sum;
 
-our $VERSION = '4.10.6';
+our $VERSION = '4.10.7';
 our @ISA = qw(URPM Exporter);
 our @EXPORT_OK = 'file_from_local_url';