test: t4102-apply-rename fails with strict umask.

diff --git a/git-core.spec.in b/git-core.spec.in
index e8cc6afe5342d2a24c3767fc243865abbb22bc8a..5240dd2c296482a7ae5486e7688ef8ca944197e0 100644 (file)
--- a/git-core.spec.in
+++ b/git-core.spec.in
@@ -9,7 +9,7 @@ URL:            http://kernel.org/pub/software/scm/git/
 Source:        http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
 BuildRequires: zlib-devel, openssl-devel, curl-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:      rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk >= 8.4
+Requires:      zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk >= 8.4
 
 %description
 This is a stupid (but extremely fast) directory content manager.  It
@@ -23,7 +23,7 @@ elsewhere for tools for ordinary humans layered on top of this.
 %setup -q
 
 %build
-make %{_smp_mflags} COPTS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \
+make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \
      prefix=%{_prefix} all %{!?_without_docs: doc}
 
 %install
@@ -47,6 +47,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Sep 27 2005 H. Peter Anvin <hpa@zytor.com>
 - parallelize build
+- COPTS -> CFLAGS
 
 * Fri Sep 16 2005 Chris Wright <chrisw@osdl.org> 0.99.6-1
 - update to 0.99.6