diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2007-04-24 19:34:32 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2007-04-24 19:34:32 +0000 |
commit | 4df7583caa71a35d6d68c373fc0c62d1be6d955b (patch) | |
tree | bddf36169b314d82ff20036dea7e47fa4fec5bcd /t/data/SPECS/handle-conflict-deps | |
parent | 7a606ec3537b2f465f8e06e99b445c756bfcca8f (diff) | |
download | urpmi-4df7583caa71a35d6d68c373fc0c62d1be6d955b.tar urpmi-4df7583caa71a35d6d68c373fc0c62d1be6d955b.tar.gz urpmi-4df7583caa71a35d6d68c373fc0c62d1be6d955b.tar.bz2 urpmi-4df7583caa71a35d6d68c373fc0c62d1be6d955b.tar.xz urpmi-4df7583caa71a35d6d68c373fc0c62d1be6d955b.zip |
re-sync after the big svn loss
Diffstat (limited to 't/data/SPECS/handle-conflict-deps')
-rw-r--r-- | t/data/SPECS/handle-conflict-deps/a-sup.spec | 14 | ||||
-rw-r--r-- | t/data/SPECS/handle-conflict-deps/a.spec | 14 | ||||
-rw-r--r-- | t/data/SPECS/handle-conflict-deps/b-sub.spec | 13 | ||||
-rw-r--r-- | t/data/SPECS/handle-conflict-deps/b.spec | 15 |
4 files changed, 56 insertions, 0 deletions
diff --git a/t/data/SPECS/handle-conflict-deps/a-sup.spec b/t/data/SPECS/handle-conflict-deps/a-sup.spec new file mode 100644 index 00000000..ce10bcdf --- /dev/null +++ b/t/data/SPECS/handle-conflict-deps/a-sup.spec @@ -0,0 +1,14 @@ +Summary: a-sup +Name: a-sup +Version: 1 +Release: 1 +License: x +Group: x +Url: x +BuildRoot: %{_tmppath}/%{name} +Requires: a + +%description +x + +%files diff --git a/t/data/SPECS/handle-conflict-deps/a.spec b/t/data/SPECS/handle-conflict-deps/a.spec new file mode 100644 index 00000000..96dd9e7a --- /dev/null +++ b/t/data/SPECS/handle-conflict-deps/a.spec @@ -0,0 +1,14 @@ +Summary: a +Name: a +Version: 1 +Release: 1 +License: x +Group: x +Url: x +BuildRoot: %{_tmppath}/%{name} +Conflicts: b + +%description +x + +%files diff --git a/t/data/SPECS/handle-conflict-deps/b-sub.spec b/t/data/SPECS/handle-conflict-deps/b-sub.spec new file mode 100644 index 00000000..908d2b8f --- /dev/null +++ b/t/data/SPECS/handle-conflict-deps/b-sub.spec @@ -0,0 +1,13 @@ +Summary: b-sub +Name: b-sub +Version: 1 +Release: 1 +License: x +Group: x +Url: x +BuildRoot: %{_tmppath}/%{name} + +%description +x + +%files diff --git a/t/data/SPECS/handle-conflict-deps/b.spec b/t/data/SPECS/handle-conflict-deps/b.spec new file mode 100644 index 00000000..c10a64ac --- /dev/null +++ b/t/data/SPECS/handle-conflict-deps/b.spec @@ -0,0 +1,15 @@ +Summary: b +Name: b +Version: 1 +Release: 1 +License: x +Group: x +Url: x +BuildRoot: %{_tmppath}/%{name} +Conflicts: a +Requires: b-sub + +%description +x + +%files |