Author: baggins                      Date: Mon Mar  8 23:18:01 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- hack/workaround for UTF-8 brokeness in rails 2.3 on ruby 1.9

---- Files affected:
packages/redmine:
   redmine.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: packages/redmine/redmine.spec
diff -u packages/redmine/redmine.spec:1.18 packages/redmine/redmine.spec:1.19
--- packages/redmine/redmine.spec:1.18  Sun Mar  7 23:32:06 2010
+++ packages/redmine/redmine.spec       Tue Mar  9 00:17:55 2010
@@ -13,8 +13,12 @@
 Source0:       
http://rubyforge.org/frs/download.php/69449/%{name}-%{version}.tar.gz
 # Source0-md5: 5a95eec4d26ec3819ffeff42137d5023
 Source1:       %{name}.conf
+# Shove UTF-8 down rails throat, needed for rails < 3
+Source2:       %{name}-fix_params.rb
+Source3:       %{name}-fix_renderable.rb
 Patch0:                %{name}-pld.patch
 Patch1:                %{name}-ldap.patch
+Patch2:                %{name}-utf-regex.patch
 URL:           http://www.redmine.org/
 BuildRequires: dos2unix
 BuildRequires: rpmbuild(macros) >= 1.202
@@ -39,6 +43,8 @@
 Suggests:      ruby-ldap
 Suggests:      ruby-openid >= 2.1.4
 Suggests:      subversion >= 1.3
+# Does not work AT ALL with rails 3 currently
+Conflicts:     ruby-rails >= 3.0
 Provides:      user(redmine)
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -106,6 +112,7 @@
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 find -type f -print0 | \
        xargs -0 %{__sed} -i -e 's,/usr/bin/env ruby,%{__ruby},' \
@@ -138,6 +145,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}/initializers/fix_params.rb
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/initializers/fix_renderable.rb
+
 cp -a db $RPM_BUILD_ROOT/var/lib/%{name}
 ln -s /var/lib/%{name}/db $RPM_BUILD_ROOT%{_datadir}/%{name}
 ln -s /var/lib/%{name}/files $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -247,6 +257,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2010/03/08 23:17:55  baggins
+- hack/workaround for UTF-8 brokeness in rails 2.3 on ruby 1.9
+
 Revision 1.18  2010/03/07 22:32:06  baggins
 - replace ruby-net-ldap with ruby-ldap (net-ldap is quite dead
   and incompatible with ruby 1.9)
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redmine/redmine.spec?r1=1.18&r2=1.19&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to