diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2008-10-31 10:41:10 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2008-10-31 10:41:10 +0000 |
commit | 2bc5884ec3473c039254286d5d33fca59f473491 (patch) | |
tree | 0d0d99c76eff910770670173c29aa6f1cb48cfae /t/data | |
parent | ddd855e54e8298ef21d346a9636dd88937dcde85 (diff) | |
download | urpmi-2bc5884ec3473c039254286d5d33fca59f473491.tar urpmi-2bc5884ec3473c039254286d5d33fca59f473491.tar.gz urpmi-2bc5884ec3473c039254286d5d33fca59f473491.tar.bz2 urpmi-2bc5884ec3473c039254286d5d33fca59f473491.tar.xz urpmi-2bc5884ec3473c039254286d5d33fca59f473491.zip |
do not use builrequires dash-static, use gcc to build a special binary, so
that we are less mandriva centered
Diffstat (limited to 't/data')
-rw-r--r-- | t/data/SPECS/ordering-scriptlets/a_1.spec | 40 | ||||
-rw-r--r-- | t/data/SPECS/ordering-scriptlets/a_2.spec (renamed from t/data/SPECS/ordering-scriptlets/ash_2.spec) | 4 | ||||
-rw-r--r-- | t/data/SPECS/ordering-scriptlets/ash_1.spec | 24 | ||||
-rw-r--r-- | t/data/SPECS/ordering-scriptlets/requires_post_1.spec | 4 | ||||
-rw-r--r-- | t/data/SPECS/ordering-scriptlets/requires_postun_1.spec | 4 | ||||
-rw-r--r-- | t/data/SPECS/ordering-scriptlets/requires_pre_1.spec | 4 | ||||
-rw-r--r-- | t/data/SPECS/ordering-scriptlets/requires_preun_1.spec | 4 |
7 files changed, 50 insertions, 34 deletions
diff --git a/t/data/SPECS/ordering-scriptlets/a_1.spec b/t/data/SPECS/ordering-scriptlets/a_1.spec new file mode 100644 index 00000000..f1ec3ea7 --- /dev/null +++ b/t/data/SPECS/ordering-scriptlets/a_1.spec @@ -0,0 +1,40 @@ +Summary: x +Name: a +Version: 1 +Release: 1 +License: x +Group: x +Url: x +Provides: /bin/a +BuildRequires: gcc +BuildRoot: %{_tmppath}/%{name} + +%prep +%setup -c -T +cat <<EOF > a.c +#include <stdio.h> +int main(int argc, char **argv) { + FILE *f = fopen(argv[1], "r"); + int c; + while ((c = getc(f)) > 0) putchar(c); + putchar('\n'); + return 0; +} +EOF + +%build +gcc -Wall -static -o a a.c + +%install +rm -rf $RPM_BUILD_ROOT +install -D a $RPM_BUILD_ROOT/bin/a + +%clean +rm -rf $RPM_BUILD_ROOT + +%description +x + +%files +%defattr(-,root,root) +/bin/* diff --git a/t/data/SPECS/ordering-scriptlets/ash_2.spec b/t/data/SPECS/ordering-scriptlets/a_2.spec index a6dbebad..0cd2afc8 100644 --- a/t/data/SPECS/ordering-scriptlets/ash_2.spec +++ b/t/data/SPECS/ordering-scriptlets/a_2.spec @@ -1,5 +1,5 @@ -Summary: ordering_ash -Name: ordering_ash +Summary: x +Name: a Version: 2 Release: 1 License: x diff --git a/t/data/SPECS/ordering-scriptlets/ash_1.spec b/t/data/SPECS/ordering-scriptlets/ash_1.spec deleted file mode 100644 index 7b6e1ab8..00000000 --- a/t/data/SPECS/ordering-scriptlets/ash_1.spec +++ /dev/null @@ -1,24 +0,0 @@ -Summary: ordering_ash -Name: ordering_ash -Version: 1 -Release: 1 -License: x -Group: x -Url: x -Provides: /bin/ash -BuildRequires: dash-static -BuildRoot: %{_tmppath}/%{name} - -%install -rm -rf $RPM_BUILD_ROOT -install -D /bin/dash.static $RPM_BUILD_ROOT/bin/ash - -%clean -rm -rf $RPM_BUILD_ROOT - -%description -x - -%files -%defattr(-,root,root) -/bin/* diff --git a/t/data/SPECS/ordering-scriptlets/requires_post_1.spec b/t/data/SPECS/ordering-scriptlets/requires_post_1.spec index 3603f6a6..052d09fb 100644 --- a/t/data/SPECS/ordering-scriptlets/requires_post_1.spec +++ b/t/data/SPECS/ordering-scriptlets/requires_post_1.spec @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name} %description x -%post -p /bin/ash -echo "%post is running ok" +%post -p /bin/a +post is running ok %files diff --git a/t/data/SPECS/ordering-scriptlets/requires_postun_1.spec b/t/data/SPECS/ordering-scriptlets/requires_postun_1.spec index 8a9dc0fb..f7fd871c 100644 --- a/t/data/SPECS/ordering-scriptlets/requires_postun_1.spec +++ b/t/data/SPECS/ordering-scriptlets/requires_postun_1.spec @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name} %description x -%postun -p /bin/ash -echo "%postun is running ok" +%postun -p /bin/a +postun is running ok %files diff --git a/t/data/SPECS/ordering-scriptlets/requires_pre_1.spec b/t/data/SPECS/ordering-scriptlets/requires_pre_1.spec index cc5e9430..0783397e 100644 --- a/t/data/SPECS/ordering-scriptlets/requires_pre_1.spec +++ b/t/data/SPECS/ordering-scriptlets/requires_pre_1.spec @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name} %description x -%pre -p /bin/ash -echo "%pre is running ok" +%pre -p /bin/a +pre is running ok %files diff --git a/t/data/SPECS/ordering-scriptlets/requires_preun_1.spec b/t/data/SPECS/ordering-scriptlets/requires_preun_1.spec index 9b0d6d90..9df5135c 100644 --- a/t/data/SPECS/ordering-scriptlets/requires_preun_1.spec +++ b/t/data/SPECS/ordering-scriptlets/requires_preun_1.spec @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name} %description x -%preun -p /bin/ash -echo "%preun is running ok" +%preun -p /bin/a +preun is running ok %files |