commit 6a22b1f633815e52bce9752cb9751fca3dfcda57
Author: Elan Ruusamäe <[email protected]>
Date: Sun Aug 12 22:05:33 2012 +0300
up to 1.0beta1
silvercity-javascript-mimetypes.patch | 22 ++++++++++++++++++--
trac.spec | 39 ++++++++++++++++++-----------------
2 files changed, 40 insertions(+), 21 deletions(-)
---
diff --git a/silvercity-javascript-mimetypes.patch
b/silvercity-javascript-mimetypes.patch
index 5cace5a..2887565 100644
--- a/silvercity-javascript-mimetypes.patch
+++ b/silvercity-javascript-mimetypes.patch
@@ -1,5 +1,5 @@
---- Trac-0.12.2/./trac/mimeview/silvercity.py~ 2011-09-16 15:23:29.000000000
+0300
-+++ Trac-0.12.2/./trac/mimeview/silvercity.py 2011-09-16 15:23:37.366808607
+0300
+--- Trac-1.0beta1/tracopt/mimeview/silvercity.py~ 2012-08-06
23:44:52.000000000 +0300
++++ Trac-1.0beta1/tracopt/mimeview/silvercity.py 2012-08-12
21:56:43.786696547 +0300
@@ -48,6 +48,7 @@
'application/x-yaml': ('YAML', 3),
'text/x-yaml': ('YAML', 3),
@@ -16,3 +16,21 @@
'text/x-psp': ('HyperText', 3, {'asp.default.language': 3}),
'text/x-python': ('Python', 3),
'text/x-ruby': ('Ruby', 3),
+--- Trac-1.0beta1/tracopt/mimeview/enscript.py~ 2012-08-06
23:44:52.000000000 +0300
++++ Trac-1.0beta1/tracopt/mimeview/enscript.py 2012-08-12 21:57:48.773049013
+0300
+@@ -30,6 +30,7 @@
+ 'application/postscript': ('postscript', 2),
+ 'application/x-csh': ('csh', 2),
+ 'application/x-javascript': ('javascript', 2),
++ 'application/javascript': ('javascript', 2),
+ 'application/x-troff': ('nroff', 2),
+ 'text/html': ('html', 2),
+ 'text/x-ada': ('ada', 2),
+@@ -49,6 +50,7 @@
+ 'text/x-inf': ('inf', 2),
+ 'text/x-java': ('java', 2),
+ 'text/x-javascript': ('javascript', 2),
++ 'text/javascript': ('javascript', 2),
+ 'text/x-ksh': ('ksh', 2),
+ 'text/x-lua': ('lua', 2),
+ 'text/x-m4': ('m4', 2),
diff --git a/trac.spec b/trac.spec
index 47a13a5..2a16cab 100644
--- a/trac.spec
+++ b/trac.spec
@@ -1,15 +1,17 @@
# TODO
# - localization fix in files
# - 21:07:41 jtiai> set htdocs_location in trac ini to for example
/trac-htdocs/
+%define subver beta1
+%define rel 0.1
Summary: Integrated SCM, Wiki, Issue tracker and project environment
Summary(pl.UTF-8): Zintegrowane scm, wiki, system śledzenia problemów i
środowisko projektowe
Name: trac
-Version: 0.12.3
-Release: 1
+Version: 1.0
+Release: 0.%{subver}.%{rel}
License: BSD-like
Group: Applications/WWW
-Source0: http://ftp.edgewall.com/pub/trac/Trac-%{version}.tar.gz
-# Source0-md5: 0cef201e223fafb5c3dd99577403f572
+Source0:
http://download.edgewall.org/trac/Trac-%{version}%{subver}.tar.gz
+# Source0-md5: 09b5ca691bd2c78ac934271751ab224f
Source1: %{name}-apache.conf
Source2: %{name}-lighttpd.conf
Source3: %{name}.ico
@@ -21,17 +23,17 @@ Patch1: %{name}-defaults.patch
Patch2: inherit-global-%{name}.ini.patch
Patch3: silvercity-javascript-mimetypes.patch
URL: http://trac.edgewall.org/
-BuildRequires: python >= 1:2.1
-BuildRequires: python-babel >= 0.9.5
+BuildRequires: python >= 1:2.5
+BuildRequires: python-babel >= 0.9.6
BuildRequires: python-devel >= 1:2.1
BuildRequires: python-distribute
-BuildRequires: python-genshi
+BuildRequires: python-genshi >= 0.6
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: sed >= 4.0
#Requires: apache(mod_env) || lighttpd-mod_fastcgi
Requires: group(http)
-Requires: jquery
+Requires: jquery >= 1.4
Requires: python-clearsilver >= 0.9.3
Requires: python-trac = %{version}-%{release}
Requires: webapps
@@ -86,14 +88,14 @@ Conflicts: trac < 0.11.7-3
Trac Python modules.
%prep
-%setup -q -n Trac-%{version}
+%setup -q -n Trac-%{version}%{?subver}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
# using system jquery package
-rm trac/htdocs/js/jquery.js
+%{__rm} trac/htdocs/js/jquery.js
%build
%{__python} setup.py build
@@ -101,15 +103,14 @@ rm trac/htdocs/js/jquery.js
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},/var/lib/%{name},%{_datadir}/%{name}/{plugins,templates}}
-
%{__python} setup.py install \
--skip-build \
--optimize=2 \
--root=$RPM_BUILD_ROOT
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
# utility script to enable extra plugins
install -p %{SOURCE5} $RPM_BUILD_ROOT%{_sbindir}/%{name}-enableplugin
@@ -123,10 +124,10 @@ mv
$RPM_BUILD_ROOT{%{py_sitescriptdir}/trac,%{_appdir}}/htdocs
rm $RPM_BUILD_ROOT%{_appdir}/htdocs/README
-install -p cgi-bin/trac.* $RPM_BUILD_ROOT%{_appdir}/cgi-bin
+install -p contrib/cgi-bin/trac.* $RPM_BUILD_ROOT%{_appdir}/cgi-bin
-cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/trac.ini
-cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_appdir}/htdocs/%{name}.ico
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/trac.ini
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_appdir}/htdocs/%{name}.ico
> $RPM_BUILD_ROOT%{_sysconfdir}/htpasswd
# remove .py files, leave just compiled ones.
@@ -143,9 +144,9 @@ for a in $RPM_BUILD_ROOT%{_appdir}/htdocs/js/messages/*.js;
do
echo "%lang($l) ${a#$RPM_BUILD_ROOT}"
done >> %{name}.lang
-# TODO: move to /usr/share/locale as trac.mo catalog
+# TODO: move to %{_localedir} as trac.mo catalog
echo "%dir %{py_sitescriptdir}/trac/locale" >> %{name}.lang
-for a in $RPM_BUILD_ROOT%{py_sitescriptdir}/trac/locale/*/LC_MESSAGES/*.mo; do
+for a in $RPM_BUILD_ROOT%{py_sitescriptdir}/trac/locale/*/LC_MESSAGES; do
d=${a%%/LC_MESSAGES*}
l=${d##*/}
echo "%lang($l) ${d#$RPM_BUILD_ROOT}"
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
