Use .mfiles generated during build
This commit is contained in:
parent
f99a351101
commit
6a6985682c
33
bsf.spec
33
bsf.spec
@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
Name: bsf
|
Name: bsf
|
||||||
Version: 2.4.0
|
Version: 2.4.0
|
||||||
Release: 17%{?dist}
|
Release: 18%{?dist}
|
||||||
Epoch: 0
|
Epoch: 0
|
||||||
Summary: Bean Scripting Framework
|
Summary: Bean Scripting Framework
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
@ -88,46 +88,41 @@ Javadoc for %{name}.
|
|||||||
%setup -q
|
%setup -q
|
||||||
# remove all binary libs
|
# remove all binary libs
|
||||||
find . -name "*.jar" -exec %{__rm} -f {} \;
|
find . -name "*.jar" -exec %{__rm} -f {} \;
|
||||||
%{__rm} -fr bsf
|
rm -fr bsf
|
||||||
|
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
|
|
||||||
export CLASSPATH=$(build-classpath apache-commons-logging xalan-j2 rhino)
|
export CLASSPATH=$(build-classpath apache-commons-logging xalan-j2 rhino)
|
||||||
ant jar
|
ant jar
|
||||||
%{__rm} -rf bsf/src/org/apache/bsf/engines/java
|
rm -rf bsf/src/org/apache/bsf/engines/java
|
||||||
ant javadocs
|
ant javadocs
|
||||||
|
|
||||||
%install
|
%install
|
||||||
# jar
|
# jar
|
||||||
%{__install} -d -m 755 %{buildroot}%{_javadir}
|
install -d -m 755 %{buildroot}%{_javadir}
|
||||||
%{__install} -m 644 build/lib/%{name}.jar \
|
install -m 644 build/lib/%{name}.jar \
|
||||||
%{buildroot}%{_javadir}/%{name}.jar
|
%{buildroot}%{_javadir}/%{name}.jar
|
||||||
# javadoc
|
# javadoc
|
||||||
%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
||||||
%{__cp} -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
|
cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
|
||||||
|
|
||||||
%{__install} -DTm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
install -DTm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
||||||
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.bsf:%{name}"
|
%add_maven_depmap -a "org.apache.bsf:%{name}"
|
||||||
|
|
||||||
%pre javadoc
|
%files -f .mfiles
|
||||||
# workaround for rpm bug, can be removed in F-20
|
|
||||||
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
|
|
||||||
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
|
|
||||||
|
|
||||||
%files
|
|
||||||
%doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
|
%doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
|
||||||
%{_javadir}/%{name}.jar
|
|
||||||
%{_mavenpomdir}/JPP-%{name}.pom
|
|
||||||
%{_mavendepmapfragdir}/%{name}
|
|
||||||
|
|
||||||
%files javadoc
|
%files javadoc
|
||||||
%doc LICENSE.txt NOTICE.txt
|
%doc LICENSE.txt NOTICE.txt
|
||||||
%{_javadocdir}/%{name}
|
%{_javadocdir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 21 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.4.0-18
|
||||||
|
- Use .mfiles generated during build
|
||||||
|
- Update to current packaging guidelines
|
||||||
|
|
||||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.4.0-17
|
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.4.0-17
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user