1.1 --- a/mercurial/mercurial.spec Tue Aug 28 18:52:25 2012 +0200 1.2 +++ b/mercurial/mercurial.spec Wed Feb 08 20:15:40 2012 +0200 1.3 @@ -31,17 +31,21 @@ 1.4 Class: EVAL 1.5 Group: SCM 1.6 License: GPL 1.7 -Version: 1.6.2 1.8 -Release: 20101018 1.9 +Version: 2.1 1.10 +Release: 20120208 1.11 1.12 # list of sources 1.13 Source0: http://mercurial.selenic.com/release/mercurial-%{version}.tar.gz 1.14 +Source1: hgweb.cgi 1.15 +Source2: hgweb.cfg 1.16 1.17 # build information 1.18 Prefix: %{l_prefix} 1.19 BuildRoot: %{l_buildroot} 1.20 -BuildPreReq: OpenPKG, openpkg >= 20100101, python, python::with_bzip2 = yes 1.21 -PreReq: OpenPKG, openpkg >= 20100101, python, python::with_bzip2 = yes 1.22 +BuildPreReq: OpenPKG, openpkg >= 20060823, python, python::with_bzip2 = yes 1.23 +PreReq: OpenPKG, openpkg >= 20060823, python, python::with_bzip2 = yes 1.24 +AutoReq: no 1.25 +AutoReqProv: no 1.26 1.27 %description 1.28 Mercurial is a fast, lightweight Source Control Management (SCM) 1.29 @@ -52,7 +56,7 @@ 1.30 prog mercurial = { 1.31 version = %{version} 1.32 url = http://mercurial.selenic.com/release/ 1.33 - regex = mercurial-(__VER__)\.tar\.gz 1.34 + regex = mercurial-(\d+\.\d+(\.\d+)?)\.tar\.gz 1.35 } 1.36 1.37 %prep 1.38 @@ -69,7 +73,9 @@ 1.39 %install 1.40 rm -rf $RPM_BUILD_ROOT 1.41 %{l_shtool} mkdir -f -p -m 755 \ 1.42 + $RPM_BUILD_ROOT%{l_prefix}/cgi \ 1.43 $RPM_BUILD_ROOT%{l_prefix}/bin \ 1.44 + $RPM_BUILD_ROOT%{l_prefix}/etc/mercurial \ 1.45 $RPM_BUILD_ROOT%{l_prefix}/libexec/mercurial \ 1.46 $RPM_BUILD_ROOT%{l_prefix}/lib/mercurial \ 1.47 $RPM_BUILD_ROOT%{l_prefix}/man/man1 \ 1.48 @@ -89,11 +95,17 @@ 1.49 echo "%{l_prefix}/bin/python %{l_prefix}/libexec/mercurial/hg \${1+\"\$@\"}" 1.50 ) >$RPM_BUILD_ROOT%{l_prefix}/bin/hg 1.51 chmod 755 $RPM_BUILD_ROOT%{l_prefix}/bin/hg 1.52 + %{l_shtool} install -c -m 755 %{l_value -s -a} \ 1.53 + %{SOURCE hgweb.cgi} $RPM_BUILD_ROOT%{l_prefix}/cgi/ 1.54 + %{l_shtool} install -c -m 644 %{l_value -s -a} \ 1.55 + %{SOURCE hgweb.cfg} $RPM_BUILD_ROOT%{l_prefix}/etc/mercurial/ 1.56 %{l_shtool} install -c -m 644 \ 1.57 - doc/*.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/ 1.58 + doc/*.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/ 1.59 %{l_shtool} install -c -m 644 \ 1.60 - doc/*.5 $RPM_BUILD_ROOT%{l_prefix}/man/man5/ 1.61 - %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} 1.62 + doc/*.5 $RPM_BUILD_ROOT%{l_prefix}/man/man5/ 1.63 + %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ 1.64 + %{l_files_std} \ 1.65 + '%config %{l_prefix}/etc/mercurial/*' 1.66 1.67 %files -f files 1.68