diff options
| -rw-r--r-- | tests/data/SPECS/foo.spec | 3 | ||||
| -rw-r--r-- | tests/data/SPECS/hello-r2.spec | 5 | ||||
| -rw-r--r-- | tests/data/SPECS/hello.spec | 5 | ||||
| -rw-r--r-- | tests/data/SPECS/hello2-suid.spec | 5 | ||||
| -rw-r--r-- | tests/data/SPECS/hello2.spec | 5 | ||||
| -rw-r--r-- | tests/data/SPECS/hello2cp.spec | 5 | ||||
| -rw-r--r-- | tests/data/SPECS/hello2ln.spec | 5 | ||||
| -rw-r--r-- | tests/rpmi.at | 4 |
8 files changed, 2 insertions, 35 deletions
diff --git a/tests/data/SPECS/foo.spec b/tests/data/SPECS/foo.spec index 88d037ee8..5085e6cb3 100644 --- a/tests/data/SPECS/foo.spec +++ b/tests/data/SPECS/foo.spec @@ -5,9 +5,6 @@ Release: 1 Group: Utilities License: GPLv2+ Distribution: RPM test suite. -Provides: hi -Conflicts: goodbye -Obsoletes: howdy BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root diff --git a/tests/data/SPECS/hello-r2.spec b/tests/data/SPECS/hello-r2.spec index ca5091d10..598aea3ae 100644 --- a/tests/data/SPECS/hello-r2.spec +++ b/tests/data/SPECS/hello-r2.spec @@ -10,11 +10,6 @@ Packager: Red Hat Software <bugs@redhat.com> URL: http://www.redhat.com Source0: hello-1.0.tar.gz Patch0: hello-1.0-modernize.patch -Excludearch: lsi -Excludeos: cpm -Provides: hi -Conflicts: goodbye -Obsoletes: howdy Prefix: /usr %description diff --git a/tests/data/SPECS/hello.spec b/tests/data/SPECS/hello.spec index 7f5a92ed8..5bc9cfaf7 100644 --- a/tests/data/SPECS/hello.spec +++ b/tests/data/SPECS/hello.spec @@ -10,11 +10,6 @@ Packager: Red Hat Software <bugs@redhat.com> URL: http://www.redhat.com Source0: hello-1.0.tar.gz Patch0: hello-1.0-modernize.patch -Excludearch: lsi -Excludeos: cpm -Provides: hi -Conflicts: goodbye -Obsoletes: howdy Prefix: /usr %description diff --git a/tests/data/SPECS/hello2-suid.spec b/tests/data/SPECS/hello2-suid.spec index 32bdce1f9..c82248060 100644 --- a/tests/data/SPECS/hello2-suid.spec +++ b/tests/data/SPECS/hello2-suid.spec @@ -10,11 +10,6 @@ Packager: Red Hat Software <bugs@redhat.com> URL: http://www.redhat.com Source0: hello-1.0.tar.gz Patch0: hello-1.0-modernize.patch -Excludearch: lsi -Excludeos: cpm -Provides: hi -Conflicts: goodbye -Obsoletes: howdy Prefix: /usr %description diff --git a/tests/data/SPECS/hello2.spec b/tests/data/SPECS/hello2.spec index 01777af5b..34e558e72 100644 --- a/tests/data/SPECS/hello2.spec +++ b/tests/data/SPECS/hello2.spec @@ -10,11 +10,6 @@ Packager: Red Hat Software <bugs@redhat.com> URL: http://www.redhat.com Source0: hello-1.0.tar.gz Patch0: hello-1.0-modernize.patch -Excludearch: lsi -Excludeos: cpm -Provides: hi -Conflicts: goodbye -Obsoletes: howdy Prefix: /usr %description diff --git a/tests/data/SPECS/hello2cp.spec b/tests/data/SPECS/hello2cp.spec index 33d8dc260..f8d26836d 100644 --- a/tests/data/SPECS/hello2cp.spec +++ b/tests/data/SPECS/hello2cp.spec @@ -10,11 +10,6 @@ Packager: Red Hat Software <bugs@redhat.com> URL: http://www.redhat.com Source0: hello-1.0.tar.gz Patch0: hello-1.0-modernize.patch -Excludearch: lsi -Excludeos: cpm -Provides: hi -Conflicts: goodbye -Obsoletes: howdy Prefix: /usr %description diff --git a/tests/data/SPECS/hello2ln.spec b/tests/data/SPECS/hello2ln.spec index 2c40dcc32..16aafbc4e 100644 --- a/tests/data/SPECS/hello2ln.spec +++ b/tests/data/SPECS/hello2ln.spec @@ -10,11 +10,6 @@ Packager: Red Hat Software <bugs@redhat.com> URL: http://www.redhat.com Source0: hello-1.0.tar.gz Patch0: hello-1.0-modernize.patch -Excludearch: lsi -Excludeos: cpm -Provides: hi -Conflicts: goodbye -Obsoletes: howdy Prefix: /usr %description diff --git a/tests/rpmi.at b/tests/rpmi.at index a6f32887e..e8d6e9b7a 100644 --- a/tests/rpmi.at +++ b/tests/rpmi.at @@ -554,7 +554,7 @@ RPMDB_INIT runroot rpmbuild --quiet -bb \ --define "pkg one" \ - --define "obs deptest-two" \ + --define "obs deptest-two <= 1.0" \ /data/SPECS/deptest.spec runroot rpmbuild --quiet -bb \ --define "pkg two" \ @@ -584,7 +584,7 @@ RPMDB_INIT runroot rpmbuild --quiet -bb \ --define "pkg one" \ - --define "obs deptest-two" \ + --define "obs deptest-two <= 1.0" \ /data/SPECS/deptest.spec runroot rpmbuild --quiet -bb \ --define "pkg two" \ |