- more stuff to copy paste

Changed files:
    java.spec -> 1.22

diff --git a/java.spec b/java.spec
index fff273905a2e8957f874cf3e9f7fd8b8ed55e001..283a6f843a0596a0561873cee4df43f4b5ddbe34 100644 (file)
--- a/java.spec
+++ b/java.spec
@@ -1,3 +1,8 @@
+#
+# Conditional build:
+%bcond_without javadoc         # don't build javadoc
+%bcond_without tests           # don't build and run tests
+#
 %include       /usr/lib/rpm/macros.java
 Summary:       -
 Name:          -
@@ -8,6 +13,9 @@ Group:         Development/Languages/Java
 Source0:       -
 # Source0-md5: -
 URL:           -
+%if %(locale -a | grep -q '^en_US$'; echo $?)
+BuildRequires: glibc-localedb-all
+%endif
 BuildRequires: jpackage-utils
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.300
@@ -49,6 +57,9 @@ Documentation for %{name} -
 %description javadoc -l pl.UTF-8
 Dokumentacja do %{name} -
 
+%description javadoc -l fr
+Javadoc pour %{name}.
+
 %prep
 %setup -q
 
@@ -58,6 +69,8 @@ export JAVA_HOME="%{java_home}"
 required_jars="jaxp_parser_impl"
 export CLASSPATH=$(build-classpath $required_jars)
 
+export LC_ALL=en_US # source code not US-ASCII
+
 %ant
 %{__make}
 
@@ -76,9 +89,11 @@ for a in dist/*.jar; do
 done
 
 # javadoc
+%if %{with javadoc}
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+%endif
 
 # source code
 install -d $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version}
@@ -99,11 +114,15 @@ ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
 %defattr(644,root,root,755)
 %doc docs/*
 
-#%%files demo
-#%defattr(644,root,root,755)
-#%{_examplesdir}/%{name}-%{version}
+%if 0
+%files demo
+%defattr(644,root,root,755)
+%{_examplesdir}/%{name}-%{version}
+%endif
 
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
 %ghost %{_javadocdir}/%{name}
+%endif