Compare commits

...

No commits in common. "c9s" and "c8" have entirely different histories.
c9s ... c8

4 changed files with 8 additions and 66 deletions

View File

@ -1 +1 @@
d7fcf106051e0e1b800558f3523aa4297853d0fb org.apache.felix.gogo.runtime-1.1.4-source-release.tar.gz
0438ec17b26bd3a6179eef18e74e8a7ac9f8b809 SOURCES/org.apache.felix.gogo.runtime-1.1.0-source-release.tar.gz

7
.gitignore vendored
View File

@ -1,6 +1 @@
/org.apache.felix.gogo.runtime-0.10.0-project.tar.gz
/org.apache.felix.gogo.runtime-0.12.1-project.tar.gz
/org.apache.felix.gogo.runtime-0.16.2-project.tar.gz
/org.apache.felix.gogo.runtime-1.0.4-source-release.tar.gz
/org.apache.felix.gogo.runtime-1.1.0-source-release.tar.gz
/org.apache.felix.gogo.runtime-1.1.4-source-release.tar.gz
SOURCES/org.apache.felix.gogo.runtime-1.1.0-source-release.tar.gz

View File

@ -1,9 +1,7 @@
%global bundle org.apache.felix.gogo.runtime
%bcond_without tests
Name: felix-gogo-runtime
Version: 1.1.4
Version: 1.1.0
Release: 3%{?dist}
Summary: Apache Felix Gogo command line shell for OSGi
# One file is also MIT licensed:
@ -16,15 +14,12 @@ Source0: http://archive.apache.org/dist/felix/%{bundle}-%{version}-source
BuildArch: noarch
BuildRequires: maven-local
BuildRequires: mvn(org.apache.felix:gogo-parent:pom:) >= 5
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.felix:gogo-parent:pom:) >= 4
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.osgi:osgi.annotation)
BuildRequires: mvn(org.mockito:mockito-core)
BuildRequires: mvn(org.osgi:osgi.cmpn)
BuildRequires: mvn(org.osgi:osgi.core)
%if %{with tests}
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.mockito:mockito-core)
%endif
%description
Apache Felix Gogo is a subproject of Apache Felix implementing a command
@ -39,27 +34,10 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{bundle}-%{version}
# Use compendium dep
%pom_remove_dep :org.osgi.namespace.service
%pom_remove_dep :org.osgi.service.component.annotations
%pom_remove_dep :org.osgi.service.event
%pom_xpath_inject "pom:dependencies" "
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
</dependency>"
# Remove 2 failing assertions on Java 11 in TestParser.testPipe()
sed -i '/(echoout/ d' src/test/java/org/apache/felix/gogo/runtime/TestParser.java
%mvn_file : felix/%{bundle}
%build
%if %{with tests}
%mvn_build -- -Dsource=1.8 -DdetectJavaApiLink=false
%else
%mvn_build -f -- -Dsource=1.8 -DdetectJavaApiLink=false
%endif
%mvn_build
%install
%mvn_install
@ -71,39 +49,9 @@ sed -i '/(echoout/ d' src/test/java/org/apache/felix/gogo/runtime/TestParser.jav
%license LICENSE NOTICE
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.4-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.4-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Sat Mar 06 2021 Mat Booth <mat.booth@redhat.com> - 1.1.4-1
- Update to latest upstream release
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.1.0-7
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Fri Jun 26 2020 Roland Grunberg <rgrunber@redhat.com> - 1.1.0-6
- Set source/target to 1.8 for Java 11 build.
- Disable Java API link detection for javadoc generation as this fails.
- Disable some assertions in TestParser.testPipe() that fail on Java 11.
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Dec 12 2019 Mat Booth <mat.booth@redhat.com> - 1.1.0-4
* Mon Jul 01 2019 Mat Booth <mat.booth@redhat.com> - 1.1.0-3
- Fix license tag to include MIT
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -1 +0,0 @@
SHA512 (org.apache.felix.gogo.runtime-1.1.4-source-release.tar.gz) = 96ca48ee46e4968762ad9fcfc704e92e7dd2064ad3820c931a89893a8daf31523a35fbe87228e65750ba481f959bdeebc00a0ad346513eec51a9d0b77bc2ade7