rpms/mock/EL-5 .cvsignore, 1.12, 1.13 mock.spec, 1.29, 1.30 sources, 1.15, 1.16

Michael E Brown (mebrown) fedora-extras-commits at redhat.com
Thu Jun 14 17:39:44 UTC 2007


Author: mebrown

Update of /cvs/extras/rpms/mock/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17421

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
* Wed Jun 13 2007 Michael Brown <mebrown at michaels-house.net> - 0.7.1-1
- Fix problem with autocache where different users couldnt share same cache
- Fix problem creating resolv.conf in rootfs
- cleanup perms on rootfs /etc/

* Tue Jun 12 2007 Michael Brown <mebrown at michaels-house.net> - 0.7.1-1
- add EPEL 5 config files




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mock/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	30 Oct 2006 21:29:50 -0000	1.12
+++ .cvsignore	14 Jun 2007 17:39:10 -0000	1.13
@@ -1 +1 @@
-mock-0.6.8.tar.gz
+mock-0.7.1.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/EL-5/mock.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mock.spec	6 May 2007 18:52:32 -0000	1.29
+++ mock.spec	14 Jun 2007 17:39:10 -0000	1.30
@@ -1,29 +1,24 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.8
-Release: 4%{?dist}.1
+Version: 0.7.1
+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.2.1
+Requires: python, yum >= 3.0
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
-Patch0: arch-specific-repo.patch
-
 
 %description
 Mock takes a srpm and builds it in a chroot
 
 %prep
 %setup -q
-%patch0 -p0
-
 
 %build
-make
-
+make CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -33,24 +28,25 @@
 
 %if 0%{?fedora:1}
 if [ -f fedora-%{fedora}-%{_target_cpu}-core.cfg ]; then
-   	ln -s fedora-%{fedora}-%{_target_cpu}-core.cfg default.cfg
+        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}-core.cfg ]; then
-        ln -s fedora-development-%{_target_cpu}-core.cfg default.cfg
-    elif [ -f fedora-devel-%{_target_cpu}-core.cfg ]; then
-        ln -s fedora-devel-%{_target_cpu}-core.cfg default.cfg
-    elif [ -f fedora-development-i386-core.cfg ]; then
-        ln -s fedora-development-i386-core.cfg default.cfg
-    elif [ -f fedora-devel-i386-core.cfg ]; then
-        ln -s fedora-devel-i386-core.cfg default.cfg
+    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
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -59,8 +55,6 @@
     groupadd -r mock >/dev/null 2>&1 || :
 fi
 
-
-
 %files
 %defattr(-, root, root)
 %doc README ChangeLog buildsys-build.spec
@@ -73,19 +67,60 @@
 %attr(02775, root, mock) %dir /var/lib/mock
 %{_libdir}/libselinux-mock.so
 
-
 %changelog
-* Sun May 06 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info>
-- rebuilt for RHEL5 final
-
-* Mon Nov  6 2006 Jesse Keating <jkeating at redhat.com> - 0.6.8-4
-- Fix a couple typos pointing fc6 chroots to fe5.
-
-* Sat Nov  4 2006 Jesse Keating <jkeating at redhat.com> - 0.6.8-3
-- Fix a typo in the patch that added x86_64 repos for fc4ppc
-
-* Fri Nov  3 2006 Jesse Keating <jkeating at redhat.com> - 0.6.8-2
-- Add patch to fix repo files to use arch specific repos (#213516)
+* Wed Jun 13 2007 Michael Brown <mebrown at michaels-house.net> - 0.7.1-1
+- Fix problem with autocache where different users couldnt share same cache
+- Fix problem creating resolv.conf in rootfs
+- cleanup perms on rootfs /etc/
+
+* Tue Jun 12 2007 Michael Brown <mebrown at michaels-house.net> - 0.7.1-1
+- add EPEL 5 config files
+
+* Mon Jun 11 2007 Clark Williams <williams at redhat.com> - 0.7-1
+- fixed bind mount problems
+- added code to allow multiple users to use --no-clean
+- merged mock-0-6-branch to head and changed version
+
+* Thu Jun  7 2007 Clark Williams <williams at redhat.com> - 0.6.17-1
+- added F-7 config files (BZ#242276)
+- modified epel configs for changed mirrorlist location (BZ#239981)
+- added bind mount of /dev (BZ#236428)
+- added copy of /etc/resolv.conf to chroot (BZ#237663 and BZ#238101)
+
+* Tue May 01 2007 Clark Williams <williams at redhat.com> - 0.6.16-1
+- timeout code adds new cmdline option that will kill build process after
+  specified timeout. Useful for automated builds of things that may hang during
+  build and you just want it to fail.
+
+* Tue Apr 10 2007 Clark Williams <williams at redhat.com> - 0.6.15-1
+- Fixed typo in FC4 -epel configs (BZ 235490)
+
+* Sat Feb 24 2007 Clark Williams <williams at redhat.com> - 0.6.14-1
+- Ville Skyttä's fix for RPM_OPT_FLAGS (BZ 226673)
+
+* Tue Feb 20 2007 Clark Williams <williams at redhat.com> - 0.6.13-1
+- Handle --no-clean option when doing yum.conf symlink (BZ 230824)
+
+* Fri Feb 16 2007 Clark Williams <williams at redhat.com> - 0.6.12-1
+- added safety symlink for yum.conf
+
+* Wed Feb  7 2007 Clark Williams <williams at redhat.com> - 0.6.11-1
+- added error() calls to print command output on failed commands
+
+* Tue Feb  6 2007 Clark Williams <williams at redhat.com> - 0.6.11-1
+- added installdeps command for long-term chroot management
+
+* Mon Jan  8 2007 Clark Williams <williams at redhat.com> - 0.6.10-1
+- Added Josh Boyer's EPEL config files
+
+* Tue Nov 21 2006 Clark Williams <williams at redhat.com> - 0.6.9-1
+- applied Eric Work's patch to fix defaults vs. command line option problem
+  (BZ 215168)
+- use /etc/mock/defaults.cfg if --configdir specified and no defaults found
+  in the specified configdir
+  (BZ 209407)
+- applied Jesse Keatings patch for arch specifi config files
+  (BZ 213516)
 
 * Mon Oct 30 2006 Clark Williams <williams at redhat.com> - 0.6.8-1
 - respun tarballs without buildsys rpms
@@ -96,70 +131,38 @@
 * Sat Oct 21 2006 Clark Williams <williams at redhat.com> - 0.6.6-1
 - bumped version to 0.6.6 (fixed tarball problem)
 
-* Wed Oct 04 2006 Jesse Keating <jkeating at redhat.com> - 0.6.5-1
-- new upstream version to fix #151255
-
-* Tue Aug 29 2006 Jesse Keating <jkeating at redhat.com> - 0.6.4-1
-- new upstream version to fix #204051
-
-* Wed Aug 23 2006 Jesse Keating <jkeating at redhat.com> - 0.6.2-1
-- new upstream version
+* Mon Sep 11 2006 Clark Williams <williams at redhat.com> - 0.6.5-1
+- changed version number for patch from Karanbir Singh
+  (rpm workaround on CentOS 4.4)
+
+* Tue Aug 29 2006 Clark Williams <williams at redhat.com> - 0.6.3-1
+- changed version number to indicate fix for bz 204051
+
+* Tue Aug 29 2006 Clark Williams <williams at redhat.com> - 0.6.2-2
+- bumped revision for bz 204051
+
+* Wed Aug 23 2006 Clark Williams <williams at redhat.com> - 0.6.2-1
+- Updated README
+- Fixed link problem in etc/Makefile
+- Bumped version number
+
+* Wed Aug 16 2006 Clark Williams <williams at redhat.com>
+- Added buildsys-build specfile to docs
+- Added disttag
+- Bumped release number
 
-* Fri Aug 18 2006 Jesse Keating <jkeating at redhat.com> - 0.6.1-1
-- new upstream version
-- Fixes in spec from upstream
- - Added buildsys-build specfile to docs
+* Wed Jun  7 2006 Seth Vidal <skvidal at linux.duke.edu>
+- version update
 
-* Fri Jun 23 2006 Jesse Keating <jkeating at redhat.com> - 0.6-4
-- And fix the link syntax.
-
-* Wed Jun 21 2006 Jesse Keating <jkeating at redhat.com> - 0.6-3
-- Add patch symlink fedora-6 to development, not 5.
-
-* Tue Jun 20 2006 Jesse Keating <jkeating at redhat.com> - 0.6-1
-- New upstream version 0.6
-
-* Tue Mar 21 2006 Dan Williams <dcbw at redhat.com> - 0.4-8
-- bump release for fc5/fc6 split
-
-* Tue Mar 21 2006 Dan Williams <dcbw at redhat.com> - 0.4-7
-- Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots
-
-* Thu Mar  2 2006 Seth Vidal <skvidal at linux.duke.edu> - 0.4-6
-- iterate for gcc rebuild and fc5 final
-
-* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-5
-- Back out setpgrp patch, found a better way to do it in plague
-
-* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
-- Add option to create new process group so mock and its children
-    may be more easily killed
-
-* Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
-- Add unpackaged files fix from RH#163576 (Adrian Reber)
+* Tue Apr 11 2006 Seth Vidal <skvidal at linux.duke.edu>
+- specfile version iterate
 
 * Tue Dec 27 2005 Seth Vidal <skvidal at phy.duke.edu>
 - add patch from Andreas Thienemann - adds man page
 
-* Tue Aug 16 2005 Matthias Saou <http://freshrpms.net/> 0.4-2
-- Fix ?fedora check when not defined (would fail to parse).
-
-* Thu Aug  4 2005 Seth Vidal <skvidal at phy.duke.edu>
-- 0.4
-- update urls
-- add in selinux buildreq and mock-yum file
-
-* Sun Jun 12 2005 Jeremy Katz <katzj at redhat.com> 
-- set default.cfg based on both arch and distro built for
-
 * Sat Jun 11 2005 Seth Vidal <skvidal at phy.duke.edu>
 - security fix in mock-helper
 
-* Sat Jun 11 2005  Seth Vidal <skvidal at phy.duke.edu>
-- mock 0.3 - security release
-- mock-helper allowed execution of arbitrary commands by member of mock
-  group
-
 * Sun Jun  5 2005 Seth Vidal <skvidal at phy.duke.edu>
 - clean up packaging for fedora extras
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mock/EL-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Oct 2006 21:29:50 -0000	1.15
+++ sources	14 Jun 2007 17:39:10 -0000	1.16
@@ -1 +1 @@
-5f8308a6e5b8fe87943bb7b28dd55bfd  mock-0.6.8.tar.gz
+c51ef5f84f866e5c517ef53697b56fb1  mock-0.7.1.tar.gz




More information about the fedora-extras-commits mailing list