Author: pawelz Date: Tue Mar 31 19:45:24 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- P/O after changing name
- build javadoc
- simplified installation of demo
- remove binnaries provided with tarball
---- Files affected:
SPECS:
java-jdom.spec (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SPECS/java-jdom.spec
diff -u SPECS/java-jdom.spec:1.2 SPECS/java-jdom.spec:1.3
--- SPECS/java-jdom.spec:1.2 Tue Mar 31 20:11:48 2009
+++ SPECS/java-jdom.spec Tue Mar 31 21:45:19 2009
@@ -1,6 +1,7 @@
# $Revision$, $Date$
#
# Conditional build:
+%bcond_without javadoc # don't build javadoc
%if "%{pld_release}" == "ti"
%bcond_without java_sun # build with gcj
%else
@@ -30,6 +31,8 @@
BuildRequires: rpmbuild(macros) >= 1.300
Requires: jpackage-utils
Requires: jre
+Provides: jdom
+Obsoletes: jdom
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,9 +54,10 @@
%package demo
Summary: Demo for %{srcname}
-Summary(pl.UTF-8): Pliki demonstracyjne dla pakietu %{name}
-Group: Development
+Summary(pl.UTF-8): Pliki demonstracyjne dla pakietu %{srcname}
+Group: Documentation
Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: jdom-demo
%description demo
Demonstrations and samples for %{srcname}.
@@ -61,11 +65,26 @@
%description demo -l pl.UTF-8
Pliki demonstracyjne i przykłady dla pakietu %{srcname}.
+%package javadoc
+Summary: %{srcname} documentation
+Summary(pl.UTF-8): Dokumentacja do %{srcname}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+%{srcname} documentation.
+
+%description javadoc -l pl.UTF-8
+Dokumentacja do %{srcname}.
+
%prep
%setup -q -n %{srcname}-%{version}
+find -name '*.jar' | xargs rm
+find -name '*.class' | xargs rm
+
%build
-%ant
+%ant package %{?with_javadoc:javadoc}
%install
rm -rf $RPM_BUILD_ROOT
@@ -74,13 +93,21 @@
install build/%{srcname}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/sax
-cp -a samples/sax/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/sax
-cp -a samples/*.* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
+%if %{with javadoc}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -R build/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
+%post javadoc
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
+
%files
%defattr(644,root,root,755)
%doc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
@@ -90,11 +117,24 @@
%defattr(644,root,root,755)
%{_examplesdir}/%{name}-%{version}
+%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
* %{date} PLD Team <[email protected]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2009/03/31 19:45:19 pawelz
+- P/O after changing name
+- build javadoc
+- simplified installation of demo
+- remove binnaries provided with tarball
+
Revision 1.2 2009/03/31 18:11:48 paszczus
- added BR: java-xerces; rel 1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-jdom.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
