dont include web content in RPM anymore

This commit is contained in:
Philippe M. Chiasson 2011-04-26 12:20:53 -04:00
Родитель 3cc6da6c28
Коммит 2db89ad4b6
2 изменённых файлов: 2 добавлений и 5 удалений

Просмотреть файл

@ -6,5 +6,4 @@ recursive-include linkdrop *
recursive-include grinder * recursive-include grinder *
recursive-include docs * recursive-include docs *
recursive-include tools * recursive-include tools *
recursive-include web *
recursive-include wsgi * recursive-include wsgi *

Просмотреть файл

@ -52,14 +52,11 @@ and love. F1 is made by Mozilla Messaging.
%build %build
export PYTHONPATH=$(pwd):%{f1_prefix}%{python_sitelib}:%{f1_prefix}%{python_sitearch} export PYTHONPATH=$(pwd):%{f1_prefix}%{python_sitelib}:%{f1_prefix}%{python_sitearch}
CFLAGS="%{optflags}" %{__python}%{pyver} setup.py build CFLAGS="%{optflags}" %{__python}%{pyver} setup.py build
make web PYTHON=%{__python}%{pyver}
%install %install
export PYTHONPATH=$(pwd):%{f1_prefix}%{python_sitelib}:%{f1_prefix}%{python_sitearch} export PYTHONPATH=$(pwd):%{f1_prefix}%{python_sitelib}:%{f1_prefix}%{python_sitearch}
rm -rf %{buildroot} rm -rf %{buildroot}
%{__python}%{pyver} setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --prefix %{f1_prefix} --record=INSTALLED_FILES %{__python}%{pyver} setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --prefix %{f1_prefix} --record=INSTALLED_FILES
%{__install} -m 755 -d %{buildroot}%{_var}/www/f1
rsync -a web/ %{buildroot}%{_var}/www/f1/
%{__install} -m 755 -d %{buildroot}%{_sysconfdir}/f1 %{__install} -m 755 -d %{buildroot}%{_sysconfdir}/f1
%{__install} -m 644 *.ini %{buildroot}%{_sysconfdir}/f1/ %{__install} -m 644 *.ini %{buildroot}%{_sysconfdir}/f1/
@ -73,12 +70,13 @@ rsync -a web/ %{buildroot}%{_var}/www/f1/
rm -rf %{buildroot} rm -rf %{buildroot}
%files -f INSTALLED_FILES %files -f INSTALLED_FILES
%{_var}/www/f1
%config(noreplace) %{_sysconfdir}/f1/*ini %config(noreplace) %{_sysconfdir}/f1/*ini
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc README.md LICENSE PKG-INFO docs/ %doc README.md LICENSE PKG-INFO docs/
%changelog %changelog
* Tue Apr 26 2011 Philippe M. Chiasson <gozer@mozillamessaging.com> - 0.3.7dev-7
- Remove web content, moved to mozilla-f1-web
* Wed Apr 20 2011 Philippe M. Chiasson <gozer@mozillamessaging.com> - 0.3.7dev-6 * Wed Apr 20 2011 Philippe M. Chiasson <gozer@mozillamessaging.com> - 0.3.7dev-6
- Compile web content before packaging (make web) - Compile web content before packaging (make web)
* Thu Apr 14 2011 Philippe M. Chiasson <gozer@mozillamessaging.com> - 0.3.7dev-2 * Thu Apr 14 2011 Philippe M. Chiasson <gozer@mozillamessaging.com> - 0.3.7dev-2