packages: redmine/redmine.spec, redmine/redmine-rfpdf.patch (REMOVED) - sta...

[baggins]

Author: baggins                      Date: Fri Jul  8 10:12:25 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- started update to 1.2.0
- bundled rfpdf is ok now
- use __rm macro

---- Files affected:
packages/redmine:
   redmine.spec (1.42 -> 1.43) , redmine-rfpdf.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/redmine/redmine.spec
diff -u packages/redmine/redmine.spec:1.42 packages/redmine/redmine.spec:1.43
--- packages/redmine/redmine.spec:1.42	Wed Jun 22 13:02:16 2011
+++ packages/redmine/redmine.spec	Fri Jul  8 12:12:20 2011
@@ -6,14 +6,12 @@
 %include	/usr/lib/rpm/macros.perl
 Summary:	Flexible project management web application
 Name:		redmine
-Version:	1.0.4
-Release:	2
+Version:	1.2.0
+Release:	0.1
 License:	GPL v2
 Group:		Applications/WWW
-Source0:	http://rubyforge.org/frs/download.php/73457/%{name}-%{version}.tar.gz
-# Source0-md5:	a30a5fc39b1a07dfe6751666417d6538
-Source1:	%{name}-rfpdf.tar.bz2
-# Source1-md5:	83da153b550237f47a3a3c1c2acaac20
+Source0:	http://rubyforge.org/frs/download.php/74944/%{name}-%{version}.tar.gz
+# Source0-md5:	9d9809a6137c75f754a7fb6c0acc1d6c
 Source2:	%{name}.conf
 # Shove UTF-8 down rails throat, needed for rails < 3
 Source3:	%{name}-fix_params.rb
@@ -25,7 +23,6 @@
 Patch3:		%{name}-nogems.patch
 Patch4:		%{name}-maildomain.patch
 Patch5:		%{name}-csv-utf.patch
-Patch6:		%{name}-rfpdf.patch
 Patch7:		%{name}-mercurial.patch
 Patch8:		%{name}-gantt.patch
 Patch9:		%{name}-git-parse.patch
@@ -41,7 +38,7 @@
 Requires:	ruby-RMagick
 Requires:	ruby-SyslogLogger
 Requires:	ruby-coderay
-Requires:	ruby-rails2 >= 2.3.5
+Requires:	ruby-rails2 = 2.3.11
 Requires:	ruby-rake
 Requires:	ruby-rubytree
 Requires:	webapps
@@ -114,14 +111,10 @@
 %prep
 %setup -q
 
-rm -r vendor/gems
-rm -r vendor/plugins/ruby-net-ldap*
-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/
+%{__rm} -r vendor/gems
+%{__rm} -r vendor/plugins/ruby-net-ldap*
+%{__rm} -r vendor/plugins/coderay*
+%{__rm} -r vendor/rails
 
 find \( -name '*.rb' -o -name '*.rake' \) -print0 | xargs -0 dos2unix -k -q
 
@@ -131,7 +124,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
@@ -183,8 +175,8 @@
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
-rm $RPM_BUILD_ROOT%{_sysconfdir}/config/*.example
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/public/*.example
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/config/*.example
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/public/*.example
 
 %{__sed} -i -e 's,^RAILS_ROOT = .*,RAILS_ROOT = "%{_datadir}/%{name}",' $RPM_BUILD_ROOT%{_sysconfdir}/config/boot.rb
 
@@ -290,6 +282,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2011/07/08 10:12:20  baggins
+- started update to 1.2.0
+- bundled rfpdf is ok now
+- use __rm macro
+
 Revision 1.42  2011/06/22 11:02:16  baggins
 - R old rails
 
================================================================

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