File project.diff of Package git

--- git.spec.orig
+++ git.spec
@@ -186,7 +186,7 @@ Requires:       perl-Git = %{version}
 Requires:       perl-Term-ReadKey
 Requires:       subversion
 Requires:       subversion-perl
-Supplements:    (%{name} and subversion)
+Supplements:    packageand(%{name}:subversion)
 
 %description svn
 Tools for importing Subversion repositories to the Git version control
@@ -200,7 +200,7 @@ Requires:       cvsps
 Requires:       git-core = %{version}
 Requires:       perl-DBD-SQLite
 Requires:       perl-Git = %{version}
-Supplements:    (%{name} and cvs)
+Supplements:    packageand(%{name}:cvs)
 
 %description cvs
 Tools for importing CVS repositories to the Git version control system.
@@ -275,9 +275,9 @@ Group:          Development/Tools/Versio
 Requires:       git-core = %{version}
 Requires:       tk >= 8.4
 %if 0%{?suse_version} == 1315
-Supplements:    (git-core and tk)
+Supplements:    packageand(git-core:tk)
 %else
-Supplements:    (git-core and tk)
+Supplements:    packageand(git-core:tk)
 %endif
 
 %description -n gitk
@@ -294,9 +294,9 @@ Group:          Development/Tools/Versio
 Requires:       git-core = %{version}
 Requires:       tk >= 8.4
 %if 0%{?suse_version} == 1315
-Supplements:    (git-core and tk)
+Supplements:    packageand(git-core:tk)
 %else
-Supplements:    (git-core and tk)
+Supplements:    packageand(git-core:tk)
 %endif
 
 %description gui
@@ -316,9 +316,9 @@ Requires:       git-core = %{version}
 Requires:       perl-CGI
 Requires:       perl-Git = %{version}
 %if 0%{?suse_version} == 1315
-Supplements:    (git-core and apache2)
+Supplements:    packageand(git-core:apache2)
 %else
-Supplements:    (git-core and apache2)
+Supplements:    packageand(git-core:apache2)
 %endif
 
 %description web
@@ -335,7 +335,12 @@ directory /git/ that calls the cgi scrip
 sed -e '1{s,.*,#!%{_bindir}/python3,}' git-p4.py
 cat > .make <<'EOF'
 #!/bin/bash
-%make_build CFLAGS="%{optflags}" \
+%make_build \
+%if 0%{?suse_version} && 0%{?suse_version} < 1500
+       CFLAGS="%{optflags} -std=gnu99" \
+%else
+       CFLAGS="%{optflags}" \
+%endif
        GITWEB_CONFIG="%{_sysconfdir}/gitweb.conf" \
        GITWEB_PROJECTROOT="/srv/git" \
        WITH_OWN_SUBPROCESS_PY=YesPlease \