Hi all,
I just noticed that http://buildsys.fedoraproject.org/buildgroups/ now
has buildgroups for RHEL; alas, at least for RHEL4, they are broken.
When trying to use them, I ran into two problems:
1. the buildsys-build rpm does not pull in python; that's actually
two problems:
A. rpmbuild complains that 'el' is not a valid macro name,
and ignores the conditionals in the specfile that should
add a dependency on python, (filed as bz#211511)
B. the buildsys site has old RPM's. Who maintains that ?
2. buildsys-macros depends on rpmdevtools, which does not exist for
RHEL. A patch against the specfile from [1] is attached; it
removes the use of rpmdevtools completely. Where are the
specfiles for buildsys-macros maintained ? Couldn't find them in
CVS.
David
[1]
http://buildsys.fedoraproject.org/buildgroups/rhel4/i386/buildsys-macros-4-3.el4.src.rpm
Index: Makefile
===================================================================
RCS file: /cvs/fedora/mock/Makefile,v
retrieving revision 1.12
diff -u -b -B -r1.12 Makefile
--- Makefile 8 Sep 2006 18:04:00 -0000 1.12
+++ Makefile 19 Oct 2006 19:14:45 -0000
@@ -53,6 +53,6 @@
for i in 1 2 3 4 5 6; do \
rpmbuild $(RPMARGS) --define "fedora $$i" --define "dist .fc$$i" -bb buildsys-build.spec; \
done
- for i in 3 4; do \
- rpmbuild $(RPMARGS) --define "el $$i" --define "dist .el$$i" -bb buildsys-build.spec; \
+ for i in 3 4 5; do \
+ rpmbuild $(RPMARGS) --define "rhel $$i" --define "dist .el$$i" -bb buildsys-build.spec; \
done
Index: buildsys-build.spec
===================================================================
RCS file: /cvs/fedora/mock/buildsys-build.spec,v
retrieving revision 1.5
diff -u -b -B -r1.5 buildsys-build.spec
--- buildsys-build.spec 25 Aug 2006 16:40:30 -0000 1.5
+++ buildsys-build.spec 19 Oct 2006 19:14:45 -0000
@@ -3,7 +3,7 @@
#
Summary: The base set of packages for a mock chroot
Name: buildsys-build
-Version: 0.7
+Version: 0.8
Release: 2%{?dist}
License: GPL
Group: Development/Build Tools
@@ -45,12 +45,12 @@
%endif
# RHEL block
-%if "%{?el}" != ""
+%if "%{?rhel}" != ""
Requires: redhat-release
Requires: coreutils
Requires: elfutils
Requires: redhat-rpm-config
-%if "%{?el}" == "4"
+%if "%{?rhel}" == "4"
Requires: python
%endif
%endif
@@ -102,6 +102,9 @@
%doc
%changelog
+* Thu Oct 19 2006 David Lutterkort <dlutter@xxxxxxxxxx> - 0.8-2
+- Fix RHEL tests to use ?rhel, not ?el
+
* Fri Aug 25 2006 Dennis Gilmore <dennis@xxxxxxxx> - 0.7-2
- add aurora SPARC linux conditionals
--- buildsys-macros.spec.orig 2006-09-30 12:04:41.000000000 -0700
+++ buildsys-macros.spec 2006-10-19 11:50:22.000000000 -0700
@@ -2,12 +2,11 @@
Summary: Macros for the Fedora Buildsystem
# The value for version should match the version of Fedora Core.
Version: 4
-Release: 3.el%{version}
+Release: 4.el%{version}
License: GPL
Group: Development/Buildsystem
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Buildarch: noarch
-Requires: rpmdevtools
%description
Macros for the Fedora Buildsystem
@@ -22,7 +21,6 @@
VERSION=%{version}
printf %s%b "%" "rhel $VERSION\n" >> $RPM_BUILD_ROOT/etc/rpm/macros.disttag
printf %s%b "%" "dist .el$VERSION\n" >> $RPM_BUILD_ROOT/etc/rpm/macros.disttag
-printf %s%b "%" "__arch_install_post /usr/lib/rpm/check-buildroot\n" >> $RPM_BUILD_ROOT/etc/rpm/macros.checkbuild
%clean
@@ -31,9 +29,11 @@
%files
%defattr(-,root,root)
/etc/rpm/macros.disttag
-/etc/rpm/macros.checkbuild
%changelog
+* Thu Oct 19 2006 David Lutterkort <dlutter@xxxxxxxxxx>
+- Remove rpmdevtools requirement - that does not exist in RHEL
+
* Wed Sep 27 2006 Dennis Gilmore <dennis@xxxxxxxx>
- add macro to run check-buildroot
--
fedora-extras-list mailing list
fedora-extras-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-extras-list
