[viewmtn] - Update to latest head, to support monotone >= 0.46. - Minor specfile updates.
Thomas Moschny
thm at fedoraproject.org
Fri Aug 6 01:48:11 UTC 2010
commit 7c9efefbcc1f31d6f7ccf1e936de4ab787d8e6f3
Author: Thomas Moschny <thm at fedoraproject.org>
Date: Fri Aug 6 03:45:25 2010 +0200
- Update to latest head, to support monotone >= 0.46.
- Minor specfile updates.
.gitignore | 1 +
sources | 2 +-
viewmtn.spec | 120 ++++++++++++++++++++++++++++++++++------------------------
3 files changed, 72 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 68b5aa7..c48e25c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
viewmtn-0.10.tgz
+viewmtn-0030ad67.tar.bz2
diff --git a/sources b/sources
index badfb30..12f600a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1758f8b6340cca7d191b21fc25daf283 viewmtn-0.10.tgz
+2589cdb7a7e3630a3022f1d3c01ca019 viewmtn-0030ad67.tar.bz2
diff --git a/viewmtn.spec b/viewmtn.spec
index 0deed93..b93b0da 100644
--- a/viewmtn.spec
+++ b/viewmtn.spec
@@ -1,35 +1,45 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+%global mtn_snapshot 1
+%global mtn_rev 0030ad67c4daf3d38193f558c48474ddbcf19d1a
+%global mtn_date 20100308
+
+%if 0%{?mtn_snapshot}
+%global mtn_short %(echo %{mtn_rev} | cut -c-8)
+%endif
Name: viewmtn
Version: 0.10
-Release: 5%{?dist}
-
+Release: 6%{?mtn_short:.%{mtn_date}mtn%{mtn_short}}%{?dist}
Summary: Web interface for Monotone version control system
Group: Development/Tools
License: GPLv2+
-
-URL: http://grahame.angrygoats.net/moinmoin/ViewMTN
-Source0: http://grahame.angrygoats.net/source/%{name}/%{name}-%{version}.tgz
-
+URL: http://viewmtn.1erlei.de/
+%if 0%{?mtn_snapshot}
+# wget http://mtn-view.1erlei.de/revision/tar/%%{mtn_rev} -O- |
+# bzip2 -c > %%{name}-%%{mtn_short}.tar.bz2
+Source0: %{name}-%{mtn_short}.tar.bz2
+%else
+Source0: http://viewmtn.1erlei.de/downloads/%{name}-%{version}.tgz
+%endif
Source1: viewmtn.conf.httpd
Source2: viewmtn.conf.py
-
BuildArch: noarch
BuildRequires: python-devel
Requires: python-cheetah
Requires(pre): httpd
-Requires: monotone >= 0.35
+Requires: monotone >= 0.46
Requires: mod_wsgi
Requires: gnome-icon-theme
Requires: shared-mime-info
Requires: highlight
Requires: graphviz
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%define mydata %{_datadir}/viewmtn
-%define mypy %{python_sitelib}/viewmtn
-%define mygraph %{_localstatedir}/cache/viewmtn-graph
+%global mydata %{_datadir}/viewmtn
+%global mypy %{python_sitelib}/viewmtn
+%global mygraph %{_localstatedir}/cache/viewmtn-graph
+
%description
ViewMTN is a web interface to the Monotone distributed version
@@ -37,8 +47,13 @@ control system. It aims to provide a convenient and useful web
interface to Monotone. If you've used interfaces to other version
control systems, ViewMTN will be immediately familiar.
+
%prep
+%if 0%{?mtn_snapshot}
+%setup -q -n %{mtn_rev}
+%else
%setup -q
+%endif
cat > __init__.py <<\EOF
from viewmtn import assemble_urls, web
@@ -46,60 +61,61 @@ urls, fvars = assemble_urls()
application = web.wsgifunc(web.webpyfunc(urls, fvars))
EOF
+
%build
-%{__sed} -e s,__datadir__,%{_datadir}, \
- -e s,__python_sitelib__,%{python_sitelib}, %{SOURCE1} > viewmtn.conf
-%{__sed} -e s,__datadir__,%{_datadir}, \
- -e s,__python_sitelib__,%{python_sitelib}, %{SOURCE2} > viewmtn.conf.py
-%{__sed} -e s,/usr/bin,%{_bindir},g \
- -e '/^dbfile/s,= .*$,'"= '%{mydb}',"\
- -e '/^dynamic_uri_path/s,= .*$,'"= '/viewmtn/'," \
- -e '/^static_uri_path/s,= .*$,'"= '/viewmtn-static/'," \
- -e '/^templates_directory/s,= .*$,'"= '%{mydata}/templates/'," \
- -e '/viewmtn-graph/s|: .*$|'": '%{mygraph}/',|" \
- -e '/^running_under_apache2/s/$/ # not relevant to mod_wsgi setup/' \
- config.py.example > config.py
+sed -e s,__datadir__,%{_datadir}, \
+ -e s,__python_sitelib__,%{python_sitelib}, %{SOURCE1} > viewmtn.conf
+sed -e s,__datadir__,%{_datadir}, \
+ -e s,__python_sitelib__,%{python_sitelib}, %{SOURCE2} > viewmtn.conf.py
+sed -e s,/usr/bin,%{_bindir},g \
+ -e '/^dbfile/s,= .*$,'"= '%{mydb}',"\
+ -e '/^dynamic_uri_path/s,= .*$,'"= '/viewmtn/'," \
+ -e '/^static_uri_path/s,= .*$,'"= '/viewmtn-static/'," \
+ -e '/^templates_directory/s,= .*$,'"= '%{mydata}/templates/'," \
+ -e '/viewmtn-graph/s|: .*$|'": '%{mygraph}/',|" \
+ -e '/^running_under_apache2/s/$/ # not relevant to mod_wsgi setup/' \
+ config.py.example > config.py
cat >> config.py <<\EOF
-# Get the local configuration linked from %{_sysconfdir}/.
+# Get the local configuration linked from %%{_sysconfdir}/.
from user_config import *
EOF
%install
-rm -rf $RPM_BUILD_ROOT
-%{__install} -d -m 755 $RPM_BUILD_ROOT%{mypy}/fdo
-%{__install} -d -m 755 $RPM_BUILD_ROOT%{mypy}/web
-%{__install} -d -m 755 $RPM_BUILD_ROOT%{mydata}/templates
-%{__install} -d -m 755 $RPM_BUILD_ROOT%{mydata}/MochiKit
-%{__install} -d -m 755 $RPM_BUILD_ROOT%{mygraph}
-%{__install} -Dp -m 0644 viewmtn.conf \
- $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/viewmtn.conf
-%{__install} -Dp -m 644 -t $RPM_BUILD_ROOT%{mypy} *.py
-%{__install} -Dp -m 644 -t $RPM_BUILD_ROOT%{mypy}/fdo fdo/*.py
-%{__install} -Dp -m 644 -t $RPM_BUILD_ROOT%{mypy}/web web/*.py
-%{__install} -Dp -m 644 -t $RPM_BUILD_ROOT%{mydata}/templates templates/*.html
-%{__install} -Dp -m 644 -t $RPM_BUILD_ROOT%{mydata} \
- static/*.gif static/*.css static/*.js
-%{__install} -Dp -m 644 -t $RPM_BUILD_ROOT%{mydata}/MochiKit \
- static/MochiKit/*.js
-
-%{__install} -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-%{__install} -Dp -m 0644 viewmtn.conf.py \
- $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.py
+rm -rf %{buildroot}
+install -d -m 755 %{buildroot}%{mypy}/fdo
+install -d -m 755 %{buildroot}%{mypy}/web
+install -d -m 755 %{buildroot}%{mydata}/templates
+install -d -m 755 %{buildroot}%{mydata}/MochiKit
+install -d -m 755 %{buildroot}%{mygraph}
+install -Dp -m 0644 viewmtn.conf \
+ %{buildroot}/%{_sysconfdir}/httpd/conf.d/viewmtn.conf
+install -Dp -m 644 -t %{buildroot}%{mypy} *.py
+install -Dp -m 644 -t %{buildroot}%{mypy}/fdo fdo/*.py
+install -Dp -m 644 -t %{buildroot}%{mypy}/web web/*.py
+install -Dp -m 644 -t %{buildroot}%{mydata}/templates templates/*.html
+install -Dp -m 644 -t %{buildroot}%{mydata} \
+ static/*.gif static/*.css static/*.js
+install -Dp -m 644 -t %{buildroot}%{mydata}/MochiKit \
+ static/MochiKit/*.js
+
+install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
+install -Dp -m 0644 viewmtn.conf.py \
+ %{buildroot}%{_sysconfdir}/%{name}/conf.py
mypy_rel=`echo %{mypy} | sed 's,/[^/]*,../,g;s,/$,,'`
-%{__ln_s} -nf $mypy_rel%{_sysconfdir}/%{name}/conf.py \
- $RPM_BUILD_ROOT%{mypy}/user_config.py
+ln -snf $mypy_rel%{_sysconfdir}/%{name}/conf.py \
+ %{buildroot}%{mypy}/user_config.py
# Pacify overeager rpmlint #! checks.
-find $RPM_BUILD_ROOT%{mypy} -type f -name '*.py' -print0 |
+find %{buildroot}%{mypy} -type f -name '*.py' -print0 |
xargs -0 sed -i '1{/^#!/d;}'
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
@@ -114,6 +130,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Aug 6 2010 Thomas Moschny <thomas.moschny at gmx.de> - 0.10-6.20100308mtn0030ad67
+- Update to latest head, to support monotone >= 0.46.
+- Minor specfile updates.
+
* Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 0.10-5
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
More information about the scm-commits
mailing list