diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 346df2b8..6c9dd999 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -24,7 +24,7 @@ Group: Development/Tools/Building AutoReqProv: on Summary: Tools to generate base lib packages Version: 2011.06.17 -Release: 0 +Release: 1 #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -32,7 +32,6 @@ BuildArch: noarch # Manual requires to avoid hard require to bash-static AutoReqProv: off - %description This package contains the parts which may be installed in the inner build system for generating base lib packages. @@ -42,10 +41,8 @@ This is the SLE variant including IA64 binary generation. %prep %setup -q -n build-%{version} - %build - %install install -m 0755 -d $RPM_BUILD_ROOT/usr/lib/build install -m 0755 mkbaselibs \ @@ -55,13 +52,10 @@ install -m 0644 baselibs_global-deb.conf \ install -m 0644 baselibs_global-sle.conf \ $RPM_BUILD_ROOT/usr/lib/build/baselibs_global.conf - %files %defattr(-,root,root) %dir /usr/lib/build /usr/lib/build/mkbaselibs /usr/lib/build/baselibs* - - %changelog diff --git a/build.spec b/build.spec index b4fad4a8..bd88171d 100644 --- a/build.spec +++ b/build.spec @@ -24,7 +24,7 @@ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs Version: 2011.06.17 -Release: 0 +Release: 1 #!BuildIgnore: build-mkbaselibs Source: build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,7 +50,6 @@ Recommends: perl(XML::Parser) Recommends: bsdtar %endif - %description This package provides a script for building RPMs for SUSE Linux in a chroot environment. @@ -60,14 +59,12 @@ chroot environment. Requires: build-mkbaselibs Recommends: build-mkdrpms - %package mkbaselibs License: GPLv2+ Group: Development/Tools/Building Summary: Tools to generate base lib packages # NOTE: this package must not have dependencies which may break boot strapping (eg. perl modules) - %description mkbaselibs This package contains the parts which may be installed in the inner build system for generating base lib packages. @@ -80,21 +77,17 @@ Requires: deltarpm # XXX: we wanted to avoid that but mkdrpms needs Build::Rpm::rpmq Requires: build - %description mkdrpms This package contains the parts which may be installed in the inner build system for generating delta rpm packages. %endif - %prep %setup -q - %build - %install make DESTDIR=$RPM_BUILD_ROOT install cd $RPM_BUILD_ROOT/usr/lib/build/configs/ @@ -108,7 +101,6 @@ cd $RPM_BUILD_ROOT/usr/lib/build/configs/ test -e default.conf %endif - %files %defattr(-,root,root) %doc README @@ -123,20 +115,16 @@ test -e default.conf %exclude /usr/lib/build/baselibs* %exclude /usr/lib/build/mkdrpms - %files mkbaselibs %defattr(-,root,root) %dir /usr/lib/build /usr/lib/build/mkbaselibs /usr/lib/build/baselibs* - %files mkdrpms %defattr(-,root,root) %dir /usr/lib/build /usr/lib/build/mkdrpms %endif - - %changelog