Move normal jar from javajnidir to javadir

This commit is contained in:
Stanislav Ochotnicky 2012-12-12 09:51:08 +01:00
parent 37795a0726
commit b9c26b9252

View File

@ -7,7 +7,7 @@
Name: jansi-native
Version: 1.4
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Jansi Native implements the JNI Libraries used by the Jansi project
Group: Development/Libraries
License: ASL 2.0
@ -68,9 +68,9 @@ mvn-rpmbuild install javadoc:aggregate
%install
# JAR
mkdir -p $RPM_BUILD_ROOT%{_jnidir}
mkdir -p $RPM_BUILD_ROOT%{_javajnidir}
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javajnidir}/%{name}.jar
cp -p target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
cp -p target/%{name}-%{version}-linux%{bits}.jar $RPM_BUILD_ROOT%{_jnidir}/%{name}-linux.jar
# JAVADOC
@ -89,7 +89,7 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%{_jnidir}/*
%{_javajnidir}/*
%{_javadir}/*
%doc readme.md license.txt changelog.md
%files javadoc
@ -97,6 +97,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%doc license.txt
%changelog
* Wed Dec 12 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.4-2
- Move normal jar from javajnidir to javadir
* Wed Sep 19 2012 Marek Goldmann <mgoldman@redhat.com> - 1.4-1
- Upstream release 1.4
- Fixing "archiver requires 'AM_PROG_AR' in 'configure.ac'" error