The package rpms/openjdk-asmtools7.git has added or updated architecture specific content
in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/openjdk-asmtools7.git/commit/?id=...
https://src.fedoraproject.org/cgit/rpms/openjdk-asmtools7.git/commit/?id=...
https://src.fedoraproject.org/cgit/rpms/openjdk-asmtools7.git/commit/?id=....
Change:
+ExclusiveArch: %{java_arches} noarch
-ExclusiveArch: %{java_arches} noarch
+ExclusiveArch: %{java_arches} noarch
Thanks.
Full change:
============
commit 87723afa2b84c9963e3cb761b9d8bac138581093
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Fri Dec 2 12:02:46 2022 +0100
properly using java_arches
diff --git a/openjdk-asmtools7.spec b/openjdk-asmtools7.spec
index b827668..7967964 100644
--- a/openjdk-asmtools7.spec
+++ b/openjdk-asmtools7.spec
@@ -24,6 +24,7 @@ Source1: openjdk-asmtools7.in
Source2: openjdk-asmtools7.1
BuildArch: noarch
+ExclusiveArch: %{java_arches} noarch
BuildRequires: java-devel
BuildRequires: maven-local
commit b46498e0ecbb026302f2b9d3d8cb424a0b7ac3ab
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Fri Dec 2 11:39:04 2022 +0100
Downgraed to asmtools 7
diff --git a/openjdk-asmtools7.in b/openjdk-asmtools7.in
index b68c5d2..4fb7480 100644
--- a/openjdk-asmtools7.in
+++ b/openjdk-asmtools7.in
@@ -15,6 +15,6 @@ _set_java_home
set_jvm
# all dependencies must be on classpath
-set_classpath openjdk-asmtools
+set_classpath openjdk-asmtools7
run @SCD@ "$@"
diff --git a/openjdk-asmtools7.spec b/openjdk-asmtools7.spec
index 8cde4e7..b827668 100644
--- a/openjdk-asmtools7.spec
+++ b/openjdk-asmtools7.spec
@@ -1,15 +1,17 @@
#Definig major and minor because Version allows only '-'
-%global major 8.0
-%global minor b02.ea
-#Using pre-release snapshot versioning from at8 branch
-%global commit 608867a0bea64c80281f02b0e6d273b18943eb97
+%global major 7.0
+%global minor b10
+#Using pre-release snapshot versioning
+%global commit f40a2c014cfd32eb6cc1e1c6c4264a0411fe0415
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20221108
+%global commitdate 20210610
-Name: openjdk-asmtools
+%global project_name openjdk-asmtools
+
+Name: %{project_name}7
Version: %{major}.%{minor}
-Release: 0.1.%{commitdate}.git%{shortcommit}%{?dist}
-Summary: To develop tools create proper & improper Java '.class'
files
+Release: 0.5.%{commitdate}.git%{shortcommit}%{?dist}
+Summary: To develop tools create proper & improper Java '.class' files
for jdk11 and down
License: GPLv2+
URL:
https://github.com/openjdk/asmtools
@@ -17,22 +19,20 @@ URL:
https://github.com/openjdk/asmtools
#Source0:
https://github.com/openjdk/%%{name}/archive/%%{major}-%%{minor}.tar.gz
#As we are using pre-release snapshot versioning, Source0 looks as below
#To download source: spectool -g openjdk-asmtools.spec
-Source0:
https://github.com/openjdk/asmtools/archive/%{commit}/%{name}-%{shortcomm...
-Source1: openjdk-asmtools.in
-Source2: openjdk-asmtools.1
+Source0:
https://github.com/openjdk/asmtools/archive/%{commit}/%{project_name}-%{s...
+Source1: openjdk-asmtools7.in
+Source2: openjdk-asmtools7.1
BuildArch: noarch
-ExclusiveArch: %{java_arches} noarch
-#asmtools8 requires jdk16 amd up
-BuildRequires: java-17-openjdk-devel
+BuildRequires: java-devel
BuildRequires: maven-local
BuildRequires: maven-compiler-plugin
BuildRequires: maven-jar-plugin
-Requires: (java-17-headless or java-latest-openjdk-headless)
+Requires: java-headless
%description
-AsmTools helps develop tools to create proper and improper Java '.class' files.
+AsmTools helps develop tools to create proper and improper Java '.class' files.
for jdk11 and down
Aids various Java .class based testing and OpenJDK development applications.
Asmtools supports latest class file formats, in lock-step with JDK development.
AsmTools consist of a set of (Java class file) assembler/dis-assemblers:
@@ -56,18 +56,15 @@ This package contains the API documentation for %{name}.
cd maven
sed -i "s|ln -sv|cp -r|g" mvngen.sh
sh mvngen.sh
-#%%pom_remove_plugin :maven-javadoc-plugin
-#%%pom_remove_plugin :maven-source-plugin
-#%%pom_remove_plugin :maven-gpg-plugin
+%pom_remove_plugin :maven-javadoc-plugin
+%pom_remove_plugin :maven-source-plugin
+%pom_remove_plugin :maven-gpg-plugin
sed "s/<addClasspath.*//" -i pom.xml
sed "s/<<mainClass.*//" -i pom.xml
%build
cd maven
-export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
-xmvn -version
-# there are two test failures
-%mvn_build --xmvn-javadoc -f
+%mvn_build --xmvn-javadoc
%install
rm -rf $RPM_BUILD_ROOT
@@ -90,26 +87,11 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/
%license LICENSE
%doc README.md
%attr(755, root, -) %{_bindir}/*
-%{_mandir}/man1/openjdk-asmtools.1*
+%{_mandir}/man1/openjdk-asmtools7.1*
%files javadoc -f maven/.mfiles-javadoc
%changelog
-* Thu Nov 10 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
8.0.b02.ea-0.1.20221108.git608867a
-- bumped to asmtools8
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
7.0.b10-0.8.20210610.gitf40a2c0
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jul 08 2022 Jiri Vanek <jvanek(a)redhat.com> - 7.0.b10-0.7.20210610.gitf40a2c0
-- Rebuilt for Drop i686 JDKs
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek(a)redhat.com> - 7.0.b10-0.6.20210610.gitf40a2c0
-- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
7.0.b10-0.5.20210610.gitf40a2c0
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
* Wed Dec 08 2021 Jayashree Huttanagoudar <jhuttana(a)redhat.com> -
7.0.b10-0.4.20210610.gitf40a2c0
- Use XMvn javadoc so as to work-around maven-javadoc-plugin issue.
diff --git a/sources b/sources
index 816df1f..7f424aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openjdk-asmtools-608867a.tar.xz) =
93955d3cc49dd3778443a6e70f1ebe2db7c3cb68818615d1e2898e08443b6f234bab3a716ad0b819a008f3f28bc402e9ce6672bbbb9bf9e5bc865946a50aafe3
+SHA512 (openjdk-asmtools-f40a2c0.tar.xz) =
cf7c02fead093f754d88f5c798fb84a7f866e1396d607a923881de973ad3449113cb87015d2498cf28bb6fb7f01475bfcbae13d8ae0325ffb94d67546df03358
commit 37a36a19b31384adcac424ce71f976ccaa0c2efc
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Fri Dec 2 11:29:00 2022 +0100
Renamed files top 7 comapct package
diff --git a/openjdk-asmtools.1 b/openjdk-asmtools7.1
similarity index 100%
rename from openjdk-asmtools.1
rename to openjdk-asmtools7.1
diff --git a/openjdk-asmtools.in b/openjdk-asmtools7.in
similarity index 100%
rename from openjdk-asmtools.in
rename to openjdk-asmtools7.in
diff --git a/openjdk-asmtools.spec b/openjdk-asmtools7.spec
similarity index 100%
rename from openjdk-asmtools.spec
rename to openjdk-asmtools7.spec
commit 1bdaf279d478ae5c568c8281cab6a7812049684b
Merge: 66f63d1 9bd1b7d
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Fri Dec 2 11:28:05 2022 +0100
Merge remote-tracking branch 'puvodni/rawhide' into rawhide
commit 66f63d13c8fb50e58acf0a80fac64a218791035f
Author: Gwyn Ciesla <limb(a)fedoraproject.org>
Date: Thu Dec 1 15:19:02 2022 +0000
Added the README
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..5ef1385
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# openjdk-asmtools7
+
+The openjdk-asmtools7 package
commit 9bd1b7da4ae6b8ea897667b411b2a419001e9f4f
Author: Jiri <jvanek(a)redhat.com>
Date: Thu Nov 10 15:46:23 2022 +0100
Bumped to asmtool8
diff --git a/.gitignore b/.gitignore
index acf6318..05f4372 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/openjdk-asmtools-7eadbbf.tar.gz
/openjdk-asmtools-f40a2c0.zip
/openjdk-asmtools-f40a2c0.tar.xz
+/openjdk-asmtools-608867a.tar.xz
diff --git a/openjdk-asmtools.spec b/openjdk-asmtools.spec
index 376fab6..8cde4e7 100644
--- a/openjdk-asmtools.spec
+++ b/openjdk-asmtools.spec
@@ -1,14 +1,14 @@
#Definig major and minor because Version allows only '-'
-%global major 7.0
-%global minor b10
-#Using pre-release snapshot versioning
-%global commit f40a2c014cfd32eb6cc1e1c6c4264a0411fe0415
+%global major 8.0
+%global minor b02.ea
+#Using pre-release snapshot versioning from at8 branch
+%global commit 608867a0bea64c80281f02b0e6d273b18943eb97
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20210610
+%global commitdate 20221108
Name: openjdk-asmtools
Version: %{major}.%{minor}
-Release: 0.8.%{commitdate}.git%{shortcommit}%{?dist}
+Release: 0.1.%{commitdate}.git%{shortcommit}%{?dist}
Summary: To develop tools create proper & improper Java '.class'
files
License: GPLv2+
@@ -24,11 +24,12 @@ Source2: openjdk-asmtools.1
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
-BuildRequires: java-devel
+#asmtools8 requires jdk16 amd up
+BuildRequires: java-17-openjdk-devel
BuildRequires: maven-local
BuildRequires: maven-compiler-plugin
BuildRequires: maven-jar-plugin
-Requires: java-headless
+Requires: (java-17-headless or java-latest-openjdk-headless)
%description
AsmTools helps develop tools to create proper and improper Java '.class' files.
@@ -55,15 +56,18 @@ This package contains the API documentation for %{name}.
cd maven
sed -i "s|ln -sv|cp -r|g" mvngen.sh
sh mvngen.sh
-%pom_remove_plugin :maven-javadoc-plugin
-%pom_remove_plugin :maven-source-plugin
-%pom_remove_plugin :maven-gpg-plugin
+#%%pom_remove_plugin :maven-javadoc-plugin
+#%%pom_remove_plugin :maven-source-plugin
+#%%pom_remove_plugin :maven-gpg-plugin
sed "s/<addClasspath.*//" -i pom.xml
sed "s/<<mainClass.*//" -i pom.xml
%build
cd maven
-%mvn_build --xmvn-javadoc
+export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
+xmvn -version
+# there are two test failures
+%mvn_build --xmvn-javadoc -f
%install
rm -rf $RPM_BUILD_ROOT
@@ -91,6 +95,9 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/
%files javadoc -f maven/.mfiles-javadoc
%changelog
+* Thu Nov 10 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
8.0.b02.ea-0.1.20221108.git608867a
+- bumped to asmtools8
+
* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
7.0.b10-0.8.20210610.gitf40a2c0
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/sources b/sources
index 7f424aa..816df1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openjdk-asmtools-f40a2c0.tar.xz) =
cf7c02fead093f754d88f5c798fb84a7f866e1396d607a923881de973ad3449113cb87015d2498cf28bb6fb7f01475bfcbae13d8ae0325ffb94d67546df03358
+SHA512 (openjdk-asmtools-608867a.tar.xz) =
93955d3cc49dd3778443a6e70f1ebe2db7c3cb68818615d1e2898e08443b6f234bab3a716ad0b819a008f3f28bc402e9ce6672bbbb9bf9e5bc865946a50aafe3
commit 7a15ae4f98978fa9f0aa974e9cb4ae1e10cf5eba
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 22 02:07:35 2022 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/openjdk-asmtools.spec b/openjdk-asmtools.spec
index e1c863d..376fab6 100644
--- a/openjdk-asmtools.spec
+++ b/openjdk-asmtools.spec
@@ -8,7 +8,7 @@
Name: openjdk-asmtools
Version: %{major}.%{minor}
-Release: 0.7.%{commitdate}.git%{shortcommit}%{?dist}
+Release: 0.8.%{commitdate}.git%{shortcommit}%{?dist}
Summary: To develop tools create proper & improper Java '.class'
files
License: GPLv2+
@@ -91,6 +91,9 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/
%files javadoc -f maven/.mfiles-javadoc
%changelog
+* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
7.0.b10-0.8.20210610.gitf40a2c0
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
* Fri Jul 08 2022 Jiri Vanek <jvanek(a)redhat.com> - 7.0.b10-0.7.20210610.gitf40a2c0
- Rebuilt for Drop i686 JDKs
commit 4a4c9f1eb342c781c1463f2bd19acdfccb18be1e
Author: Jiri <jvanek(a)redhat.com>
Date: Fri Jul 8 16:25:02 2022 +0200
Rebuilt for Drop i686 JDKs
https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
diff --git a/openjdk-asmtools.spec b/openjdk-asmtools.spec
index 39d37f5..e1c863d 100644
--- a/openjdk-asmtools.spec
+++ b/openjdk-asmtools.spec
@@ -8,7 +8,7 @@
Name: openjdk-asmtools
Version: %{major}.%{minor}
-Release: 0.6.%{commitdate}.git%{shortcommit}%{?dist}
+Release: 0.7.%{commitdate}.git%{shortcommit}%{?dist}
Summary: To develop tools create proper & improper Java '.class'
files
License: GPLv2+
@@ -22,6 +22,7 @@ Source1: openjdk-asmtools.in
Source2: openjdk-asmtools.1
BuildArch: noarch
+ExclusiveArch: %{java_arches} noarch
BuildRequires: java-devel
BuildRequires: maven-local
@@ -90,6 +91,9 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/
%files javadoc -f maven/.mfiles-javadoc
%changelog
+* Fri Jul 08 2022 Jiri Vanek <jvanek(a)redhat.com> - 7.0.b10-0.7.20210610.gitf40a2c0
+- Rebuilt for Drop i686 JDKs
+
* Sat Feb 05 2022 Jiri Vanek <jvanek(a)redhat.com> - 7.0.b10-0.6.20210610.gitf40a2c0
- Rebuilt for java-17-openjdk as system jdk
commit 773b927dd1bc156620fb046601a8fb9d768c7eca
Author: Jiri <jvanek(a)redhat.com>
Date: Sat Feb 5 23:14:00 2022 +0100
Rebuilt for java-17-openjdk as system jdk
https://fedoraproject.org/wiki/Changes/Java17
diff --git a/openjdk-asmtools.spec b/openjdk-asmtools.spec
index 4f224f5..39d37f5 100644
--- a/openjdk-asmtools.spec
+++ b/openjdk-asmtools.spec
@@ -8,7 +8,7 @@
Name: openjdk-asmtools
Version: %{major}.%{minor}
-Release: 0.5.%{commitdate}.git%{shortcommit}%{?dist}
+Release: 0.6.%{commitdate}.git%{shortcommit}%{?dist}
Summary: To develop tools create proper & improper Java '.class'
files
License: GPLv2+
@@ -90,6 +90,9 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/
%files javadoc -f maven/.mfiles-javadoc
%changelog
+* Sat Feb 05 2022 Jiri Vanek <jvanek(a)redhat.com> - 7.0.b10-0.6.20210610.gitf40a2c0
+- Rebuilt for java-17-openjdk as system jdk
+
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
7.0.b10-0.5.20210610.gitf40a2c0
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
commit 60e9cebcb6b8569c4f3f70c26a63cc8d4c9fd064
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 20 22:23:33 2022 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/openjdk-asmtools.spec b/openjdk-asmtools.spec
index b5108e9..4f224f5 100644
--- a/openjdk-asmtools.spec
+++ b/openjdk-asmtools.spec
@@ -8,7 +8,7 @@
Name: openjdk-asmtools
Version: %{major}.%{minor}
-Release: 0.4.%{commitdate}.git%{shortcommit}%{?dist}
+Release: 0.5.%{commitdate}.git%{shortcommit}%{?dist}
Summary: To develop tools create proper & improper Java '.class'
files
License: GPLv2+
@@ -90,6 +90,9 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/
%files javadoc -f maven/.mfiles-javadoc
%changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
7.0.b10-0.5.20210610.gitf40a2c0
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Wed Dec 08 2021 Jayashree Huttanagoudar <jhuttana(a)redhat.com> -
7.0.b10-0.4.20210610.gitf40a2c0
- Use XMvn javadoc so as to work-around maven-javadoc-plugin issue.
commit 5c33c713d4fbed64b2f1a62d3185670dc49f96cc
Author: Jayashree Huttanagoudar <jhuttana(a)redhat.com>
Date: Wed Dec 8 22:53:58 2021 +0530
Use XMvn javadoc so as to work-around maven-javadoc-plugin issue.
diff --git a/openjdk-asmtools.spec b/openjdk-asmtools.spec
index 7e64e10..b5108e9 100644
--- a/openjdk-asmtools.spec
+++ b/openjdk-asmtools.spec
@@ -8,7 +8,7 @@
Name: openjdk-asmtools
Version: %{major}.%{minor}
-Release: 0.3.%{commitdate}.git%{shortcommit}%{?dist}
+Release: 0.4.%{commitdate}.git%{shortcommit}%{?dist}
Summary: To develop tools create proper & improper Java '.class'
files
License: GPLv2+
@@ -27,7 +27,6 @@ BuildRequires: java-devel
BuildRequires: maven-local
BuildRequires: maven-compiler-plugin
BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
Requires: java-headless
%description
@@ -55,6 +54,7 @@ This package contains the API documentation for %{name}.
cd maven
sed -i "s|ln -sv|cp -r|g" mvngen.sh
sh mvngen.sh
+%pom_remove_plugin :maven-javadoc-plugin
%pom_remove_plugin :maven-source-plugin
%pom_remove_plugin :maven-gpg-plugin
sed "s/<addClasspath.*//" -i pom.xml
@@ -62,7 +62,7 @@ sed "s/<<mainClass.*//" -i pom.xml
%build
cd maven
-%mvn_build
+%mvn_build --xmvn-javadoc
%install
rm -rf $RPM_BUILD_ROOT
@@ -90,6 +90,9 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/
%files javadoc -f maven/.mfiles-javadoc
%changelog
+* Wed Dec 08 2021 Jayashree Huttanagoudar <jhuttana(a)redhat.com> -
7.0.b10-0.4.20210610.gitf40a2c0
+- Use XMvn javadoc so as to work-around maven-javadoc-plugin issue.
+
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
7.0.b10-0.3.20210610.gitf40a2c0
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
commit a8f39ad08226bc24dceb24900ae250166d320ae9
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 22 17:15:21 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/openjdk-asmtools.spec b/openjdk-asmtools.spec
index f71a9ac..7e64e10 100644
--- a/openjdk-asmtools.spec
+++ b/openjdk-asmtools.spec
@@ -8,7 +8,7 @@
Name: openjdk-asmtools
Version: %{major}.%{minor}
-Release: 0.2.%{commitdate}.git%{shortcommit}%{?dist}
+Release: 0.3.%{commitdate}.git%{shortcommit}%{?dist}
Summary: To develop tools create proper & improper Java '.class'
files
License: GPLv2+
@@ -90,6 +90,9 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/
%files javadoc -f maven/.mfiles-javadoc
%changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
7.0.b10-0.3.20210610.gitf40a2c0
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Fri Jun 11 2021 Jiri Vanek <jvanek(a)redhat.com> - 7.0.b10-0.2.20210610.gitf40a2c0
- updated to latest sources
- moved mvngen to prep
commit 1e4a0f75393881ac0bb5c80f69de8c03ab65d16a
Author: Jiri <jvanek(a)redhat.com>
Date: Fri Jun 11 17:31:58 2021 +0200
Buymped to latest sources (do nto build!)
as grouid and artifactid changed
diff --git a/.gitignore b/.gitignore
index f345b82..acf6318 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
/openjdk-asmtools-7eadbbf.tar.gz
+/openjdk-asmtools-f40a2c0.zip
+/openjdk-asmtools-f40a2c0.tar.xz
diff --git a/openjdk-asmtools.spec b/openjdk-asmtools.spec
index ed75c39..f71a9ac 100644
--- a/openjdk-asmtools.spec
+++ b/openjdk-asmtools.spec
@@ -2,13 +2,13 @@
%global major 7.0
%global minor b10
#Using pre-release snapshot versioning
-%global commit 7eadbbf8f41b8174f7991a5ad1fe79519fe108d4
+%global commit f40a2c014cfd32eb6cc1e1c6c4264a0411fe0415
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20210122
+%global commitdate 20210610
Name: openjdk-asmtools
Version: %{major}.%{minor}
-Release: 0.1.%{commitdate}.git%{shortcommit}%{?dist}
+Release: 0.2.%{commitdate}.git%{shortcommit}%{?dist}
Summary: To develop tools create proper & improper Java '.class'
files
License: GPLv2+
@@ -17,7 +17,7 @@ URL:
https://github.com/openjdk/asmtools
#Source0:
https://github.com/openjdk/%%{name}/archive/%%{major}-%%{minor}.tar.gz
#As we are using pre-release snapshot versioning, Source0 looks as below
#To download source: spectool -g openjdk-asmtools.spec
-Source0:
https://github.com/openjdk/asmtools/archive/%{commit}/%{name}-%{shortcomm...
+Source0:
https://github.com/openjdk/asmtools/archive/%{commit}/%{name}-%{shortcomm...
Source1: openjdk-asmtools.in
Source2: openjdk-asmtools.1
@@ -27,6 +27,7 @@ BuildRequires: java-devel
BuildRequires: maven-local
BuildRequires: maven-compiler-plugin
BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
Requires: java-headless
%description
@@ -51,11 +52,16 @@ This package contains the API documentation for %{name}.
#%%setup -q -n asmtools-%%{version}
#Added to handle pre-release version
%autosetup -n asmtools-%{commit}
-
-%build
cd maven
sed -i "s|ln -sv|cp -r|g" mvngen.sh
sh mvngen.sh
+%pom_remove_plugin :maven-source-plugin
+%pom_remove_plugin :maven-gpg-plugin
+sed "s/<addClasspath.*//" -i pom.xml
+sed "s/<<mainClass.*//" -i pom.xml
+
+%build
+cd maven
%mvn_build
%install
@@ -84,5 +90,9 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/
%files javadoc -f maven/.mfiles-javadoc
%changelog
+* Fri Jun 11 2021 Jiri Vanek <jvanek(a)redhat.com> - 7.0.b10-0.2.20210610.gitf40a2c0
+- updated to latest sources
+- moved mvngen to prep
+
* Wed Jan 27 2021 Jayashree Huttanagoudar <jhuttana(a)redhat.com> -
7.0.b10-0.1.20210122.git7eadbbf
- Initial openjdk-asmtools package for fedora
diff --git a/sources b/sources
index 774f489..7f424aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openjdk-asmtools-7eadbbf.tar.gz) =
fe431ca4b667ec5d177dfcba6760962f7d7a41d692ec9a26d5795691c7663e8ad887e82532936f65ae05926613dbbb8e25930c5a594b0233338063c7591aef7a
+SHA512 (openjdk-asmtools-f40a2c0.tar.xz) =
cf7c02fead093f754d88f5c798fb84a7f866e1396d607a923881de973ad3449113cb87015d2498cf28bb6fb7f01475bfcbae13d8ae0325ffb94d67546df03358
commit b4fecc0a5334a80896a806a4f0d7e8da9eabcd7a
Author: Jayashree Huttanagoudar <jhuttana(a)redhat.com>
Date: Thu Mar 4 21:35:09 2021 +0530
Initial import 1926697
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f345b82
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/openjdk-asmtools-7eadbbf.tar.gz
diff --git a/openjdk-asmtools.1 b/openjdk-asmtools.1
new file mode 100644
index 0000000..12a6b1e
--- /dev/null
+++ b/openjdk-asmtools.1
@@ -0,0 +1,20 @@
+.TH openjdk-asmtools 1 "01 March 2021" "version 0.1"
+.SH NAME
+openjdk-asmtools \- To develop tools create proper & improper Java '.class'
files
+.SH SYNOPSIS
+openjdk-asmtools
+.SH DESCRIPTION
+AsmTools helps develop tools to create proper and improper Java '.class' files.
+Aids various Java .class based testing and OpenJDK development applications.
+Asmtools supports latest class file formats, in lock-step with JDK development.
+.SH Usage:
+.IP to\ run\ an\ assembly\ tool:
+$ java -jar asmtools.jar toolName [args...]
+where toolName one of: jasm, jdis, jcoder, jdec, jcdec
+.IP to\ get\ the\ version:
+$ java -jar asmtools.jar -version
+.IP to\ get\ this\ message
+$ java -jar asmtools.jar -?|-h|-help
+.SH AUTHOR
+Jayashree Huttanagoudar (jaya.huttanagoudar(a)gmail.com)
+Jiri Vanek (judovana(a)email.com)
diff --git a/openjdk-asmtools.in b/openjdk-asmtools.in
new file mode 100644
index 0000000..b68c5d2
--- /dev/null
+++ b/openjdk-asmtools.in
@@ -0,0 +1,20 @@
+#!/usr/bin/bash
+set -e
+
+# openjdk-asmtools launch script
+
+# JPackage Project <
http://www.jpackage.org/>
+# Source functions library
+
+. /usr/share/java-utils/java-functions
+
+: ${MAIN_CLASS:=org.openjdk.asmtools.Main}
+
+# set java and jvm arguments
+_set_java_home
+set_jvm
+
+# all dependencies must be on classpath
+set_classpath openjdk-asmtools
+
+run @SCD@ "$@"
diff --git a/openjdk-asmtools.spec b/openjdk-asmtools.spec
new file mode 100644
index 0000000..ed75c39
--- /dev/null
+++ b/openjdk-asmtools.spec
@@ -0,0 +1,88 @@
+#Definig major and minor because Version allows only '-'
+%global major 7.0
+%global minor b10
+#Using pre-release snapshot versioning
+%global commit 7eadbbf8f41b8174f7991a5ad1fe79519fe108d4
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20210122
+
+Name: openjdk-asmtools
+Version: %{major}.%{minor}
+Release: 0.1.%{commitdate}.git%{shortcommit}%{?dist}
+Summary: To develop tools create proper & improper Java '.class'
files
+
+License: GPLv2+
+URL:
https://github.com/openjdk/asmtools
+#If we use regular versioning then Source0 looks as below
+#Source0:
https://github.com/openjdk/%%{name}/archive/%%{major}-%%{minor}.tar.gz
+#As we are using pre-release snapshot versioning, Source0 looks as below
+#To download source: spectool -g openjdk-asmtools.spec
+Source0:
https://github.com/openjdk/asmtools/archive/%{commit}/%{name}-%{shortcomm...
+Source1: openjdk-asmtools.in
+Source2: openjdk-asmtools.1
+
+BuildArch: noarch
+
+BuildRequires: java-devel
+BuildRequires: maven-local
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-jar-plugin
+Requires: java-headless
+
+%description
+AsmTools helps develop tools to create proper and improper Java '.class' files.
+Aids various Java .class based testing and OpenJDK development applications.
+Asmtools supports latest class file formats, in lock-step with JDK development.
+AsmTools consist of a set of (Java class file) assembler/dis-assemblers:
+Jasm/Jdis:
+An assembler language to provide Java-like declaration of member signatures,
+providing Java VM specification compliant mnemonics for byte-code instructions.
+JCod/JDec:
+An assembler language to provide byte-code containers of class-file constructs.
+
+%package javadoc
+Summary: Javadoc for %{name}
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+#This is commented till the version on the master branch is released
+#%%setup -q -n asmtools-%%{version}
+#Added to handle pre-release version
+%autosetup -n asmtools-%{commit}
+
+%build
+cd maven
+sed -i "s|ln -sv|cp -r|g" mvngen.sh
+sh mvngen.sh
+%mvn_build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+pushd maven
+%mvn_install
+popd
+
+mkdir -p $RPM_BUILD_ROOT%{_bindir}/
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
+install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
+#!/bin/sh
+for launcher in "" "-jasm" "-jdis" "-jcoder"
"-jdec" "-jcdec"; do
+ switch=`echo $launcher |sed "s/-//"`
+ cat %{SOURCE1} | sed "s/@SCD@/$switch/" >
$RPM_BUILD_ROOT%{_bindir}/%{name}$launcher
+done
+install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1/
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/
+
+%files -f maven/.mfiles
+%license LICENSE
+%doc README.md
+%attr(755, root, -) %{_bindir}/*
+%{_mandir}/man1/openjdk-asmtools.1*
+
+%files javadoc -f maven/.mfiles-javadoc
+
+%changelog
+* Wed Jan 27 2021 Jayashree Huttanagoudar <jhuttana(a)redhat.com> -
7.0.b10-0.1.20210122.git7eadbbf
+- Initial openjdk-asmtools package for fedora
diff --git a/sources b/sources
new file mode 100644
index 0000000..774f489
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (openjdk-asmtools-7eadbbf.tar.gz) =
fe431ca4b667ec5d177dfcba6760962f7d7a41d692ec9a26d5795691c7663e8ad887e82532936f65ae05926613dbbb8e25930c5a594b0233338063c7591aef7a