saxon dependency removed - not needed
minor spec file changes according to the latest guidelines
This commit is contained in:
parent
21b5a92c18
commit
4b15a53e94
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: apache-%{short_name}
|
Name: apache-%{short_name}
|
||||||
Version: 3.2.1
|
Version: 3.2.1
|
||||||
Release: 12%{?dist}
|
Release: 13%{?dist}
|
||||||
Summary: Provides new interfaces, implementations and utilities for Java Collections
|
Summary: Provides new interfaces, implementations and utilities for Java Collections
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
@ -31,13 +31,9 @@ BuildRequires: maven-plugin-bundle
|
|||||||
BuildRequires: maven-surefire-plugin
|
BuildRequires: maven-surefire-plugin
|
||||||
BuildRequires: maven-surefire-provider-junit
|
BuildRequires: maven-surefire-provider-junit
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: saxon
|
|
||||||
BuildRequires: saxon-scripts
|
|
||||||
BuildRequires: apache-commons-parent
|
BuildRequires: apache-commons-parent
|
||||||
Requires: java
|
Requires: java
|
||||||
Requires: jpackage-utils
|
Requires: jpackage-utils
|
||||||
Requires(post): jpackage-utils
|
|
||||||
Requires(postun): jpackage-utils
|
|
||||||
|
|
||||||
Provides: jakarta-%{short_name} = %{version}-%{release}
|
Provides: jakarta-%{short_name} = %{version}-%{release}
|
||||||
Obsoletes: jakarta-%{short_name} < %{version}-%{release}
|
Obsoletes: jakarta-%{short_name} < %{version}-%{release}
|
||||||
@ -112,18 +108,22 @@ mvn-rpmbuild install javadoc:aggregate
|
|||||||
ant tf.javadoc
|
ant tf.javadoc
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
|
||||||
# jars
|
# jars
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
|
install -Dm 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
|
install -Dm 644 target/%{short_name}-testframework-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-testframework.jar
|
||||||
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
|
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
|
||||||
%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
|
|
||||||
%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
|
|
||||||
install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
|
# poms
|
||||||
install -m 644 target/%{short_name}-testframework-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-testframework.jar
|
install -Dpm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
|
||||||
|
|
||||||
|
|
||||||
|
# fragments
|
||||||
|
%add_maven_depmap -a "org.apache.commons:%{short_name}" JPP-%{short_name}.pom %{short_name}.jar
|
||||||
%add_to_maven_depmap org.apache.commons %{short_name}-testframework %{version} JPP %{short_name}-testframework
|
%add_to_maven_depmap org.apache.commons %{short_name}-testframework %{version} JPP %{short_name}-testframework
|
||||||
%add_to_maven_depmap %{short_name} %{short_name}-testframework %{version} JPP %{short_name}-testframework
|
%add_to_maven_depmap %{short_name} %{short_name}-testframework %{version} JPP %{short_name}-testframework
|
||||||
|
|
||||||
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
|
|
||||||
|
|
||||||
# javadoc
|
# javadoc
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
||||||
@ -131,42 +131,38 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
|||||||
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||||
rm -rf target/site/apidocs
|
rm -rf target/site/apidocs
|
||||||
|
|
||||||
|
|
||||||
# testframework-javadoc
|
# testframework-javadoc
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework-%{version}
|
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework-%{version}
|
||||||
cp -pr build/docs/testframework/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework-%{version}
|
cp -pr build/docs/testframework/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework-%{version}
|
||||||
ln -s %{name}-testframework-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework
|
ln -s %{name}-testframework-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework
|
||||||
|
|
||||||
|
|
||||||
%post
|
|
||||||
%update_maven_depmap
|
|
||||||
|
|
||||||
%postun
|
|
||||||
%update_maven_depmap
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc PROPOSAL.html README.txt LICENSE.txt RELEASE-NOTES.html NOTICE.txt
|
%doc PROPOSAL.html README.txt LICENSE.txt RELEASE-NOTES.html NOTICE.txt
|
||||||
%{_mavenpomdir}/*
|
%{_mavenpomdir}/JPP-%{short_name}.pom
|
||||||
%{_mavendepmapfragdir}/*
|
%{_mavendepmapfragdir}/%{name}
|
||||||
%{_javadir}/%{name}.jar
|
%{_javadir}/%{name}.jar
|
||||||
%{_javadir}/%{short_name}.jar
|
%{_javadir}/%{short_name}.jar
|
||||||
|
|
||||||
%files testframework
|
%files testframework
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_javadir}/%{name}-testframework.jar
|
%{_javadir}/%{name}-testframework.jar
|
||||||
%{_javadir}/%{short_name}-testframework.jar
|
%{_javadir}/%{short_name}-testframework.jar
|
||||||
|
|
||||||
%files javadoc
|
%files javadoc
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_javadocdir}/%{name}-%{version}
|
%{_javadocdir}/%{name}-%{version}
|
||||||
%{_javadocdir}/%{name}
|
%{_javadocdir}/%{name}
|
||||||
|
|
||||||
%files testframework-javadoc
|
%files testframework-javadoc
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_javadocdir}/%{name}-testframework-%{version}
|
%{_javadocdir}/%{name}-testframework-%{version}
|
||||||
%{_javadocdir}/%{name}-testframework
|
%{_javadocdir}/%{name}-testframework
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 08 2012 Jaromir Capik <jcapik@redhat.com> 3.2.1-13
|
||||||
|
- saxon dependency removed - not needed
|
||||||
|
- minor spec file changes according to the latest guidelines
|
||||||
|
|
||||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-12
|
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-12
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user