Author: baggins Date: Fri Mar 12 21:08:50 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- fixed CSV files
- replaced bundled pdf generator with something that groks utf
http://github.com/edwinmoss/rfpdf/
http://www.redmine.org/issues/61
- added missing dir
---- Files affected:
packages/redmine:
redmine.spec (1.23 -> 1.24)
---- Diffs:
================================================================
Index: packages/redmine/redmine.spec
diff -u packages/redmine/redmine.spec:1.23 packages/redmine/redmine.spec:1.24
--- packages/redmine/redmine.spec:1.23 Thu Mar 11 23:23:20 2010
+++ packages/redmine/redmine.spec Fri Mar 12 22:08:45 2010
@@ -12,16 +12,20 @@
Group: Applications/WWW
Source0:
http://rubyforge.org/frs/download.php/69449/%{name}-%{version}.tar.gz
# Source0-md5: 5a95eec4d26ec3819ffeff42137d5023
-Source1: %{name}.conf
+Source1: %{name}-rfpdf.tar.bz2
+# Source1-md5: 83da153b550237f47a3a3c1c2acaac20
+Source2: %{name}.conf
# Shove UTF-8 down rails throat, needed for rails < 3
-Source2: %{name}-fix_params.rb
-Source3: %{name}-fix_renderable.rb
-Source4: %{name}-fix_utf.rb
+Source3: %{name}-fix_params.rb
+Source4: %{name}-fix_renderable.rb
+Source5: %{name}-fix_utf.rb
Patch0: %{name}-pld.patch
Patch1: %{name}-ldap.patch
Patch2: %{name}-utf-regex.patch
Patch3: %{name}-nogems.patch
Patch4: %{name}-maildomain.patch
+Patch5: %{name}-csv-utf.patch
+Patch6: %{name}-rfpdf.patch
URL: http://www.redmine.org/
BuildRequires: dos2unix
BuildRequires: rpmbuild(macros) >= 1.202
@@ -111,6 +115,10 @@
rm -r vendor/plugins/coderay*
rm -r vendor/rails
+# Replace rfpdf plugin with something that groks UTF
+rm -r vendor/plugins/rfpdf
+%{__tar} xf %{SOURCE1} -C vendor/plugins/
+
find \( -name '*.rb' -o -name '*.rake' \) -print0 | xargs -0 dos2unix -k -q
%patch0 -p1
@@ -118,6 +126,8 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
find -type f -print0 | \
xargs -0 %{__sed} -i -e 's,/usr/bin/env ruby,%{__ruby},' \
@@ -150,9 +160,9 @@
grep "^#" config/email.yml.example
>$RPM_BUILD_ROOT%{_sysconfdir}/config/email.yml
ln -s %{_sysconfdir}/config $RPM_BUILD_ROOT%{_datadir}/%{name}
-install %{SOURCE2}
$RPM_BUILD_ROOT%{_sysconfdir}/config/initializers/fix_params.rb
-install %{SOURCE3}
$RPM_BUILD_ROOT%{_sysconfdir}/config/initializers/fix_renderable.rb
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/config/initializers/fix_utf.rb
+install %{SOURCE3}
$RPM_BUILD_ROOT%{_sysconfdir}/config/initializers/fix_params.rb
+install %{SOURCE4}
$RPM_BUILD_ROOT%{_sysconfdir}/config/initializers/fix_renderable.rb
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/config/initializers/fix_utf.rb
cp -a db $RPM_BUILD_ROOT/var/lib/%{name}
ln -s /var/lib/%{name}/db $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -161,7 +171,7 @@
ln -s /var/lib/%{name}/tmp $RPM_BUILD_ROOT%{_datadir}/%{name}
ln -s /var/lib/%{name}/plugin_assets $RPM_BUILD_ROOT%{_datadir}/%{name}/public
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
rm $RPM_BUILD_ROOT%{_sysconfdir}/config/*.example
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/public/*.example
@@ -189,6 +199,7 @@
%defattr(644,root,root,755)
%doc README.rdoc doc/* public/dispatch.*.example config/*.example
%doc extra/sample_plugin
+%dir %attr(750,root,http) %{_sysconfdir}
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/httpd.conf
%dir %attr(755,redmine,root) %{_sysconfdir}/config
%attr(644,redmine,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/config/*.rb
@@ -260,6 +271,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.24 2010/03/12 21:08:45 baggins
+- fixed CSV files
+- replaced bundled pdf generator with something that groks utf
+ http://github.com/edwinmoss/rfpdf/
+ http://www.redmine.org/issues/61
+- added missing dir
+
Revision 1.23 2010/03/11 22:23:20 baggins
- rel 1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redmine/redmine.spec?r1=1.23&r2=1.24&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
