From fdc89e875e8e36fa29cf1256a7110beb1af9e1e3 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Thu, 7 Jul 2011 04:45:17 +0000 Subject: [PATCH 1/3] trigger service run Rev openSUSE:Tools/142 Md5 48a8c0f9ea6a1a03a559ba6b1141144b 2011-07-07 04:45:17 adrianSuSE None --- ...format_spec_file:build-mkbaselibs-sle.spec | 62 +++++++++ _service:format_spec_file:build.spec | 130 ++++++++++++++++++ build-mkbaselibs-sle.spec | 8 +- build.spec | 14 +- 4 files changed, 194 insertions(+), 20 deletions(-) create mode 100644 _service:format_spec_file:build-mkbaselibs-sle.spec create mode 100644 _service:format_spec_file:build.spec diff --git a/_service:format_spec_file:build-mkbaselibs-sle.spec b/_service:format_spec_file:build-mkbaselibs-sle.spec new file mode 100644 index 00000000..4a17685e --- /dev/null +++ b/_service:format_spec_file:build-mkbaselibs-sle.spec @@ -0,0 +1,62 @@ +# +# spec file for package build-mkbaselibs-sle +# +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + + +Name: build-mkbaselibs-sle +License: GPLv2+ +Group: Development/Tools/Building +AutoReqProv: on +Summary: Tools to generate base lib packages +Version: 2011.07.01 +Release: 0 +#!BuildIgnore: build-mkbaselibs +Provides: build-mkbaselibs +Source: build-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-build +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. + +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 \ + $RPM_BUILD_ROOT/usr/lib/build/mkbaselibs +install -m 0644 baselibs_global-deb.conf \ + $RPM_BUILD_ROOT/usr/lib/build/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/_service:format_spec_file:build.spec b/_service:format_spec_file:build.spec new file mode 100644 index 00000000..bcf76c9d --- /dev/null +++ b/_service:format_spec_file:build.spec @@ -0,0 +1,130 @@ +# +# spec file for package build +# +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + + +Name: build +License: GPLv2+ +Group: Development/Tools/Building +AutoReqProv: on +Summary: A Script to Build SUSE Linux RPMs +Version: 2011.07.01 +Release: 0 +#!BuildIgnore: build-mkbaselibs +Source: build-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch +# Manual requires to avoid hard require to bash-static +AutoReqProv: off +# Keep the following dependencies in sync with obs-worker package +Requires: bash +Requires: perl +Requires: binutils +Requires: tar +Conflicts: bsdtar < 2.5.5 +%if 0%{?suse_version} > 1000 +# None of them are actually required for core features. +# Perl helper scripts use them. +Recommends: perl(Date::Language) +Recommends: perl(Date::Parse) +Recommends: perl(LWP::UserAgent) +Recommends: perl(Pod::Usage) +Recommends: perl(Time::Zone) +Recommends: perl(URI) +Recommends: perl(XML::Parser) +Recommends: bsdtar +%endif + +%description +This package provides a script for building RPMs for SUSE Linux in a +chroot environment. + + +%if 0%{?suse_version} > 1120 || ! 0%{?suse_version} +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. + +%package mkdrpms +License: GPLv2+ +Group: Development/Tools/Building +Summary: Tools to generate delta rpms +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/ +%if 0%{?suse_version} +%if 0%{?sles_version} + ln -s sles%{sles_version}.conf default.conf +%else + V=%suse_version + ln -s sl${V:0:2}.${V:2:1}.conf default.conf +%endif +test -e default.conf +%endif + +%files +%defattr(-,root,root) +%doc README +/usr/bin/build +/usr/bin/buildvc +/usr/bin/unrpm +/usr/lib/build +%{_mandir}/man1/build.1* + +%if 0%{?suse_version} > 1120 || ! 0%{?suse_version} +%exclude /usr/lib/build/mkbaselibs +%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 diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index 4e752882..ab2bf864 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.07.01 -Release: 0 +Release: 1 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs Source: build-%{version}.tar.gz @@ -33,7 +33,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. @@ -43,10 +42,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 \ @@ -56,13 +53,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 ba7d6264..2481ee7b 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.07.01 -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 From 2a665968dcd5f7676cac9fd4c151e8fd35fff0a0 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Thu, 7 Jul 2011 04:45:55 +0000 Subject: [PATCH 2/3] Added back the debian.tar.gz file from the previous version. This allows debian builds of the packge. Rev openSUSE:Tools/143 Md5 19093090b964361fd8189b309f243843 2011-07-07 04:45:55 adrianSuSE 75010 --- ...format_spec_file:build-mkbaselibs-sle.spec | 62 --------- _service:format_spec_file:build.spec | 130 ------------------ debian.tar.gz | 3 + 3 files changed, 3 insertions(+), 192 deletions(-) delete mode 100644 _service:format_spec_file:build-mkbaselibs-sle.spec delete mode 100644 _service:format_spec_file:build.spec create mode 100644 debian.tar.gz diff --git a/_service:format_spec_file:build-mkbaselibs-sle.spec b/_service:format_spec_file:build-mkbaselibs-sle.spec deleted file mode 100644 index 4a17685e..00000000 --- a/_service:format_spec_file:build-mkbaselibs-sle.spec +++ /dev/null @@ -1,62 +0,0 @@ -# -# spec file for package build-mkbaselibs-sle -# -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -# norootforbuild - - -Name: build-mkbaselibs-sle -License: GPLv2+ -Group: Development/Tools/Building -AutoReqProv: on -Summary: Tools to generate base lib packages -Version: 2011.07.01 -Release: 0 -#!BuildIgnore: build-mkbaselibs -Provides: build-mkbaselibs -Source: build-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -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. - -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 \ - $RPM_BUILD_ROOT/usr/lib/build/mkbaselibs -install -m 0644 baselibs_global-deb.conf \ - $RPM_BUILD_ROOT/usr/lib/build/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/_service:format_spec_file:build.spec b/_service:format_spec_file:build.spec deleted file mode 100644 index bcf76c9d..00000000 --- a/_service:format_spec_file:build.spec +++ /dev/null @@ -1,130 +0,0 @@ -# -# spec file for package build -# -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -# norootforbuild - - -Name: build -License: GPLv2+ -Group: Development/Tools/Building -AutoReqProv: on -Summary: A Script to Build SUSE Linux RPMs -Version: 2011.07.01 -Release: 0 -#!BuildIgnore: build-mkbaselibs -Source: build-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -# Manual requires to avoid hard require to bash-static -AutoReqProv: off -# Keep the following dependencies in sync with obs-worker package -Requires: bash -Requires: perl -Requires: binutils -Requires: tar -Conflicts: bsdtar < 2.5.5 -%if 0%{?suse_version} > 1000 -# None of them are actually required for core features. -# Perl helper scripts use them. -Recommends: perl(Date::Language) -Recommends: perl(Date::Parse) -Recommends: perl(LWP::UserAgent) -Recommends: perl(Pod::Usage) -Recommends: perl(Time::Zone) -Recommends: perl(URI) -Recommends: perl(XML::Parser) -Recommends: bsdtar -%endif - -%description -This package provides a script for building RPMs for SUSE Linux in a -chroot environment. - - -%if 0%{?suse_version} > 1120 || ! 0%{?suse_version} -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. - -%package mkdrpms -License: GPLv2+ -Group: Development/Tools/Building -Summary: Tools to generate delta rpms -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/ -%if 0%{?suse_version} -%if 0%{?sles_version} - ln -s sles%{sles_version}.conf default.conf -%else - V=%suse_version - ln -s sl${V:0:2}.${V:2:1}.conf default.conf -%endif -test -e default.conf -%endif - -%files -%defattr(-,root,root) -%doc README -/usr/bin/build -/usr/bin/buildvc -/usr/bin/unrpm -/usr/lib/build -%{_mandir}/man1/build.1* - -%if 0%{?suse_version} > 1120 || ! 0%{?suse_version} -%exclude /usr/lib/build/mkbaselibs -%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 diff --git a/debian.tar.gz b/debian.tar.gz new file mode 100644 index 00000000..6ff99671 --- /dev/null +++ b/debian.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e76356912637c3554da7a0cef6cbc7f12e5adf9fc4c6b14fb09084c6b6bcc845 +size 1524 From e3e35c51732e7fae3ad155853a2076b129979b38 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Tue, 9 Aug 2011 12:52:32 +0000 Subject: [PATCH 3/3] The following screendump should say it all: ---------------------------------------------------------------------- # rpm -qi build [...] Description : This package provides a script for building RPMs for SUSE Linux in a chroot environment. Requires: build-mkbaselibs Recommends: build-mkdrpms Distribution: openSUSE:Tools / openSUSE_11.4 ---------------------------------------------------------------------- Needless to say that rpm -q --requires / --recommends does not list build-mkbaselibs and build-mkdrpms. This SR fixes this bug. Note: the Recommends is only enabled on distributions that support it. Rev openSUSE:Tools/144 Md5 274b4cf7540da05ba844cba63bcea0a8 2011-08-09 12:52:32 adrianSuSE 78242 --- build.changes | 6 ++++++ build.spec | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/build.changes b/build.changes index d61ba07e..0d727099 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Aug 7 19:58:28 UTC 2011 - opensuse@cboltz.de + +- Requires:/Recommends: were part of the package description. + Moved them to the correct place. + ------------------------------------------------------------------- Fri Jul 1 07:26:34 UTC 2011 - adrian@suse.de diff --git a/build.spec b/build.spec index 2481ee7b..aa00fbc0 100644 --- a/build.spec +++ b/build.spec @@ -50,14 +50,20 @@ Recommends: perl(XML::Parser) Recommends: bsdtar %endif +%if 0%{?suse_version} > 1120 || ! 0%{?suse_version} +Requires: build-mkbaselibs +%endif + +%if 0%{?suse_version} > 1120 || 0%{?mdkversion} +Recommends: build-mkdrpms +%endif + %description This package provides a script for building RPMs for SUSE Linux in a chroot environment. %if 0%{?suse_version} > 1120 || ! 0%{?suse_version} -Requires: build-mkbaselibs -Recommends: build-mkdrpms %package mkbaselibs License: GPLv2+