mirror of
https://abf.rosa.ru/djam/josm.git
synced 2025-02-24 15:32:52 +00:00
19096
This commit is contained in:
parent
31a9c81e03
commit
67d9400bee
2 changed files with 9 additions and 6 deletions
2
.abf.yml
2
.abf.yml
|
@ -1,2 +1,2 @@
|
||||||
sources:
|
sources:
|
||||||
josm-19067.tar.gz: 615763d0a527af1701d9a581758e51902988d7e0
|
josm-19096.tar.gz: 6afa4926361453ad97bc5593877633982456980d
|
||||||
|
|
13
josm.spec
13
josm.spec
|
@ -1,6 +1,9 @@
|
||||||
|
%define jdk_ver jdk17
|
||||||
|
%global JAVA_HOME /opt/%{jdk_ver}/jdk
|
||||||
|
|
||||||
Name: josm
|
Name: josm
|
||||||
Summary: Java-based OSM editor
|
Summary: Java-based OSM editor
|
||||||
Version: 19067
|
Version: 19096
|
||||||
Release: 1
|
Release: 1
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://josm.openstreetmap.de
|
URL: https://josm.openstreetmap.de
|
||||||
|
@ -32,12 +35,12 @@ from using them in creative, productive or unexpected ways.
|
||||||
#svn co -r %{version} https://josm.openstreetmap.de/svn/trunk $RPM_BUILD_DIR/%{name}-%{version}
|
#svn co -r %{version} https://josm.openstreetmap.de/svn/trunk $RPM_BUILD_DIR/%{name}-%{version}
|
||||||
%setup -qn %{name}-%{version}-tested
|
%setup -qn %{name}-%{version}-tested
|
||||||
# fix deps org.jacoco.ant
|
# fix deps org.jacoco.ant
|
||||||
sed -i '/org.jacoco.ant/s/-SNAPSHOT//' ivy.xml
|
#sed -i '/org.jacoco.ant/s/-SNAPSHOT//' ivy.xml
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export JAVA_HOME=/opt/jdk17
|
#xport JAVA_HOME=/opt/jdk17
|
||||||
#cd $RPM_BUILD_DIR/%{name}-%{version}
|
#cd $RPM_BUILD_DIR/%{name}-%{version}
|
||||||
ant -Dversion.entry.commit.revision=%{version} dist-optimized
|
JAVA_HOME=%{JAVA_HOME} ant -Dversion.entry.commit.revision=%{version} dist-optimized
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
@ -73,7 +76,7 @@ cat > %{buildroot}%{_bindir}/%{name} << EOF
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
PROGRAM_DIR=%{_datadir}/%{name}
|
PROGRAM_DIR=%{_datadir}/%{name}
|
||||||
JAVABIN=/usr/bin/java
|
JAVABIN=/opt/%{jdk_ver}/jdk/bin/java
|
||||||
|
|
||||||
exec \$JAVABIN -Xmx2048m -jar \$PROGRAM_DIR/%{name}.jar
|
exec \$JAVABIN -Xmx2048m -jar \$PROGRAM_DIR/%{name}.jar
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue