Accepting request 908676 from Java:packages
Duplicate section removal OBS-URL: https://build.opensuse.org/request/show/908676 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mysql-connector-java?expand=0&rev=34
This commit is contained in:
commit
18922aea2a
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 26 08:32:25 UTC 2021 - Andreas Schwab <schwab@suse.de>
|
||||||
|
|
||||||
|
- Remove duplicate %files section
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jul 19 09:38:50 UTC 2021 - Johannes Grassler <johannes.grassler@suse.com>
|
Mon Jul 19 09:38:50 UTC 2021 - Johannes Grassler <johannes.grassler@suse.com>
|
||||||
|
|
||||||
|
@ -35,7 +35,6 @@ BuildRequires: geronimo-jta-1_1-api
|
|||||||
BuildRequires: git
|
BuildRequires: git
|
||||||
BuildRequires: java-devel >= 1.8
|
BuildRequires: java-devel >= 1.8
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
BuildRequires: javapackages-tools >= 5.3.1
|
|
||||||
BuildRequires: javassist >= 3.23.1
|
BuildRequires: javassist >= 3.23.1
|
||||||
BuildRequires: junit
|
BuildRequires: junit
|
||||||
BuildRequires: log4j12-mini
|
BuildRequires: log4j12-mini
|
||||||
@ -113,25 +112,4 @@ sed -i 's/-SNAPSHOT//' %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
|||||||
%license LICENSE
|
%license LICENSE
|
||||||
%doc CHANGES README
|
%doc CHANGES README
|
||||||
|
|
||||||
# -Dcom.mysql.cj.build.jdk.javac=/usr/lib64/jvm/java-1.8.0/bin/javac \
|
|
||||||
# -Dcom.mysql.cj.build.jdk.java=/usr/lib64/jvm/java-1.8.0/bin/java \
|
|
||||||
dist
|
|
||||||
|
|
||||||
install -d -m 755 %{buildroot}%{_javadir}
|
|
||||||
|
|
||||||
install build/%{name}-%{version}-SNAPSHOT/%{name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}.jar
|
|
||||||
|
|
||||||
rm -rf %{buildroot}%{name}-%{version}/docs/release-test-output
|
|
||||||
|
|
||||||
# Install the Maven build information
|
|
||||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
|
||||||
install -pm 644 build/%{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 %{name}.jar
|
|
||||||
|
|
||||||
%files -f .mfiles
|
|
||||||
%license LICENSE
|
|
||||||
%doc CHANGES README
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user