rpms/mock/F-7 mock.spec,1.36,1.37

[Michael E Brown (mebrown)]

Author: mebrown

Update of /cvs/extras/rpms/mock/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21941

Modified Files:
	mock.spec 
Log Message:
* 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)



Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/F-7/mock.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- mock.spec	27 Aug 2007 17:51:04 -0000	1.36
+++ mock.spec	22 Oct 2007 16:47:42 -0000	1.37
@@ -1,15 +1,25 @@
+# these are all substituted by autoconf
+%define major 0
+%define minor 8
+%define sub 2
+%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.6
+Version: %{release_version}
 Release: 1%{?dist}
 License: GPL
 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, 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,17 +46,32 @@
 
 %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
+* 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