Clean up redundant and/or considered harmful crap from testsuite specs

Stop this gunk from getting copy-pasted around, this mostly harmful and redundant at best.
rpm-software-management · May 4, 2022 · f7ffa9c · f7ffa9c
1 parent 2bb2bd5
commit f7ffa9c
Show file tree

Hide file tree

Showing 24 changed files with 1 addition and 130 deletions.
diff --git a/tests/data/SPECS/attrtest.spec b/tests/data/SPECS/attrtest.spec
@@ -10,8 +10,6 @@ BuildArch:	noarch
 %{summary}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 for x in a b c d e f g h i j; do
     mkdir -p $RPM_BUILD_ROOT/${x}
     mkdir -p $RPM_BUILD_ROOT/${x}/dir

diff --git a/tests/data/SPECS/buildrequires.spec b/tests/data/SPECS/buildrequires.spec
@@ -29,17 +29,6 @@ echo hello
 EOF
 chmod a+x $RPM_BUILD_ROOT/usr/local/bin/hello
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%pre
-
-%post
-
-%preun
-
-%postun
-
 %files
 %defattr(-,root,root)
 %doc	FAQ

diff --git a/tests/data/SPECS/captest.spec b/tests/data/SPECS/captest.spec
@@ -10,8 +10,6 @@ BuildArch:      noarch
 %{summary}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT/a
 echo "x" > $RPM_BUILD_ROOT/a/emptyCaps1
 echo "x" > $RPM_BUILD_ROOT/a/emptyCaps2

diff --git a/tests/data/SPECS/configtest.spec b/tests/data/SPECS/configtest.spec
@@ -16,7 +16,6 @@ BuildArch:	noarch
 %{summary}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
 case %{filetype} in
 file)
@@ -30,9 +29,6 @@ dir)
     ;;
 esac
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root,-)
 %{?fileattr} %{!?noconfig:%config%{?noreplace:(noreplace)}} %{_sysconfdir}/my.conf
diff --git a/tests/data/SPECS/conflicttest.spec b/tests/data/SPECS/conflicttest.spec
@@ -14,13 +14,9 @@ BuildArch:	noarch
 %{summary}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}
 echo "%{filedata}" > $RPM_BUILD_ROOT/%{_datadir}/my.version
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root,-)
 %{?fileattr} %{_datadir}/my.version
diff --git a/tests/data/SPECS/flangtest.spec b/tests/data/SPECS/flangtest.spec
@@ -13,17 +13,12 @@ BuildArch:	noarch
 %{summary}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p  $RPM_BUILD_ROOT/%{_datadir}/%{name}
 for f in fi de en pl none; do
     echo "This is $f language" > $RPM_BUILD_ROOT/%{_datadir}/%{name}/$f.txt
 done
 touch $RPM_BUILD_ROOT/%{_datadir}/%{name}/empty.txt
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root,-)
 %lang(fi) %{_datadir}/%{name}/fi.txt

diff --git a/tests/data/SPECS/globtest.spec b/tests/data/SPECS/globtest.spec
@@ -12,8 +12,6 @@ BuildArch:	noarch
 %define testdir /opt/%{name}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT/%{testdir}
 echo "foo" > $RPM_BUILD_ROOT/%{testdir}/weird%%name
 for f in bif baf zab zeb zib brace grace; do

diff --git a/tests/data/SPECS/hello-g3.spec b/tests/data/SPECS/hello-g3.spec
@@ -25,7 +25,6 @@ mv hello hello-g3
 make CFLAGS="-g3 -O2 -D_FORTIFY_SOURCE=2 %{?debug_flags}" CC=%{__cc}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/local/bin
 make DESTDIR=$RPM_BUILD_ROOT install
 cp hello-g3 $RPM_BUILD_ROOT/usr/local/bin/

diff --git a/tests/data/SPECS/hello-r2.spec b/tests/data/SPECS/hello-r2.spec
@@ -21,21 +21,9 @@ Simple rpm demonstration.
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/local/bin
 make DESTDIR=$RPM_BUILD_ROOT install
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%pre
-
-%post
-
-%preun
-
-%postun
-
 %files
 %defattr(-,root,root)
 %doc	FAQ

diff --git a/tests/data/SPECS/hello-script.spec b/tests/data/SPECS/hello-script.spec
@@ -11,7 +11,6 @@ BuildArch:	noarch
 %{summary}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/zoot
 cat << EOF > $RPM_BUILD_ROOT/usr/bin/hello

diff --git a/tests/data/SPECS/hello.spec b/tests/data/SPECS/hello.spec
@@ -21,21 +21,9 @@ Simple rpm demonstration.
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/local/bin
 make DESTDIR=$RPM_BUILD_ROOT install
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%pre
-
-%post
-
-%preun
-
-%postun
-
 %files
 %defattr(-,root,root)
 %doc	FAQ

diff --git a/tests/data/SPECS/hello2-suid.spec b/tests/data/SPECS/hello2-suid.spec
@@ -23,23 +23,11 @@ mv hello hello2
 make CFLAGS="-g -O2 -D_FORTIFY_SOURCE=2"
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/local/bin
 # Note explicit install hello as suid
 install -m 4755 hello $RPM_BUILD_ROOT/usr/local/bin
 install -m 755 hello2 $RPM_BUILD_ROOT/usr/local/bin
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%pre
-
-%post
-
-%preun
-
-%postun
-
 %files
 # Note we don't set any attrs. We expect the suid flag to have been picked up.
 /usr/local/bin/hello

diff --git a/tests/data/SPECS/hello2.spec b/tests/data/SPECS/hello2.spec
@@ -23,22 +23,10 @@ mv hello hello2
 make CFLAGS="-g -O2 -D_FORTIFY_SOURCE=2"
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/local/bin
 make DESTDIR=$RPM_BUILD_ROOT install
 cp hello2 $RPM_BUILD_ROOT/usr/local/bin/
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%pre
-
-%post
-
-%preun
-
-%postun
-
 %files
 %defattr(-,root,root)
 %doc	FAQ

diff --git a/tests/data/SPECS/hello2cp.spec b/tests/data/SPECS/hello2cp.spec
@@ -22,27 +22,13 @@ make CFLAGS="-g -O1"
 cp hello hello2
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/local/bin
 make DESTDIR=$RPM_BUILD_ROOT install
 cp hello2 $RPM_BUILD_ROOT/usr/local/bin/
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%pre
-
-%post
-
-%preun
-
-%postun
-
 %files
 %defattr(-,root,root)
 %doc	FAQ
-#%readme README
-#%license COPYING
 %attr(0751,root,root)	/usr/local/bin/hello
 %attr(0751,root,root)	/usr/local/bin/hello2
 

diff --git a/tests/data/SPECS/hello2ln.spec b/tests/data/SPECS/hello2ln.spec
@@ -21,27 +21,13 @@ Simple rpm demonstration.
 make CFLAGS="-g -O1"
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/local/bin
 make DESTDIR=$RPM_BUILD_ROOT install
 ln $RPM_BUILD_ROOT/usr/local/bin/hello $RPM_BUILD_ROOT/usr/local/bin/hello2
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%pre
-
-%post
-
-%preun
-
-%postun
-
 %files
 %defattr(-,root,root)
 %doc	FAQ
-#%readme README
-#%license COPYING
 %attr(0751,root,root)	/usr/local/bin/hello
 %attr(0751,root,root)	/usr/local/bin/hello2
 

diff --git a/tests/data/SPECS/hlinktest.spec b/tests/data/SPECS/hlinktest.spec
@@ -14,7 +14,6 @@ Provides: /bin/sh
 %description
 
 %install
-rm -rf %{buildroot}
 mkdir -p $RPM_BUILD_ROOT/foo
 cat << EOF >> $RPM_BUILD_ROOT/foo/hello
 #!/bin/sh

diff --git a/tests/data/SPECS/ifmultiline.spec b/tests/data/SPECS/ifmultiline.spec
@@ -10,8 +10,6 @@ Summary: Test multiline if conditions
 %{summary}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT/a
 echo "x" > $RPM_BUILD_ROOT/a/empty\
 Caps1
@@ -25,4 +23,4 @@ Caps1
 /a/emptyCaps1
 
 
-%changelog
+%changelog
diff --git a/tests/data/SPECS/poltest.spec b/tests/data/SPECS/poltest.spec
@@ -9,7 +9,6 @@ License: GPL
 Requires: poltest-policy
 Source0: poltest-%{version}.tar.bz2
 Source1: poltest-policy-%{version}.tar.bz2
-Buildroot: %{_tmppath}/%{name}-%{version}-root
 %description
 Example for installing policy included in a package header
 
@@ -22,12 +21,8 @@ make CFLAGS="$RPM_OPT_FLAGS"
 make -f /usr/share/selinux/devel/Makefile -C poltest-policy-%{version}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=%{buildroot} prefix=%{_prefix} install
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
 %{_bindir}/foo

diff --git a/tests/data/SPECS/prefixtest.spec b/tests/data/SPECS/prefixtest.spec
@@ -13,8 +13,6 @@ RemovePathPostfixes: g:f
 %define testdir /opt/%{name}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT/%{testdir}
 echo "foo" > $RPM_BUILD_ROOT/%{testdir}/weird%%name
 for f in bif baf zab zeb zib; do

diff --git a/tests/data/SPECS/replacetest.spec b/tests/data/SPECS/replacetest.spec
@@ -16,7 +16,6 @@ BuildArch:	noarch
 %{summary}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/opt
 case %{filetype} in
 file)

diff --git a/tests/data/SPECS/selfconflict.spec b/tests/data/SPECS/selfconflict.spec
@@ -11,7 +11,6 @@ BuildArch:	noarch
 %{summary}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/opt/mydir/{one,two}
 echo "foo" > $RPM_BUILD_ROOT/opt/mydir/one/somefile
 echo "bar" > $RPM_BUILD_ROOT/opt/mydir/two/somefile

diff --git a/tests/data/SPECS/symlinktest.spec b/tests/data/SPECS/symlinktest.spec
@@ -12,7 +12,6 @@ BuildArch:	noarch
 %{summary}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/share
 %if %{with symlink}
 mkdir -p $RPM_BUILD_ROOT/usr/lib/%{name}
@@ -23,9 +22,6 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/%{name}
 echo %{name} > $RPM_BUILD_ROOT/usr/share/%{name}/README
 %endif
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root,-)
 %if %{with symlink}

diff --git a/tests/data/SPECS/vattrtest.spec b/tests/data/SPECS/vattrtest.spec
@@ -10,8 +10,6 @@ BuildArch:	noarch
 %{summary}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT/opt/%{name}
 for x in a c cn d g l m r; do
     echo ${x} > $RPM_BUILD_ROOT/opt/%{name}/${x}

diff --git a/tests/data/SPECS/versiontest.spec b/tests/data/SPECS/versiontest.spec
@@ -10,8 +10,5 @@ BuildArch:	noarch
 %description
 %{summary}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)