diff --git a/.gitignore b/.gitignore index 192c904..6a9117d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/commons-net-3.6-src.tar.gz +SOURCES/commons-net-3.2-src.tar.gz diff --git a/apache-commons-net.spec b/apache-commons-net.spec index 6d77ca1..81dd154 100644 --- a/apache-commons-net.spec +++ b/apache-commons-net.spec @@ -3,20 +3,23 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 3.6 -Release: 3%{?dist} +Version: 3.2 +Release: 8%{?dist} Summary: Internet protocol suite Java library License: ASL 2.0 +Group: Development/Libraries URL: http://commons.apache.org/%{base_name}/ -Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.commons:commons-parent:pom:) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.codehaus.mojo:exec-maven-plugin) +BuildRequires: maven-plugin-build-helper +BuildRequires: apache-commons-parent >= 26-7 +# Test dependency +BuildRequires: junit + +Provides: jakarta-%{short_name} = 0:%{version}-%{release} +Obsoletes: jakarta-%{short_name} < 0:2.0-3 %description @@ -28,17 +31,21 @@ fundamental protocol access, not higher-level abstractions. %package javadoc Summary: API documentation for %{name} +Group: Documentation +Requires: jpackage-utils + +Provides: jakarta-%{short_name}-javadoc = 0:%{version}-%{release} +Obsoletes: jakarta-%{short_name}-javadoc < 0:2.0-3 %description javadoc %{summary}. %prep %setup -q -n %{short_name}-%{version}-src +sed -i 's/\r//' NOTICE.txt LICENSE.txt README RELEASE-NOTES.txt # This test fails with "Connection timed out" rm src/test/java/org/apache/commons/net/time/TimeTCPClientTest.java -# Fails in Koji with "Address already in use" -rm src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java %mvn_file : %{short_name} %{name} %mvn_alias : org.apache.commons:%{short_name} @@ -51,57 +58,21 @@ rm src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java %files -f .mfiles -%doc README.md RELEASE-NOTES.txt -%license LICENSE.txt NOTICE.txt +%doc LICENSE.txt NOTICE.txt README RELEASE-NOTES.txt %files javadoc -f .mfiles-javadoc -%license LICENSE.txt NOTICE.txt +%doc LICENSE.txt NOTICE.txt %changelog -* Wed Feb 07 2018 Fedora Release Engineering - 3.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Fri Dec 27 2013 Daniel Mach - 3.2-8 +- Mass rebuild 2013-12-27 -* Wed Jul 26 2017 Fedora Release Engineering - 3.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild +* Fri Sep 20 2013 Mikolaj Izdebski - 3.2-7 +- Add BuildRequires on apache-commons-parent >= 26-7 -* Tue Mar 28 2017 Michael Simacek - 3.6-1 -- Update to upstream version 3.6 - -* Fri Feb 10 2017 Fedora Release Engineering - 3.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu May 5 2016 Mikolaj Izdebski - 3.5-1 -- Update to upstream version 3.5 - -* Wed Feb 03 2016 Fedora Release Engineering - 3.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Jan 4 2016 Mikolaj Izdebski - 3.4-2 -- Add workaround for suprious test failure (NET-586) - -* Fri Nov 27 2015 Mikolaj Izdebski - 3.4-1 -- Update to upstream version 3.4 - -* Tue Aug 04 2015 Michael Simacek - 3.3-7 -- Disable failing test - -* Wed Jun 17 2015 Fedora Release Engineering - 3.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Oct 14 2014 Mikolaj Izdebski - 3.3-5 -- Remove legacy Obsoletes/Provides for jakarta-commons - -* Sat Jun 07 2014 Fedora Release Engineering - 3.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 04 2014 Stanislav Ochotnicky - 3.3-3 -- Use Requires: java-headless rebuild (#1067528) - -* Sat Aug 03 2013 Fedora Release Engineering - 3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jun 12 2013 Mikolaj Izdebski - 3.3-1 -- Update to upstream version 3.3 +* Fri Jun 28 2013 Mikolaj Izdebski - 3.2-6 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 * Wed Jun 05 2013 Michal Srb - 3.2-5 - Enable tests diff --git a/sources b/sources index d422087..6ff2723 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-net-3.6-src.tar.gz) = 1ba892ec555820611b7838cb71ab61e053a66da5d1dfe9818726d45198c639622858f1afb7ad0e4e02573219de6884feba1026ea9ae7ba554a531d1ad1d1c46f +SHA1 (commons-net-3.2-src.tar.gz) = 2569b6572cbfd36ef7e80e73b12123d69d6c5fa4