rpms/mock/F-12 .cvsignore, 1.59, 1.60 mock.spec, 1.86, 1.87 sources, 1.62, 1.63

John Clark Williams jcwillia at fedoraproject.org
Sat Feb 20 01:33:42 UTC 2010


Author: jcwillia

Update of /cvs/pkgs/rpms/mock/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20275

Modified Files:
	.cvsignore mock.spec sources 
Log Message:
* Wed Feb 17 2010 Clark Williams <williams at redhat.com>- 1.0.5-1
  - from Jesse Keating <jkeating at redhat.com>:
    - fixed 'useradd' option conflict with EPEL (-N vs -n)
    - added Fedora 13 configs



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-12/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	18 Feb 2010 19:03:51 -0000	1.59
+++ .cvsignore	20 Feb 2010 01:33:42 -0000	1.60
@@ -1 +1 @@
-mock-1.0.5.tar.gz
+mock-1.0.6.tar.gz


Index: mock.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-12/mock.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- mock.spec	18 Feb 2010 19:03:51 -0000	1.86
+++ mock.spec	20 Feb 2010 01:33:42 -0000	1.87
@@ -1,7 +1,7 @@
 # next four lines substituted by autoconf
 %define major 1
 %define minor 0
-%define sub 5
+%define sub 6
 %define extralevel %{nil}
 %define release_name mock
 %define release_version %{major}.%{minor}.%{sub}%{extralevel}
@@ -22,9 +22,12 @@ Requires: python >= 2.4, yum >= 2.4, tar
 Requires: createrepo
 Requires(pre): shadow-utils
 BuildRequires: python-devel
+%if "%{?dist}" == ".el5"
+Requires: python-hashlib
+%endif
 
 %description
-Mock takes a srpm and builds it in a chroot
+Mock takes an SRPM and builds it in a chroot
 
 %prep
 %setup -q
@@ -98,10 +101,16 @@ fi
 %attr(02775, root, mock) %dir /var/cache/mock
 
 %changelog
+* Fri Feb 19 2010 Clark Williams <williams at redhat.com>- 1.0.6-1
+- added code to check for SELinux being enabled or disabled
+  and avoid calling 'chcon' if disabled
+- add conditional Require of python-hashlib if building for
+  the EL5 distro
+
 * Wed Feb 17 2010 Clark Williams <williams at redhat.com>- 1.0.5-1
-  - from Jesse Keating <jkeating at redhat.com>:
-    - fixed 'useradd' option conflict with EPEL (-N vs -n)
-    - added Fedora 13 configs
+- from Jesse Keating <jkeating at redhat.com>:
+  - fixed 'useradd' option conflict with EPEL (-N vs -n)
+  - added Fedora 13 configs
 
 * Wed Feb 10 2010 Clark Williams <williams at redhat.com>- 1.0.4-1
 - added patch from Seth Vidal <skvidal at fedoraproject.org> to 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mock/F-12/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources	18 Feb 2010 19:03:51 -0000	1.62
+++ sources	20 Feb 2010 01:33:42 -0000	1.63
@@ -1 +1 @@
-4c869b46720bbfa8fb755d759371d103  mock-1.0.5.tar.gz
+47039cbd3aef6d3807d035a5f834edce  mock-1.0.6.tar.gz



More information about the scm-commits mailing list