|
|
Author: pcheung
Update of /cvs/dist/rpms/bcel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12222
Modified Files:
bcel.spec
Log Message:
More rpmlint cleanup
Index: bcel.spec
===================================================================
RCS file: /cvs/dist/rpms/bcel/devel/bcel.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- bcel.spec 16 Mar 2007 17:46:00 -0000 1.25
+++ bcel.spec 16 Apr 2007 18:25:54 -0000 1.26
@@ -112,8 +112,6 @@
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
-Requires(post): /bin/rm /bin/ln
-Requires(postun): /bin/rm
%description javadoc
%{summary}.
@@ -128,6 +126,7 @@
%package demo
Summary: Examples for %{name}
Group: Development/Libraries/Java
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description demo
%{summary}.
@@ -167,6 +166,9 @@
perl -p -i -e 's| depends=\"examples\"||g;' build.xml
touch manifest.txt
+# fix wrong-file-end-of-line-encoding
+sed -i 's/\r//' docs/verifier/V_API_SD.eps docs/eps/classloader.fig
+
%build
%if %{with_maven}
export DEPCAT=$(pwd)/bcel-5.1-depcat.new.xml
@@ -183,7 +185,7 @@
for p in $(find . -name project.xml); do
pushd $(dirname $p)
- cp project.xml project.xml.orig
+ cp -pr project.xml project.xml.orig
/usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
popd
done
@@ -221,8 +223,11 @@
%endif
# samples
-%__mkdir_p %{buildroot}%{_datadir}/%{name}-%{version}
-%__cp -pr examples/* %{buildroot}%{_datadir}/%{name}-%{version}
+%__mkdir_p %{buildroot}%{_datadir}/%{name}-%{version}/demo
+%__cp -pr examples/ %{buildroot}%{_datadir}/%{name}-%{version}/demo/
+#TODO: need some kind of doc for the demo package for instructions on how to
+# build and run the demos.
+
# manual
%__mkdir_p %{buildroot}%{_docdir}/%{name}-%{version}
%if %{with_maven}
@@ -230,6 +235,7 @@
%else
%__cp -pr docs/* %{buildroot}%{_docdir}/%{name}-%{version}
%endif
+%__cp -pr LICENSE.txt %{buildroot}%{_docdir}/%{name}-%{version}/
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
@@ -256,7 +262,7 @@
%files
%defattr(0644,root,root,0755)
-%doc LICENSE.txt
+%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
%{_javadir}/*
%if %{gcj_support}
@@ -273,12 +279,12 @@
%files demo
%defattr(0644,root,root,0755)
-%{_datadir}/%{name}-%{version}
+%{_datadir}/%{name}-%{version}/demo
# -----------------------------------------------------------------------------
%changelog
-* Fri Mar 16 2007 Permaine Cheung <pcheung at redhat.com> 0:5.1-10jpp.1
+* Fri Apr 13 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@xxxxxxxxx> 0:5.1-10jpp
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|