commit args4j for openSUSE:Factory
Hello community,
here is the log from the commit of package args4j for openSUSE:Factory checked
in at 2019-09-25 08:49:52
Comparing /work/SRC/openSUSE:Factory/args4j (Old)
and /work/SRC/openSUSE:Factory/.args4j.new.7948 (New)
Package is "args4j"
Wed Sep 25 08:49:52 2019 rev:8 rq:733004 version:2.33
Changes:
--- /work/SRC/openSUSE:Factory/args4j/args4j.changes2019-09-21
17:30:20.668736581 +0200
+++ /work/SRC/openSUSE:Factory/.args4j.new.7948/args4j.changes 2019-09-25
08:49:57.806210919 +0200
@@ -1,0 +2,8 @@
+Tue Sep 24 16:39:12 UTC 2019 - Fridrich Strba
+
+- Update to version 2.33
+ * generate and customize the ant build files
+- Add option to build with tests on (disabled by default)
+- Package the tools in a subpackage
+
+---
Old:
args4j-2.0.9.pom
args4j-2.0.9.tar.bz2
New:
args4j-build.tar.xz
args4j-site-2.33.tar.gz
Other differences:
--
++ args4j.spec ++
--- /var/tmp/diff_new_pack.OXy7Nw/_old 2019-09-25 08:49:58.474210829 +0200
+++ /var/tmp/diff_new_pack.OXy7Nw/_new 2019-09-25 08:49:58.478210829 +0200
@@ -16,25 +16,25 @@
#
+%bcond_with tests
Name: args4j
-Version:2.0.9
+Version:2.33
Release:0
-Summary:Java commandline parser
+Summary:Java command line arguments parser
License:MIT
Group: Development/Libraries/Java
-Url:http://args4j.kohsuke.org/
-Source0:%{name}-%{version}.tar.bz2
-Source1:
http://central.maven.org/maven2/args4j/%{name}/%{version}/%{name}-%{version}.pom
-BuildRequires: ant >= 1.7.0
-BuildRequires: ant-apache-regexp
-BuildRequires: ant-contrib
-BuildRequires: ant-junit
-BuildRequires: ant-nodeps
+URL:https://args4j.kohsuke.org
+Source0:
https://github.com/kohsuke/%{name}/archive/%{name}-site-%{version}.tar.gz
+Source1:%{name}-build.tar.xz
+BuildRequires: ant
BuildRequires: fdupes
-BuildRequires: java-devel >= 1.8
+BuildRequires: java-devel
BuildRequires: javapackages-local
-Requires: java >= 1.8
BuildArch: noarch
+%if %{with tests}
+BuildRequires: ant-junit
+BuildRequires: mockito
+%endif
%description
args4j is a small Java class library that makes it easy
@@ -46,50 +46,91 @@
- It is designed to parse javac like options (as opposed to GNU-style
where ls -lR is considered to have two options l and R)
-%packagejavadoc
-Summary:Javadoc for Java commandline parser
+%package tools
+Summary:Development-time tool for generating additional artifacts
Group: Development/Libraries/Java
+Requires: %{name} = %{version}
+
+%description tools
+This package contains args4j development-time tool for generating
+additional artifacts.
+
+%package javadoc
+Summary:API documentation for %{name}
+Group: Documentation/HTML
%descriptionjavadoc
This package contains the API documentation for %{name}.
%prep
-%setup -q
-cp %{SOURCE1} pom.xml
-%pom_remove_parent
-%pom_xpath_inject pom:project "
+%setup -q -n %{name}-%{name}-site-%{version} -a 1
+
+# removing classpath addition
+sed -i 's/true/false/g' %{name}-tools/pom.xml
+
+# fix ant group id
+sed -i 's/ant/org.apache.ant/g' %{name}-tools/pom.xml
+
+# removing bundled stuff
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
+
+%pom_remove_plugin :maven-shade-plugin %{name}-tools
+%pom_remove_plugin -r :maven-site-plugin
+
+# XMvn cannot generate requires on dependecies with scope "system"
+%pom_xpath_remove "pom:profile[pom:id[text()='jdk-tools-jar']]" %{name}-tools
+
+# we don't need these now
+%pom_disable_module args4j-maven-plugin
+%pom_disable_module args4j-maven-plugin-example
+
+for i in args4j args4j-tools; do
+ %pom_remove_parent $i
+ %pom_xpath_inject pom:project "
args4j
- %{version}"
+%{version}
+" $i
+done
%build
-mkdir -p build/generated-sources
-ant -Djavac.source=8 -Djavac.target=8 -Dsource.encoding="ISO-8859-1"
+mkdir -p lib
+%if %{with tests}
+build-jar-repository -s lib cglib/cglib mockito/mockito-core objectweb-asm/asm
objenesis/objenesis
+%ant package javadoc
+%else
+%ant -Dtest.skip=true package javadoc
+%endif
%install
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 dist/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-ln -sf %{_javadir}/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+# jar
+install -dm 0755 %{buildroot}%{_javadir}/%{name}
+install -pm 0644 %{name}/target/%{name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}/%{name}.jar
+(cd %{buildroot}%{_javadir} && ln -s %{name}/%{name}.jar %{name}.jar)
+install -pm 0644 %{name}-tools/target/%{name}-tools-%{version}.jar
commit args4j for openSUSE:Factory
Hello community,
here is the log from the commit of package args4j for openSUSE:Factory checked
in at 2019-09-21 17:30:17
Comparing /work/SRC/openSUSE:Factory/args4j (Old)
and /work/SRC/openSUSE:Factory/.args4j.new.7948 (New)
Package is "args4j"
Sat Sep 21 17:30:17 2019 rev:7 rq:732189 version:2.0.9
Changes:
--- /work/SRC/openSUSE:Factory/args4j/args4j.changes2018-10-29
14:58:42.746003504 +0100
+++ /work/SRC/openSUSE:Factory/.args4j.new.7948/args4j.changes 2019-09-21
17:30:20.668736581 +0200
@@ -1,0 +2,6 @@
+Fri Sep 20 11:56:30 UTC 2019 - Fridrich Strba
+
+- Remove reference to the parent pom since we are not building
+ using maven
+
+---
Other differences:
--
++ args4j.spec ++
--- /var/tmp/diff_new_pack.sxWJmK/_old 2019-09-21 17:30:21.380736589 +0200
+++ /var/tmp/diff_new_pack.sxWJmK/_new 2019-09-21 17:30:21.388736589 +0200
@@ -1,7 +1,7 @@
#
# spec file for package args4j
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -33,7 +33,6 @@
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
-BuildRequires: javapackages-tools
Requires: java >= 1.8
BuildArch: noarch
@@ -56,6 +55,11 @@
%prep
%setup -q
+cp %{SOURCE1} pom.xml
+%pom_remove_parent
+%pom_xpath_inject pom:project "
+ args4j
+ %{version}"
%build
mkdir -p build/generated-sources
@@ -68,7 +72,7 @@
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom
%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar
# Java doc
commit args4j for openSUSE:Factory
Hello community,
here is the log from the commit of package args4j for openSUSE:Factory checked
in at 2018-10-29 14:22:13
Comparing /work/SRC/openSUSE:Factory/args4j (Old)
and /work/SRC/openSUSE:Factory/.args4j.new (New)
Package is "args4j"
Mon Oct 29 14:22:13 2018 rev:6 rq:644924 version:2.0.9
Changes:
--- /work/SRC/openSUSE:Factory/args4j/args4j.changes2018-07-07
21:59:06.971263038 +0200
+++ /work/SRC/openSUSE:Factory/.args4j.new/args4j.changes 2018-10-29
14:58:42.746003504 +0100
@@ -1,0 +2,6 @@
+Fri Oct 19 17:38:13 UTC 2018 - Fridrich Strba
+
+- Download from maven central the corresponding pom file and
+ install it.
+
+---
New:
args4j-2.0.9.pom
Other differences:
--
++ args4j.spec ++
--- /var/tmp/diff_new_pack.bwP62G/_old 2018-10-29 14:58:43.146004101 +0100
+++ /var/tmp/diff_new_pack.bwP62G/_new 2018-10-29 14:58:43.146004101 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -24,6 +24,7 @@
Group: Development/Libraries/Java
Url:http://args4j.kohsuke.org/
Source0:%{name}-%{version}.tar.bz2
+Source1:
http://central.maven.org/maven2/args4j/%{name}/%{version}/%{name}-%{version}.pom
BuildRequires: ant >= 1.7.0
BuildRequires: ant-apache-regexp
BuildRequires: ant-contrib
@@ -31,6 +32,7 @@
BuildRequires: ant-nodeps
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
+BuildRequires: javapackages-local
BuildRequires: javapackages-tools
Requires: java >= 1.8
BuildArch: noarch
@@ -64,6 +66,11 @@
install -m 644 dist/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
ln -sf %{_javadir}/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+# pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom
+%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar
+
# Java doc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/javadoc %{buildroot}%{_javadocdir}/%{name}/
@@ -71,6 +78,12 @@
%files
%{_javadir}/*
+%{_mavenpomdir}/*
+%if %{defined _maven_repository}
+%{_mavendepmapfragdir}/%{name}
+%else
+%{_datadir}/maven-metadata/%{name}.xml*
+%endif
%files javadoc
%{_javadocdir}/%{name}
++ args4j-2.0.9.pom ++
http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
4.0.0
args4j
args4j-site
2.0.9
../pom.xml
args4j
args4j
src
test
src
**/*.properties
META-INF/services/*
junit
junit
3.8.1
test
commit args4j for openSUSE:Factory
Hello community,
here is the log from the commit of package args4j for openSUSE:Factory checked
in at 2018-07-07 21:59:02
Comparing /work/SRC/openSUSE:Factory/args4j (Old)
and /work/SRC/openSUSE:Factory/.args4j.new (New)
Package is "args4j"
Sat Jul 7 21:59:02 2018 rev:5 rq:620762 version:2.0.9
Changes:
--- /work/SRC/openSUSE:Factory/args4j/args4j.changes2017-09-15
22:31:48.347286372 +0200
+++ /work/SRC/openSUSE:Factory/.args4j.new/args4j.changes 2018-07-07
21:59:06.971263038 +0200
@@ -1,0 +2,6 @@
+Tue May 15 13:43:36 UTC 2018 - fst...@suse.com
+
+- Build with source and target 8 to prepare for a possible removal
+ of 1.6 compatibility
+
+---
Other differences:
--
++ args4j.spec ++
--- /var/tmp/diff_new_pack.de5ubU/_old 2018-07-07 21:59:07.863261908 +0200
+++ /var/tmp/diff_new_pack.de5ubU/_new 2018-07-07 21:59:07.867261902 +0200
@@ -1,7 +1,7 @@
#
# spec file for package args4j
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -30,8 +30,9 @@
BuildRequires: ant-junit
BuildRequires: ant-nodeps
BuildRequires: fdupes
+BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-tools
-Requires: java >= 1.6
+Requires: java >= 1.8
BuildArch: noarch
%description
@@ -56,7 +57,7 @@
%build
mkdir -p build/generated-sources
-ant -Djavac.source=1.6 -Djavac.target=1.6 -Dsource.encoding="ISO-8859-1"
+ant -Djavac.source=8 -Djavac.target=8 -Dsource.encoding="ISO-8859-1"
%install
install -d -m 0755 %{buildroot}%{_javadir}
commit args4j for openSUSE:Factory
Hello community,
here is the log from the commit of package args4j for openSUSE:Factory checked
in at 2017-09-15 22:31:47
Comparing /work/SRC/openSUSE:Factory/args4j (Old)
and /work/SRC/openSUSE:Factory/.args4j.new (New)
Package is "args4j"
Fri Sep 15 22:31:47 2017 rev:4 rq:526301 version:2.0.9
Changes:
--- /work/SRC/openSUSE:Factory/args4j/args4j.changes2016-07-05
09:51:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.args4j.new/args4j.changes 2017-09-15
22:31:48.347286372 +0200
@@ -1,0 +2,7 @@
+Fri Sep 15 08:25:38 UTC 2017 - fst...@suse.com
+
+- Fix build with jdk9: specify java source and target 1.6 and
+ correct encoding of source files
+- Clean spec file and fix rpmlint warning
+
+---
Other differences:
--
++ args4j.spec ++
--- /var/tmp/diff_new_pack.KGdARf/_old 2017-09-15 22:31:49.135175387 +0200
+++ /var/tmp/diff_new_pack.KGdARf/_new 2017-09-15 22:31:49.139174823 +0200
@@ -1,7 +1,7 @@
#
# spec file for package args4j
#
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,9 +29,9 @@
BuildRequires: ant-contrib
BuildRequires: ant-junit
BuildRequires: ant-nodeps
+BuildRequires: fdupes
BuildRequires: javapackages-tools
-Requires: java >= 1.5
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: java >= 1.6
BuildArch: noarch
%description
@@ -56,7 +56,7 @@
%build
mkdir -p build/generated-sources
-ant
+ant -Djavac.source=1.6 -Djavac.target=1.6 -Dsource.encoding="ISO-8859-1"
%install
install -d -m 0755 %{buildroot}%{_javadir}
@@ -66,13 +66,12 @@
# Java doc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/javadoc %{buildroot}%{_javadocdir}/%{name}/
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}/
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%changelog
commit args4j for openSUSE:Factory
Hello community,
here is the log from the commit of package args4j for openSUSE:Factory checked
in at 2016-07-05 09:51:39
Comparing /work/SRC/openSUSE:Factory/args4j (Old)
and /work/SRC/openSUSE:Factory/.args4j.new (New)
Package is "args4j"
Changes:
--- /work/SRC/openSUSE:Factory/args4j/args4j.changes2014-08-01
19:26:43.0 +0200
+++ /work/SRC/openSUSE:Factory/.args4j.new/args4j.changes 2016-07-05
09:51:41.0 +0200
@@ -1,0 +2,5 @@
+Fri Jul 1 16:54:44 UTC 2016 - toddrme2...@gmail.com
+
+- Fix Group tag.
+
+---
Other differences:
--
++ args4j.spec ++
--- /var/tmp/diff_new_pack.GCUuQ7/_old 2016-07-05 09:51:42.0 +0200
+++ /var/tmp/diff_new_pack.GCUuQ7/_new 2016-07-05 09:51:42.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package args4j
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
Release:0
Summary:Java commandline parser
License:MIT
-Group: Java/Development
+Group: Development/Libraries/Java
Url:http://args4j.kohsuke.org/
Source0:%{name}-%{version}.tar.bz2
BuildRequires: ant >= 1.7.0
