From c8b01d26edb512129309d7f4edc3f841eb754bda Mon Sep 17 00:00:00 2001 From: Chris Travers Date: Sun, 28 Sep 2014 00:30:43 -0700 Subject: [PATCH 1/2] New rpm build script (needs version written in) runs but not successfully. --- dists/rpm/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dists/rpm/build.sh b/dists/rpm/build.sh index d7c5a73d89..b4a3509b77 100644 --- a/dists/rpm/build.sh +++ b/dists/rpm/build.sh @@ -2,7 +2,9 @@ # 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 +mv ~/ledgersmb.tar.gz ~/rpmbuild/SOURCES/ledgersmb-$VERSION.tar.gz; rpmbuild -ba --sign \ --define "_source_filedigest_algorithm 0" \ From faacd8c8ea8fcb3dba08936ea7d6c54922218289 Mon Sep 17 00:00:00 2001 From: Chris Travers Date: Sun, 28 Sep 2014 01:17:31 -0700 Subject: [PATCH 2/2] rpm spec changes to use packaged dojo --- dists/rpm/build.sh | 8 ++++++++ dists/rpm/ledgersmb.spec | 3 +++ 2 files changed, 11 insertions(+) diff --git a/dists/rpm/build.sh b/dists/rpm/build.sh index b4a3509b77..c37a6626fc 100644 --- a/dists/rpm/build.sh +++ b/dists/rpm/build.sh @@ -4,6 +4,14 @@ 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 \ diff --git a/dists/rpm/ledgersmb.spec b/dists/rpm/ledgersmb.spec index 825a90e009..bdcb866a55 100644 --- 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