- Merge with upstream version and rpmlint cleanup, fix BR
This commit is contained in:
parent
23920548de
commit
4deac04d84
13
bcel.spec
13
bcel.spec
@ -219,7 +219,6 @@ ant -Dbuild.dest=build/classes -Dbuild.dir=build \
|
||||
%__cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
|
||||
%__rm -rf docs/api
|
||||
%endif
|
||||
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink
|
||||
|
||||
# samples
|
||||
%__mkdir_p %{buildroot}%{_datadir}/%{name}-%{version}
|
||||
@ -239,15 +238,6 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink
|
||||
%clean
|
||||
%__rm -rf %{buildroot}
|
||||
|
||||
%post javadoc
|
||||
%__rm -f %{_javadocdir}/%{name}
|
||||
%__ln_s %{name}-%{version} %{_javadocdir}/%{name}
|
||||
|
||||
%postun javadoc
|
||||
if [ "$1" = "0" ]; then
|
||||
%__rm -f %{_javadocdir}/%{name}
|
||||
fi
|
||||
|
||||
%if %{gcj_support}
|
||||
%post
|
||||
if [ -x %{_bindir}/rebuild-gcj-db ]
|
||||
@ -276,7 +266,6 @@ fi
|
||||
%files javadoc
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadocdir}/%{name}-%{version}
|
||||
%ghost %doc %{_javadocdir}/%{name}
|
||||
|
||||
%files manual
|
||||
%defattr(0644,root,root,0755)
|
||||
@ -289,7 +278,7 @@ fi
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Thu Mar 08 2007 Permaine Cheung <pcheung at redhat.com> 0:5.1-10jpp.1
|
||||
* Fri Mar 16 2007 Permaine Cheung <pcheung at redhat.com> 0:5.1-10jpp.1
|
||||
- Merge with upstream version and rpmlint cleanup, fix BR
|
||||
|
||||
* Fri Feb 09 2007 Ralph Apel <r.apel@r-apel.de> 0:5.1-10jpp
|
||||
|
||||
Loading…
Reference in New Issue
Block a user