Author: glen Date: Sun Nov 18 17:29:22 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- unify fixed deps
---- Files affected:
SPECS:
httpunit.spec (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SPECS/httpunit.spec
diff -u SPECS/httpunit.spec:1.6 SPECS/httpunit.spec:1.7
--- SPECS/httpunit.spec:1.6 Sun Nov 18 18:24:02 2007
+++ SPECS/httpunit.spec Sun Nov 18 18:29:17 2007
@@ -16,21 +16,22 @@
Patch2: %{name}-servlettest.patch
Patch3: %{name}-java15.patch
URL: http://httpunit.sourceforge.net/
-BuildRequires: jaf >= 0:1.0.1
+# As of 1.5, requires either nekohtml or jtidy, and prefers nekohtml.
BuildRequires: ant
+BuildRequires: jaf >= 0:1.0.1
BuildRequires: jakarta-servletapi
BuildRequires: javamail >= 0:1.2
BuildRequires: jtidy
-BuildRequires: junit >= 3.8
BuildRequires: junit < 4.0
+BuildRequires: junit >= 3.8
# nekohtml broken
#BuildRequires: nekohtml
BuildRequires: rhino
BuildRequires: unzip
Requires: jaxp_parser_impl
+Requires: jtidy
Requires: junit >= 0:3.8
-# As of 1.5, requires either nekohtml or jtidy, and prefers nekohtml.
-Requires: nekohtml
+#Requires: nekohtml
Requires: rhino
Requires: servlet23
BuildArch: noarch
@@ -114,44 +115,34 @@
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
-cp -p lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-
-# Jar versioning
-cd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}.jar; do
- ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
-done
-cd -
+cp -a lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# Javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
# Avoid having api in manual
-rm -rf doc/api
-
+rm -rf manual
+cp -a doc manual
+rm -rf manual/api
# Fix link between manual and javadoc
-ln -sf %{_javadocdir}/%{name}-%{version} doc/api
+ln -sf %{_javadocdir}/%{name}-%{version} manual/api
# Demo
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -p examples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -p lib/%{name}-test.jar \
+cp -a examples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -a lib/%{name}-test.jar \
$RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-test-%{version}.jar
-cp -p lib/%{name}-examples.jar \
+cp -a lib/%{name}-examples.jar \
$RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-examples-%{version}.jar
%clean
rm -rf $RPM_BUILD_ROOT
%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ $1 -eq 0 ]; then
- rm -f %{_javadocdir}/%{name}
-fi
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
%files
%defattr(644,root,root,755)
@@ -160,10 +151,11 @@
%files javadoc
%defattr(644,root,root,755)
%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
%files manual
%defattr(644,root,root,755)
-%doc doc/*
+%doc manual/*
%files demo
%defattr(644,root,root,755)
@@ -175,6 +167,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2007-11-18 17:29:17 glen
+- unify fixed deps
+
Revision 1.6 2007-11-18 17:24:02 glen
- does not compile with newer junit
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/httpunit.spec?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
