Merge pull request #409 from xsuchy/pull-req-buildroot2

buildroot and %clean section is not needed
Katello · Aug 2, 2012 · 8812e3e · 8812e3e
2 parents 975015a + d10e8a3
commit 8812e3e
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 50 deletions.
diff --git a/agent/katello-agent.spec b/agent/katello-agent.spec
@@ -6,6 +6,7 @@ Group:   Development/Languages
 License: LGPLv2
 URL:     https://fedorahosted.org/katello/
 Source0: https://fedorahosted.org/releases/k/a/katello/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
@@ -27,12 +28,16 @@ pushd src
 popd
 
 %install
+rm -rf $RPM_BUILD_ROOT
 mkdir -p %{buildroot}/%{_sysconfdir}/gofer/plugins
 mkdir -p %{buildroot}/%{_prefix}/lib/gofer/plugins
 
 cp etc/gofer/plugins/katelloplugin.conf %{buildroot}/%{_sysconfdir}/gofer/plugins
 cp src/katello/agent/katelloplugin.py %{buildroot}/%{_prefix}/lib/gofer/plugins
 
+%clean
+rm -rf %{buildroot}
+
 %files
 %config(noreplace) %{_sysconfdir}/gofer/plugins/katelloplugin.conf
 %{_prefix}/lib/gofer/plugins/katelloplugin.*

diff --git a/certs-tools/katello-certs-tools.spec b/certs-tools/katello-certs-tools.spec
@@ -6,7 +6,6 @@ Version: 1.1.7
 Release: 1%{?dist}
 URL:      https://fedorahosted.org/katello
 Source0:  https://fedorahosted.org/releases/k/a/katello/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: openssl rpm-build
 BuildRequires: docbook-utils
@@ -24,13 +23,9 @@ Katello.
 %{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 chmod +x $RPM_BUILD_ROOT/%{python_sitelib}/certs/katello_ssl_tool.py
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %{python_sitelib}/*
 %{_datarootdir}/katello/certs

diff --git a/cli/katello-cli.spec b/cli/katello-cli.spec
@@ -22,10 +22,6 @@ URL:           http://www.katello.org
 Version:       1.1.0
 Release:       1%{?dist}
 Source0:       https://fedorahosted.org/releases/k/a/katello/%{name}-%{version}.tar.gz
-
-# we need to keep RHEL compatibility
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 Requires:      %{base_name}-cli-common
 BuildArch:     noarch
 
@@ -64,7 +60,6 @@ sed -e 's/THE_VERSION/%{version}/g' katello-debug-certificates.pod |\
 popd
 
 %install
-rm -rf %{buildroot}
 install -d %{buildroot}%{_bindir}/
 install -d %{buildroot}%{_sysconfdir}/%{base_name}/
 install -d %{buildroot}%{python_sitelib}/%{base_name}
@@ -89,11 +84,6 @@ install -m 0644 man/%{base_name}-debug-certificates.man1 %{buildroot}%{_mandir}/
 # several scripts are executable
 chmod 755 %{buildroot}%{python_sitelib}/%{base_name}/client/main.py
 
-
-# we need to keep RHEL compatibility
-%clean
-rm -rf %{buildroot}
-
 %files 
 %attr(755,root,root) %{_bindir}/%{base_name}
 %attr(755,root,root) %{_bindir}/%{base_name}-debug-certificates

diff --git a/headpin/katello-cli-headpin/katello-cli-headpin.spec b/headpin/katello-cli-headpin/katello-cli-headpin.spec
@@ -22,7 +22,6 @@ URL:           http://www.katello.org
 Version:       1.1.0
 Release:       1%{?dist}
 Source0:       https://fedorahosted.org/releases/k/a/katello/%{name}-%{version}.tar.gz
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:      %{base_name}-cli-common
 BuildArch:     noarch
@@ -39,17 +38,12 @@ for Linux systems
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}/
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{command_name}/
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{base_name}/
 install -pm 0644 bin/%{command_name} $RPM_BUILD_ROOT%{_bindir}/%{command_name}
 install -pm 0644 etc/client.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{base_name}/client.conf
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %attr(755,root,root) %{_bindir}/%{command_name}
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/%{base_name}/client.conf

diff --git a/puppet/katello-configure.spec b/puppet/katello-configure.spec
@@ -10,7 +10,6 @@ Group:          Applications/Internet
 License:        GPLv2
 URL:            http://www.katello.org
 Source0:        https://fedorahosted.org/releases/k/a/katello/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       puppet >= 2.6.6
 Requires:       coreutils
@@ -60,7 +59,6 @@ THE_VERSION=%version sed -i "s/THE_VERSION/$THE_VERSION/g" man/katello-passwd.po
 
 
 %install
-rm -rf %{buildroot}
 #prepare dir structure
 install -d -m 0755 %{buildroot}%{_sbindir}
 install -m 0755 bin/katello-configure %{buildroot}%{_sbindir}
@@ -80,9 +78,6 @@ install -m 0644 man/katello-passwd.man1 %{buildroot}%{_mandir}/man1/katello-pass
 install -d -m 0755 %{buildroot}%{homedir}/upgrade-scripts
 cp -Rp upgrade-scripts/* %{buildroot}%{homedir}/upgrade-scripts
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %{homedir}/
 %{_sbindir}/katello-configure

diff --git a/scripts/system-test/katello-cli-tests.spec b/scripts/system-test/katello-cli-tests.spec
@@ -22,7 +22,6 @@ URL:           http://www.katello.org
 Version:       1.1.0
 Release:       1%{?dist}
 Source0:       https://fedorahosted.org/releases/k/a/katello/%{name}-%{version}.tar.gz
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:      %{base_name}-cli
 Requires:      yajl
@@ -41,16 +40,12 @@ application life-cycle for Linux systems
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{homedir}/script/cli-tests
 pwd
 ls
 cp -Rp cli_tests/ cli-system-test helpers *zip RPM-GPG-KEY* $RPM_BUILD_ROOT%{homedir}/script/cli-tests
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %{homedir}/script/cli-tests
 

diff --git a/scripts/test/files/dummy.spec.tpl b/scripts/test/files/dummy.spec.tpl
@@ -7,7 +7,6 @@ License:  GPLv2
 Group:          Internet/Applications
 URL:            http://tstrachota.fedorapeople.org
 Source:         ###NAME###.tar.gz
-#BuildRoot:      %{_topdir}/BUILD/%{name}-%{version}-%{release}
 
 ###REQUIRES###
 
@@ -27,6 +26,3 @@ date +"Package install time: %T %m-%d-%Y" >> /###NAME###.txt
 
 %files
 /###NAME###.txt
-
-%clean
-rm -rf %{buildroot}
diff --git a/scripts/test/repo_generation/files/dummy.spec.tpl b/scripts/test/repo_generation/files/dummy.spec.tpl
@@ -7,7 +7,6 @@ License:  GPLv2
 Group:          Internet/Applications
 URL:            http://tstrachota.fedorapeople.org
 Source:         ###NAME###.tar.gz
-#BuildRoot:      %{_topdir}/BUILD/%{name}-%{version}-%{release}
 
 ###REQUIRES###
 
@@ -27,6 +26,3 @@ date +"Package install time: %T %m-%d-%Y" >> /tmp/###NAME###.txt
 
 %files
 /tmp/###NAME###.txt
-
-%clean
-rm -rf %{buildroot}
diff --git a/selinux/katello-selinux/katello-selinux.spec b/selinux/katello-selinux/katello-selinux.spec
@@ -27,7 +27,6 @@ Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://www.katello.org
 Source0:        https://fedorahosted.org/releases/k/a/katello/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  checkpolicy, selinux-policy-devel, hardlink
 BuildRequires:  policycoreutils >= %{POLICYCOREUTILSVER}
@@ -68,8 +67,6 @@ done
 
 
 %install
-rm -rf %{buildroot}
-
 # Install SELinux policy modules
 for selinuxvariant in %{selinux_variants}
   do
@@ -97,9 +94,6 @@ install -m 0644 katello-selinux-enable.man1 %{buildroot}%{_mandir}/man1/katello-
 # Install secure (extra protected) directory
 install -d %{buildroot}%{_sysconfdir}/katello/secure
 
-%clean
-rm -rf %{buildroot}
-
 %post
 if /usr/sbin/selinuxenabled ; then
    %{_sbindir}/%{name}-enable

diff --git a/src/katello.spec b/src/katello.spec
@@ -25,7 +25,6 @@ Group:          Applications/Internet
 License:        GPLv2
 URL:            http://www.katello.org
 Source0:        https://fedorahosted.org/releases/k/a/katello/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:        %{name}-common
 Requires:        %{name}-glue-pulp
@@ -214,7 +213,6 @@ ruby -e 'require "rubygems"; require "gettext/tools"; GetText.create_mofiles(:po
 a2x -d manpage -f manpage man/katello-service.8.asciidoc
 
 %install
-rm -rf %{buildroot}
 #prepare dir structure
 install -d -m0755 %{buildroot}%{homedir}
 install -d -m0755 %{buildroot}%{datadir}
@@ -312,9 +310,6 @@ chmod a+r %{buildroot}%{homedir}/ca/redhat-uep.pem
 # install man page
 install -m 644 man/katello-service.8 %{buildroot}/%{_mandir}/man8
 
-%clean
-rm -rf %{buildroot}
-
 %post common
 #Add /etc/rc*.d links for the script
 /sbin/chkconfig --add %{name}