forked from pool/mysql-connector-java
Accepting request 1113426 from Java:packages
Avoid producing dupplicate maven data OBS-URL: https://build.opensuse.org/request/show/1113426 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mysql-connector-java?expand=0&rev=46
This commit is contained in:
commit
9fc9d77cc2
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 25 09:45:21 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Avoid producing dupplicate maven data
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 7 08:08:24 UTC 2023 - David Anes <david.anes@suse.com>
|
||||
|
||||
|
@ -127,22 +127,19 @@ export CLASSPATH=$(build-classpath \
|
||||
install -d -m 755 %{buildroot}%{_javadir}
|
||||
|
||||
install build/%{new_name}-%{version}-SNAPSHOT/%{new_name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{new_name}.jar
|
||||
ln -sf %{_javadir}/%{new_name}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
|
||||
rm -rf %{buildroot}%{new_name}-%{version}/docs/release-test-output
|
||||
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||
|
||||
# Install the Maven build information as new name
|
||||
install -pm 644 build/%{new_name}-%{version}-SNAPSHOT/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{new_name}.pom
|
||||
%mvn_install_pom build/%{new_name}-%{version}-SNAPSHOT/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{new_name}.pom
|
||||
sed -i 's/-SNAPSHOT//' %{buildroot}%{_mavenpomdir}/JPP-%{new_name}.pom
|
||||
%add_maven_depmap JPP-%{new_name}.pom %{new_name}.jar
|
||||
|
||||
# Provide poms with "old name" mysql-connector-java (now it's mysql-connector-j)
|
||||
install -pm 644 build/%{new_name}-%{version}-SNAPSHOT/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
||||
sed -i 's/-SNAPSHOT//' %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
||||
%add_maven_depmap JPP-%{name}.pom %{new_name}.jar
|
||||
%add_maven_depmap JPP-%{new_name}.pom %{new_name}.jar -a com.mysql:%{name}
|
||||
|
||||
%files -f .mfiles
|
||||
%{_javadir}/%{name}.jar
|
||||
%license LICENSE
|
||||
%doc CHANGES README
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user