Merge pull request #379 from einhverfr/1.4

RPM build fixes, now uses built-in dojo and rpm properly builds.
ledgersmb · Sep 28, 2014 · 499a4d8 · 499a4d8
2 parents a6c79e1 + faacd8c
commit 499a4d8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/dists/rpm/build.sh b/dists/rpm/build.sh
@@ -2,7 +2,17 @@
 
 # One must run the source file build first.
 
-cp ../release/ledgersm*.tar.gz /root/rpmbuild/SOURCES/
+VERSION="1.4.2"
+hg archive -ttgz ~/ledgersmb.tar.gz
+
+# Remove Dojo
+
+gunzip  ~/ledgersmb.tar.gz
+tar -f ~/ledgersmb.tar --delete ledgersmb/UI/lib/dojo -v
+
+gzip ~/ledgersmb.tar;
+
+mv ~/ledgersmb.tar.gz ~/rpmbuild/SOURCES/ledgersmb-$VERSION.tar.gz;
 
 rpmbuild -ba --sign  \
                --define "_source_filedigest_algorithm 0" \

diff --git a/dists/rpm/ledgersmb.spec b/dists/rpm/ledgersmb.spec
@@ -21,6 +21,7 @@ Requires: perl-IO-String
 Requires: perl-Math-BigInt-GMP
 Requires: perl-Log-Log4perl perl-DateTime perl-DateTime-Format-Strptime
 Requires: perl-Config-IniFiles perl-Moose perl-Number-Format
+Requires: dojo
 BuildRequires: perl
 # avoid bogus autodetection of perl modules:
 AutoReqProv: no
@@ -140,6 +141,8 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
 install -m 644 rpm-ledgersmb-httpd.conf \
   $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ledgersmb.conf
 
+ln -s /usr/share/dojo $RPM_BUILD_ROOT%{_datadir}/%{name}/UI/lib/dojo
+
 %clean
 rm -rf $RPM_BUILD_ROOT