diff options
author | Michael E Brown <michael_e_brown@dell.com> | 2007-10-17 18:59:30 -0500 |
---|---|---|
committer | Michael E Brown <michael_e_brown@dell.com> | 2007-10-17 18:59:30 -0500 |
commit | e32254da2cc8c240ab51c0eaa37599daf943b8c5 (patch) | |
tree | f03a2b78dbe96460922a0a8dbd46b7acc12cc8a7 | |
parent | 3dd0c9d4ab4947444ceff9ede99de9b4f2cc9af9 (diff) | |
download | mock-e32254da2cc8c240ab51c0eaa37599daf943b8c5.tar.gz mock-e32254da2cc8c240ab51c0eaa37599daf943b8c5.tar.xz mock-e32254da2cc8c240ab51c0eaa37599daf943b8c5.zip |
rename buildsys-build.spec so rpmbuild doenst accidentally use it.
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | buildsys-build.spec-template | 132 |
3 files changed, 134 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 37710b4..70e195d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,7 @@ src_mock_LDFLAGS = mocketcdir = $(sysconfdir)/mock dist_mocketc_DATA = $(wildcard etc/*.cfg) etc/logging.ini -EXTRA_DIST += docs buildsys-build.spec +EXTRA_DIST += docs buildsys-build.spec-template mock.spec dist_libexec_SCRIPTS = src/mock.py man_MANS = docs/mock.1 diff --git a/Makefile.in b/Makefile.in index 68cb6bd..b2f02b9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -263,7 +263,7 @@ MOCK_LIBTOOL_AGE = @MOCK_LIBTOOL_AGE@ CLEANFILES = mock-*.tar.gz mock-*.tar.bz2 mock-*.rpm _buildtemp \ version $(EXTRA_PROGRAMS) DISTCLEANFILES = *~ -EXTRA_DIST = docs buildsys-build.spec +EXTRA_DIST = docs buildsys-build.spec-template mock.spec AM_CFLAGS = -Wall -I$(top_srcdir)/src -DSYSCONFDIR='"$(sysconfdir)"' -DLIBEXECDIR='"$(libexecdir)"' -DLIBDIR='"$(libdir)"' -Werror lib_LTLIBRARIES = src/libselinux-mock.la src_libselinux_mock_la_LDFLAGS = -version-info $(MOCK_LIBTOOL_CURRENT):$(MOCK_LIBTOOL_REVISION):$(MOCK_LIBTOOL_AGE) diff --git a/buildsys-build.spec-template b/buildsys-build.spec-template new file mode 100644 index 0000000..28efb5c --- /dev/null +++ b/buildsys-build.spec-template @@ -0,0 +1,132 @@ +# +# Spec file for mock buildsys configuration +# +Summary: The base set of packages for a mock chroot +Name: buildsys-build +Version: 0.7.6 +Release: 1%{?dist} +License: GPL +Group: Development/Build Tools +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildArch: noarch + +# packages that populate a buildsys chroot +Requires: bash +Requires: buildsys-macros +Requires: bzip2 +Requires: cpio +Requires: diffutils +Requires: gcc +Requires: gcc-c++ +Requires: gzip +Requires: make +Requires: patch +Requires: perl +Requires: rpm-build +Requires: sed +Requires: tar +Requires: unzip +Requires: which + +# The rather long-winded format of the conditionals is needed for compatbility +# with old rpm versions such as were supplied with Red Hat Linux 7 + +# Fedora block +%if "%{?fedora}" != "" +Requires: coreutils +Requires: fedora-release +Requires: redhat-rpm-config +%if "%{?fedora}" == "4" || "%{?fedora}" == "3" || "%{?fedora}" == "2" || "%{?fedora}" == "1" +Requires: elfutils +%if "%{?fedora}" == "4" || "%{?fedora}" == "3" +Requires: python +%endif +%endif +%endif + +# RHEL block +%if "%{?rhel}" != "" +Requires: redhat-release +Requires: coreutils +Requires: elfutils +Requires: redhat-rpm-config +%if "%{?rhel}" == "4" +Requires: python +%endif +%endif + +# Red Hat Linux [789] block +%if "%{?rhl}" != "" +Requires: redhat-release +%if "%{?rhl}" == "9" +Requires: coreutils +Requires: elfutils +Requires: redhat-rpm-config +%else +Requires: file +Requires: fileutils +Requires: findutils +%endif +# Cater for alternative versions of buildsys-macros +%if "%{?rhl}" == "8" || "%{?rhl}" == "8.0" +Requires: redhat-rpm-config +%endif +%endif + +# Aurora block +%if "%{?aurora}" != "" +Requires: coreutils +Requires: fedora-release +Requires: redhat-rpm-config +%if "%{?aurora}" == "2" +Requires: elfutils +Requires: python +%endif +%endif + + +%description +The base set of packages for a mock chroot. + +%build + +%install +%{__rm} -rf %{buildroot} +%{__mkdir_p} %{buildroot} + +%clean +%{__rm} -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc +%changelog +* Wed Jan 3 2007 Clark Williams <williams@redhat.com> +- merged mock-0.6 BZ fixes to trunk + +* Thu Dec 14 2006 Clark Williams <williams@redhat.com> +- added fix from David Lutterkort for RHEL +- refactored some conditional blocks for simplicity +- added this entry for Dennis Gilmore's aurora SPARC fixes + +* Tue Aug 29 2006 Clark Williams <williams@redhat.com> +- added rhl buildsys-build rpms + +* Fri Aug 25 2006 Dennis Gilmore <dennis@ausil.us> +- add aurora SPARC linux conditionals + +* Mon Aug 7 2006 Clark Williams <williams@redhat.com> +- refactored conditional blocks for simplicity +- bumped version to match mock + +* Mon Aug 7 2006 Clark Williams <williams@redhat.com> - 0.5-4 +- added rhel build tags + +* Sun Aug 06 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.5-3 +- For FC4 and FC3 include python + +* Thu Jun 22 2006 Paul Howarth <paul@city-fan.org> - 0.5-2 +- For FC < 5 or Red Hat Linux 9, include elfutils +- For non-Fedora distrbutions, require redhat-release instead of fedora-release +- For Red Hat Linux 8 and earlier, require fileutils instead of coreutils +- Red Hat Linux 8 requires findutils for brp-strip |