Drop "-SNAPSHOT" from version ID
- See: https://lists.fedoraproject.org/pipermail/java-devel/2013-August/004923.html
This commit is contained in:
parent
ae622ffb4b
commit
4d8725748d
18
junit.spec
18
junit.spec
@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
Name: junit
|
Name: junit
|
||||||
Version: 4.11
|
Version: 4.11
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
Epoch: 0
|
Epoch: 0
|
||||||
Summary: Java regression test package
|
Summary: Java regression test package
|
||||||
License: CPL
|
License: CPL
|
||||||
@ -105,18 +105,18 @@ cp build/maven/junit-pom-template.xml pom.xml
|
|||||||
ln -s $(build-classpath hamcrest/core) lib/hamcrest-core-1.3.jar
|
ln -s $(build-classpath hamcrest/core) lib/hamcrest-core-1.3.jar
|
||||||
|
|
||||||
%build
|
%build
|
||||||
ant dist
|
ant dist -Dversion-status=
|
||||||
|
|
||||||
# inject OSGi manifest
|
# inject OSGi manifest
|
||||||
mkdir -p META-INF
|
mkdir -p META-INF
|
||||||
cp -p %{SOURCE2} META-INF/MANIFEST.MF
|
cp -p %{SOURCE2} META-INF/MANIFEST.MF
|
||||||
touch META-INF/MANIFEST.MF
|
touch META-INF/MANIFEST.MF
|
||||||
zip -u %{name}%{version}-SNAPSHOT/%{name}-%{version}-SNAPSHOT.jar META-INF/MANIFEST.MF
|
zip -u %{name}%{version}/%{name}-%{version}.jar META-INF/MANIFEST.MF
|
||||||
|
|
||||||
%install
|
%install
|
||||||
# jars
|
# jars
|
||||||
install -d -m 755 %{buildroot}%{_javadir}
|
install -d -m 755 %{buildroot}%{_javadir}
|
||||||
install -m 644 %{name}%{version}-SNAPSHOT/%{name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}.jar
|
install -m 644 %{name}%{version}/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||||
# Many packages still use the junit4.jar directly
|
# Many packages still use the junit4.jar directly
|
||||||
ln -s %{_javadir}/%{name}.jar %{buildroot}%{_javadir}/%{name}4.jar
|
ln -s %{_javadir}/%{name}.jar %{buildroot}%{_javadir}/%{name}4.jar
|
||||||
|
|
||||||
@ -127,12 +127,12 @@ install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
|||||||
|
|
||||||
# javadoc
|
# javadoc
|
||||||
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
||||||
cp -pr %{name}%{version}-SNAPSHOT/javadoc/* %{buildroot}%{_javadocdir}/%{name}
|
cp -pr %{name}%{version}/javadoc/* %{buildroot}%{_javadocdir}/%{name}
|
||||||
|
|
||||||
# demo
|
# demo
|
||||||
install -d -m 755 %{buildroot}%{_datadir}/%{name}/demo/%{name}
|
install -d -m 755 %{buildroot}%{_datadir}/%{name}/demo/%{name}
|
||||||
|
|
||||||
cp -pr %{name}%{version}-SNAPSHOT/%{name}/* %{buildroot}%{_datadir}/%{name}/demo/%{name}
|
cp -pr %{name}%{version}/%{name}/* %{buildroot}%{_datadir}/%{name}/demo/%{name}
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
@ -152,9 +152,13 @@ cp -pr %{name}%{version}-SNAPSHOT/%{name}/* %{buildroot}%{_datadir}/%{name}/demo
|
|||||||
|
|
||||||
%files manual
|
%files manual
|
||||||
%doc LICENSE README CODING_STYLE
|
%doc LICENSE README CODING_STYLE
|
||||||
%doc junit%{version}-SNAPSHOT/doc/*
|
%doc junit%{version}/doc/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Aug 23 2013 Michal Srb <msrb@redhat.com> - 0:4.11-7
|
||||||
|
- Drop "-SNAPSHOT" from version ID
|
||||||
|
- See: https://lists.fedoraproject.org/pipermail/java-devel/2013-August/004923.html
|
||||||
|
|
||||||
* Mon Aug 19 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:4.11-6
|
* Mon Aug 19 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:4.11-6
|
||||||
- Fix version in pom.xml (#998266)
|
- Fix version in pom.xml (#998266)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user