Fridrich Strba 2022-04-27 07:46:01 +00:00 committed by Git OBS Bridge
parent 14851782bb
commit 813e714f42
2 changed files with 17 additions and 7 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Apr 27 07:43:03 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Remove links between artifacts and their parent since we are
not building with maven
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 29 14:35:14 UTC 2021 - David Anes <david.anes@suse.com> Wed Dec 29 14:35:14 UTC 2021 - David Anes <david.anes@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package cglib # spec file for package cglib
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -32,13 +32,13 @@ BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: objectweb-asm >= 5 BuildRequires: objectweb-asm >= 5
Requires: mvn(org.ow2.asm:asm)
Provides: %{name}-nohook = %{version}-%{release} Provides: %{name}-nohook = %{version}-%{release}
Obsoletes: %{name}-nohook < %{version}-%{release} Obsoletes: %{name}-nohook < %{version}-%{release}
Requires: mvn(org.ow2.asm:asm)
BuildArch: noarch BuildArch: noarch
%if %{with tests} %if %{with tests}
BuildConflicts: java-devel >= 9
BuildRequires: ant-junit BuildRequires: ant-junit
BuildConflicts: java-devel >= 9
%endif %endif
%description %description
@ -79,12 +79,18 @@ runtime.
%pom_remove_plugin org.apache.maven.plugins:maven-jarsigner-plugin cglib-sample %pom_remove_plugin org.apache.maven.plugins:maven-jarsigner-plugin cglib-sample
%pom_remove_plugin -r :maven-javadoc-plugin %pom_remove_plugin -r :maven-javadoc-plugin
%pom_remove_parent %pom_remove_dep -r junit:junit
%pom_change_dep ::::: ::::: cglib cglib-sample
for i in %{name} %{name}-sample; do
%pom_remove_parent ${i}
%pom_xpath_inject pom:project "<groupId>cglib</groupId><version>%{version}</version>" ${i}
done
%build %build
mkdir -p lib mkdir -p lib
build-jar-repository -s -p lib objectweb-asm/asm ant/ant ant/ant-launcher build-jar-repository -s -p lib objectweb-asm/asm ant/ant ant/ant-launcher
%ant \ %{ant} \
%if %{without tests} %if %{without tests}
-Dtest.skip=true \ -Dtest.skip=true \
%endif %endif
@ -100,8 +106,6 @@ install -pm 0644 %{name}-sample/target/%{name}-sample-%{version}.jar %{buildroot
# poms # poms
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-parent.pom
%add_maven_depmap %{name}/%{name}-parent.pom
install -pm 0644 %{name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom install -pm 0644 %{name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -a "net.sf.cglib:cglib,cglib:cglib-full,cglib:cglib-nodep,org.sonatype.sisu.inject:cglib" %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -a "net.sf.cglib:cglib,cglib:cglib-full,cglib:cglib-nodep,org.sonatype.sisu.inject:cglib"
install -pm 0644 %{name}-sample/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-sample.pom install -pm 0644 %{name}-sample/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-sample.pom