diff --git a/felix-parent-6-source-release.tar.gz b/felix-parent-6-source-release.tar.gz deleted file mode 100644 index 232acc4..0000000 --- a/felix-parent-6-source-release.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f88a8d17f278125553b8e2ed6f4e9420682d457996cbf37ea95adb24526a479f -size 8013 diff --git a/felix-parent-8-source-release.tar.gz b/felix-parent-8-source-release.tar.gz new file mode 100644 index 0000000..993317a --- /dev/null +++ b/felix-parent-8-source-release.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5adb447676639ee848040f9df3edf412d63fc465a64bdfb7477b77a09a7f3a30 +size 7794 diff --git a/felix-parent.spec b/felix-parent.spec index 164fe02..7a64de4 100644 --- a/felix-parent.spec +++ b/felix-parent.spec @@ -1,7 +1,7 @@ # # spec file for package felix-parent # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,14 @@ Name: felix-parent -Version: 6 +Version: 8 Release: 0 Summary: Parent POM file for Apache Felix Specs License: Apache-2.0 Group: Development/Libraries/Java -URL: http://felix.apache.org/ -Source0: http://repo1.maven.org/maven2/org/apache/felix/felix-parent/%{version}/%{name}-%{version}-source-release.tar.gz -BuildRequires: javapackages-local +URL: https://felix.apache.org/ +Source0: https://repo1.maven.org/maven2/org/apache/felix/felix-parent/%{version}/%{name}-%{version}-source-release.tar.gz +BuildRequires: javapackages-local >= 6 BuildRequires: mvn(org.apache:apache:pom:) Requires: mvn(org.apache:apache:pom:) BuildArch: noarch @@ -37,7 +37,6 @@ Parent POM file for Apache Felix Specs. %pom_remove_plugin :maven-javadoc-plugin %pom_remove_plugin :maven-site-plugin %pom_remove_plugin :maven-release-plugin -%pom_remove_plugin org.codehaus.mojo:ianal-maven-plugin %pom_remove_plugin :apache-rat-plugin %pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :maven-enforcer-plugin @@ -46,15 +45,13 @@ Parent POM file for Apache Felix Specs. %pom_xpath_remove pom:extensions %pom_xpath_remove pom:project/pom:parent/pom:relativePath -%pom_xpath_set "pom:project/pom:properties/pom:felix.java.version" "8" - %build %install # pom install -d -m 755 %{buildroot}%{_mavenpomdir} -install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom -%add_maven_depmap %{name}-%{version}.pom -a org.apache.felix:felix +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom -a org.apache.felix:felix %files -f .mfiles %license LICENSE