Merge remote-tracking branch 'origin/master' into epel7

2 files changed, 24 insertions, 11 deletions

diff --git a/cgit.spec b/cgit.spec
index f162ad6..4642bb0 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -1,6 +1,6 @@
 # Review bug: https://bugzilla.redhat.com/479723
 
-%global gitver      2.0.1
+%global gitver      2.3.2
 %global cachedir    %{_localstatedir}/cache/%{name}
 %global filterdir   %{_libexecdir}/%{name}/filters
 %global scriptdir   %{_localstatedir}/www/cgi-bin
@@ -35,8 +35,8 @@ make V=1 %{?_smp_mflags} \\\
      prefix=%{_prefix}
 
 Name:           cgit
-Version:        0.10.2
-Release:        4%{?dist}
+Version:        0.11.2
+Release:        1%{?dist}
 Summary:        A fast web interface for git
 
 Group:          Development/Tools
@@ -68,6 +68,11 @@ BuildRequires:  openssl-devel
 BuildRequires:  lua-devel
 Requires:       webserver
 
+%if 0%{?fedora}
+# just to be able to install httpd configuration correctly, FC21+
+Requires:       httpd-filesystem
+%endif
+
 %description
 Cgit is a fast web interface for git.  It uses caching to increase performance.
 
@@ -80,7 +85,7 @@ Cgit is a fast web interface for git.  It uses caching to increase performance.
 # setup the git dir
 rm -rf git
 mv git-%{gitver} git
-sed -i 's/^\(CFLAGS = \).*/\1%{optflags}/' git/Makefile
+sed -i 's|^\(CFLAGS = \).*|\1%{optflags}|' git/Makefile
 
 # I tried to use matchpathcon, but we would need to require
 # selinux-policy-targeted probably.
@@ -141,10 +146,6 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README* *.html
 %config(noreplace) %{_sysconfdir}/cgitrc
-# Keep those two httpd-owned directories listed here until httpd-filesystem
-# becomes part of EPEL.  See rhbz#1138599 for more details.
-%dir %{_sysconfdir}/httpd
-%dir %{_sysconfdir}/httpd/conf.d
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/cgit.conf
 %dir %attr(-,apache,root) %{cachedir}
 %{cgitdata}
@@ -154,9 +155,21 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Mon Feb 09 2015 Pavel Raiskup <praiskup@redhat.com> - 0.10.2-4
+* Sat Mar 14 2015 Kevin Fenzi <kevin@scrye.com> 0.11.2-1
+- Update to 0.11.2
+
+* Tue Mar 10 2015 Kevin Fenzi <kevin@scrye.com> 0.11.1-1
+- Update to 0.11.1
+
+* Mon Feb 16 2015 Kevin Fenzi <kevin@scrye.com> 0.11.0-1
+- Update to 0.11.0
+
+* Mon Feb 09 2015 Pavel Raiskup <praiskup@redhat.com> - 0.10.2-5
 - require "any" 'webserver' instead of concrete 'httpd' (#1138599)
 
+* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Tue Jul 08 2014 Pavel Raiskup <praiskup@redhat.com> - 0.10.2-3
 - currently epel-7-ppc64 does not have highlight package (#1117261)
 
diff --git a/sources b/sources
index 6a3be2e..6d3dfcb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6682d597f6e3e76645a254c7be537bd3  cgit-0.10.2.tar.xz
-6d28a5d112379c20c7f7df9e0ffb070c  git-2.0.1.tar.xz
+dbafc4e19c715c5ee9ed0cd9d0fda9fa  cgit-0.11.2.tar.xz
+56701b3b1815c8bbfd7b43b4773adad7  git-2.3.2.tar.xz