Author: pawelz Date: Thu Mar 26 22:28:25 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- don't build tests (it is very difficult to run tests without maven)
- dropped BR: junit
---- Files affected:
SPECS:
ical4j.spec (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SPECS/ical4j.spec
diff -u SPECS/ical4j.spec:1.2 SPECS/ical4j.spec:1.3
--- SPECS/ical4j.spec:1.2 Thu Mar 26 23:16:23 2009
+++ SPECS/ical4j.spec Thu Mar 26 23:28:19 2009
@@ -28,7 +28,6 @@
%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
%{?with_java_sun:BuildRequires: java-sun}
BuildRequires: jpackage-utils
-BuildRequires: junit
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
Requires: jpackage-utils
@@ -59,16 +58,16 @@
%setup -q -n %{srcname}-%{version}-%{_rc}
%build
-CLASSPATH=$(build-classpath commons-codec commons-lang commons-logging
commons-io junit)
+CLASSPATH=$(build-classpath commons-codec commons-lang commons-logging
commons-io)
install -d build
-%javac -classpath $CLASSPATH -source 1.4 -target 1.4 -d build $(find -name
'*.java')
+%javac -classpath $CLASSPATH -source 1.4 -target 1.4 -d build $(find source
-name '*.java')
-#%if %{with javadoc}
-#%javadoc -d apidocs \
-# %{?with_java_sun:net.fortuna.ical4j} \
-# $(find net/fortuna/ical4j -name '*.java')
-#%endif
+%if %{with javadoc}
+%javadoc -d apidocs \
+ %{?with_java_sun:net.fortuna.ical4j} \
+ $(find source/net/fortuna/ical4j -name '*.java')
+%endif
%jar -cf %{srcname}-%{version}.jar -C build .
@@ -79,11 +78,11 @@
ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
# javadoc
-#%if %{with javadoc}
-#install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
-#cp -a apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
-#ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost
symlink
-#%endif
+%if %{with javadoc}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost
symlink
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -96,12 +95,12 @@
%{_javadir}/%{srcname}-%{version}.jar
%{_javadir}/%{srcname}.jar
-#%if %{with javadoc}
-#%files javadoc
-#%defattr(644,root,root,755)
-#%{_javadocdir}/%{srcname}-%{version}
-#%ghost %{_javadocdir}/%{srcname}
-#%endif
+%if %{with javadoc}
+%files javadoc
+%defattr(644,root,root,755)
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -109,6 +108,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2009/03/26 22:28:19 pawelz
+- don't build tests (it is very difficult to run tests without maven)
+- dropped BR: junit
+
Revision 1.2 2009/03/26 22:16:23 paszczus
- changed name to java-ical4j, please do mv ical4j.spec java-ical4j.spec
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ical4j.spec?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
