- up to 0.10.2

[packages/cgit.git] / cgit.spec

diff --git a/cgit.spec b/cgit.spec
index 9a9f66b8aaf26fbb6c0cbf2163481dd6bfe51298..8ead37a5a2eb3573d03fcd583975e2985a598add 100644 (file)
--- a/cgit.spec
+++ b/cgit.spec
@@ -1,27 +1,23 @@
-#
-# Conditional build
-%bcond_with    verbose         # verbose build (V=1)
-#
 Summary:       cgit - a fast webinterface to git
 Summary(pl.UTF-8):     cgit - szybki interfejs WWW do gita
 Name:          cgit
-Version:       0.9.2
+Version:       0.10.2
 Release:       1
 License:       GPL v2
 Group:         Development/Tools
 Source0:       http://git.zx2c4.com/cgit/snapshot/%{name}-%{version}.tar.xz
-# Source0-md5: fe11018eff8d79caad112f4fac64b90f
+# Source0-md5: 6682d597f6e3e76645a254c7be537bd3
 Source1:       %{name}.conf
 Source2:       %{name}-repo.conf
 Source3:       %{name}-apache.conf
-Source4:       %{name}-httpd.conf
 Patch0:                %{name}-system-git.patch
+Patch1:                %{name}-git-2.0.3.patch
 URL:           http://git.zx2c4.com/cgit/about/
-BuildRequires: git-core-devel >= 1.8.3
+BuildRequires: git-core-devel >= 2.0.3
+BuildRequires: lua52-devel
 BuildRequires: openssl-devel
 BuildConflicts:        zlib-devel = 1.2.5-1
 Requires:      webapps
-Conflicts:     apache-base < 2.4.0-1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                webapp          cgit
@@ -48,6 +44,7 @@ HTML zapisany jest na dysku dla kolejnych żądań.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 cp  %{_includedir}/git-core/{Makefile,config.*} git
 
 %build
@@ -57,9 +54,9 @@ cp  %{_includedir}/git-core/{Makefile,config.*} git
        CFLAGS="%{rpmcflags} -I/usr/include/git-core" \
        LDFLAGS="%{rpmldflags}" \
        LIBDIR=%{_libdir} \
+       LUA_PKGCONFIG=lua5.2 \
        CGIT_CONFIG="%{webappdir}/%{webapp}.conf" \
-       CGIT_SCRIPT_PATH="%{cgibindir}" \
-       %{?with_verbose:V=1}
+       CGIT_SCRIPT_PATH="%{cgibindir}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -67,12 +64,13 @@ rm -rf $RPM_BUILD_ROOT
 # The same CFLAGS as in %build  stage has to be passed to avoid
 # "new build flags" logic in Makefile
 %{__make} install \
+       V=1 \
        DESTDIR=$RPM_BUILD_ROOT \
+       prefix=%{_prefix} \
        CFLAGS="%{rpmcflags} -I/usr/include/git-core" \
        CGIT_CONFIG="%{webappdir}/%{webapp}.conf" \
        CGIT_DATA_PATH="%{appdir}" \
-       CGIT_SCRIPT_PATH="%{cgibindir}" \
-       %{?with_verbose:V=1}
+       CGIT_SCRIPT_PATH="%{cgibindir}"
 
 # cache
 install -d $RPM_BUILD_ROOT/var/cache/cgit
@@ -82,7 +80,7 @@ install -d $RPM_BUILD_ROOT%{webappdir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{webappdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{webappdir}/apache.conf
-install %{SOURCE4} $RPM_BUILD_ROOT%{webappdir}/httpd.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{webappdir}/httpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,6 +112,17 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_prefix}/lib/cgit/filters
 %attr(755,root,root) %{_prefix}/lib/cgit/filters/about-formatting.sh
 %attr(755,root,root) %{_prefix}/lib/cgit/filters/commit-links.sh
-%attr(755,root,root) %{_prefix}/lib/cgit/filters//syntax-highlighting.py
+%attr(655,root,root) %{_prefix}/lib/cgit/filters/email-gravatar.lua
+%attr(755,root,root) %{_prefix}/lib/cgit/filters/email-gravatar.py
+%attr(655,root,root) %{_prefix}/lib/cgit/filters/email-libravatar.lua
+%attr(655,root,root) %{_prefix}/lib/cgit/filters/simple-authentication.lua
+%attr(755,root,root) %{_prefix}/lib/cgit/filters/syntax-highlighting.py
 %attr(755,root,root) %{_prefix}/lib/cgit/filters/syntax-highlighting.sh
-%{_prefix}/lib/cgit/filters/html-converters
+%dir %{_prefix}/lib/cgit/filters/html-converters
+%attr(755,root,root) %{_prefix}/lib/cgit/filters/html-converters/man2html
+%attr(755,root,root) %{_prefix}/lib/cgit/filters/html-converters/md2html
+%attr(755,root,root) %{_prefix}/lib/cgit/filters/html-converters/rst2html
+%attr(755,root,root) %{_prefix}/lib/cgit/filters/html-converters/txt2html
+%dir %{_prefix}/lib/cgit/filters/html-converters/resources
+%attr(755,root,root) %{_prefix}/lib/cgit/filters/html-converters/resources/markdown.pl
+%attr(655,root,root) %{_prefix}/lib/cgit/filters/html-converters/resources/rst-template.txt