rpms/mock/EL-5 .cvsignore, 1.15, 1.16 mock.spec, 1.32, 1.33 sources, 1.18, 1.19 arch-specific-repo.patch, 1.3, NONE
Michael E Brown (mebrown)
fedora-extras-commits at redhat.com
Tue Nov 20 22:59:02 UTC 2007
Author: mebrown
Update of /cvs/extras/rpms/mock/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1835
Modified Files:
.cvsignore mock.spec sources
Removed Files:
arch-specific-repo.patch
Log Message:
* Tue Nov 20 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.9-1
- Fixes so that mock will run cleanly on RHEL5
- Add glib-devel.i386, glib2-devel.i386 to yum exclude list as it breaks
builds.
- Add backwards-compatibility code for old-style 'automatically assume rebuild'
convention
- automake symlink accidentally included in tarball rather than file
(py-compile)
- update manpage
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mock/EL-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 15 Nov 2007 17:42:18 -0000 1.15
+++ .cvsignore 20 Nov 2007 22:58:28 -0000 1.16
@@ -1 +1 @@
-mock-0.7.7.tar.gz
+mock-0.8.9.tar.gz
Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/EL-5/mock.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mock.spec 15 Nov 2007 17:42:18 -0000 1.32
+++ mock.spec 20 Nov 2007 22:58:28 -0000 1.33
@@ -1,15 +1,25 @@
+# next four lines substituted by autoconf
+%define major 0
+%define minor 8
+%define sub 9
+%define extralevel %{nil}
+%define release_name mock
+%define release_version %{major}.%{minor}.%{sub}%{extralevel}
+
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
Summary: Builds packages inside chroots
Name: mock
-Version: 0.7.7
+Version: %{release_version}
Release: 1%{?dist}
-License: GPL
+License: GPLv2+
Group: Development/Tools
Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
URL: http://fedoraproject.org/wiki/Projects/Mock
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: python, yum >= 2.4
+Requires: python >= 2.4, yum >= 2.4, tar, gzip
Requires(pre): shadow-utils
-BuildRequires: libselinux-devel
+BuildRequires: python-devel
%description
Mock takes a srpm and builds it in a chroot
@@ -18,34 +28,13 @@
%setup -q
%build
-make CFLAGS="$RPM_OPT_FLAGS"
+%configure
+make
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
-# make the default.cfg link
-cd $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
-
-%if 0%{?fedora:1}
-if [ -f fedora-%{fedora}-%{_target_cpu}-core.cfg ]; then
- ln -s fedora-%{fedora}-%{_target_cpu}-core.cfg default.cfg
-elif [ -f fedora-%{fedora}-%{_target_cpu}.cfg ]; then
- ln -s fedora-%{fedora}-%{_target_cpu}.cfg default.cfg
-fi
-%endif
-
-# if we haven't created a default link yet, try to do so as devel
-if [ ! -f default.cfg ]; then
- if [ -f fedora-development-%{_target_cpu}.cfg ]; then
- ln -s fedora-development-%{_target_cpu}.cfg default.cfg
- elif [ -f fedora-devel-%{_target_cpu}.cfg ]; then
- ln -s fedora-devel-%{_target_cpu}.cfg default.cfg
- elif [ -f fedora-development-i386.cfg ]; then
- ln -s fedora-development-i386.cfg default.cfg
- elif [ -f fedora-devel-i386.cfg ]; then
- ln -s fedora-devel-i386.cfg default.cfg
- fi
-fi
+mkdir -p $RPM_BUILD_ROOT/var/lib/mock
%clean
rm -rf $RPM_BUILD_ROOT
@@ -57,19 +46,75 @@
%files
%defattr(-, root, root)
-%doc README ChangeLog buildsys-build.spec
+%doc README ChangeLog buildsys-build.spec-template
+
+# python stuff
+%{_libexecdir}/mock.py*
+%{python_sitelib}/*
+
+# config files
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/*.cfg
-%{_bindir}/%{name}
-%{_libexecdir}/mock-yum
+%config(noreplace) %{_sysconfdir}/%{name}/*.ini
+
+# binary is setuid, but only runnable by group 'mock'
+%attr(04770, root, mock) %{_bindir}/%{name}
+
%{_mandir}/man1/mock.1*
-%attr(04750, root, mock) %{_sbindir}/mock-helper
%attr(02775, root, mock) %dir /var/lib/mock
-%{_libdir}/libselinux-mock.so
%changelog
-* Mon Oct 22 2007 Michael Brown <mebrown at michaels-house.net> - 0.7.7-1
-- fix for BZ#250985. /dev/ is destroyed on next mock run if build fails.
+* Tue Nov 20 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.9-1
+- Fixes so that mock will run cleanly on RHEL5
+- Add glib-devel.i386, glib2-devel.i386 to yum exclude list as it breaks
+ builds.
+- Add backwards-compatibility code for old-style 'automatically assume rebuild'
+ convention
+- automake symlink accidentally included in tarball rather than file
+ (py-compile)
+- update manpage
+
+* Mon Nov 19 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.8-1
+- make it run correctly when called by the 'root' user
+- internal_setarch: optionally run 'setarch' internally. This
+ eliminates the need to run "setarch i386 mock ..." when building on
+ target_arch != build_arch. This is turned on by default. Limitations:
+ must have 'ctypes' python module available, which is only available
+ by default in python 2.5, or as an extension module in <= 2.4.
+ If the 'ctypes' module is not available, this feature will be
+ disabled and you must manually run 'setarch'.
+- Does not run 'clean' action for 'shell', 'chroot', 'install', or
+ 'installdeps' (docs updated)
+- fix build for top_builddir != top_srcdir
+- fix 'installdeps' so that it works with both rpms/srpms
+- missing device file /dev/ptmx was causing 'expect' command to always
+ fail. Affected any SRPM build that used 'expect'.
+- hard spec file dep on python >= 2.4 due to python syntax changes.
+- resultdir can now contain python-string substitutions for any
+ variable in the chroot config.
+ rebuild my.src.rpm
+- add 'dist' variable to all chroot config files so that it is
+ available for resultdir substitutions.
+- give good error message when logging.ini cannot be found.
+- change default logging format to remove verbosity from build.log.
+- make logging format configurable from defaults.cfg or chroot cfg.
+- less verbose state.log format
+
+* Mon Oct 22 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.4-1
+- fix reported 'bad owner/group' from rpm in some configurations.
+
+* Mon Oct 22 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.3-1
+- BZ# 336361 -- cannot su - mockbuild
+- BZ# 326561 -- update manpage
+- BZ# 235141 -- error with immutable bit
+
+* Fri Oct 20 2007 Michael Brown <mebrown at michaels-house.net> - 0.8.0-1
+- huge number of changes upstream
+- convert to setuid wrapper instead of old setuid helper
+- lots of bugfixes and improvements
+- /var/cache/yum now saved and bind-mounted
+- ccache integration
+- rootcache improvements (formerly called autocache)
* Mon Aug 27 2007 Michael Brown <mebrown at michaels-house.net> - 0.7.6-1
- ensure /etc/hosts is created in chroot properly
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mock/EL-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 15 Nov 2007 17:42:18 -0000 1.18
+++ sources 20 Nov 2007 22:58:28 -0000 1.19
@@ -1 +1 @@
-459cdda4fe5b7bddd386554e32ebf83d mock-0.7.7.tar.gz
+7a882e5f714e163bc88327bd2824d150 mock-0.8.9.tar.gz
--- arch-specific-repo.patch DELETED ---
More information about the fedora-extras-commits
mailing list