- removed duplicate debug_packages disabling, added dune example

[projects/template-specs.git] / java.spec

diff --git a/java.spec b/java.spec
index c2b17571e0ff34e8cd19b51620c9593ef6378072..f7b2b87f81d1acda5a4ba79bad3b5d6462636dce 100644 (file)
--- a/java.spec
+++ b/java.spec
@@ -15,7 +15,6 @@
 # Name without java- prefix. If it is application, not a library,
 # just do s/srcname/name/g
 %define                srcname         -
-%include       /usr/lib/rpm/macros.java
 Summary:       -
 Summary(pl.UTF-8):     -
 Name:          java-%{srcname}
@@ -35,15 +34,13 @@ BuildRequires:      glibc-localedb-all
 %endif
 BuildRequires: jpackage-utils
 BuildRequires: rpm-javaprov
-BuildRequires: rpmbuild(macros) >= 1.300
-# for %%undos macro
-BuildRequires: rpmbuild(macros) >= 1.553
-%if %{with source}
-BuildRequires: rpmbuild(macros) >= 1.555
-%endif
+# if using noarch subpackage:
+#BuildRequires:        rpm-build >= 4.6
+BuildRequires: rpmbuild(macros) >= 1.745
 BuildRequires: sed >= 4.0
 # for %{_javadir}
 Requires:      jpackage-utils
+# if no JNI: use global noarch, remove noarch from subpackages
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -57,6 +54,7 @@ Summary(fr.UTF-8):    Documentation pour %{srcname}
 Summary(it.UTF-8):     Documentazione di %{srcname}
 Summary(pl.UTF-8):     Podręcznik dla %{srcname}
 Group:         Documentation
+BuildArch:     noarch
 
 %description doc
 Documentation for %{srcname}.
@@ -75,6 +73,7 @@ Summary:      Online manual for %{srcname}
 Summary(pl.UTF-8):     Dokumentacja online do %{srcname}
 Group:         Documentation
 Requires:      jpackage-utils
+BuildArch:     noarch
 
 %description javadoc
 Documentation for %{srcname}.
@@ -99,16 +98,22 @@ Pliki demonstracyjne i przykłady dla pakietu %{srcname}.
 
 %package manual
 Summary:       Tutorial for %{srcname}
+Summary(pl.UTF-8):     Podręcznik do pakietu %{srcname}
 Group:         Documentation
+BuildArch:     noarch
 
 %description manual
 Manual for %{srcname}.
 
+%description manual -l pl.UTF-8
+Podręcznik do pakietu %{srcname}.
+
 %package source
 Summary:       Source code of %{srcname}
 Summary(pl.UTF-8):     Kod źródłowy %{srcname}
 Group:         Documentation
 Requires:      jpackage-utils >= 1.7.5-2
+BuildArch:     noarch
 
 %description source
 Source code of %{srcname}.