- updated noarch rules

diff --git a/golang-package.spec b/golang-package.spec
index bafb1b929fbff3fde365c54816fb84d76283d9cb..22e73df60bbdba2de2277c099bc63ffe07da0aa5 100644 (file)
--- a/golang-package.spec
+++ b/golang-package.spec
@@ -15,8 +15,8 @@ Source0:      %{name}-%{version}.tar.gz
 # Source0-md5: -
 URL:           -
 BuildRequires: golang >= 1.3.1
-# if using noarchpackage
-#BuildRequires:        rpmbuild(macros) >= 1.752
+# if using noarch subpackage
+#BuildRequires:        rpm-build >= 4.6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _enable_debug_packages 0
@@ -32,7 +32,7 @@ Summary:      %{summary}
 Group:         Development/Languages
 #Requires:     golang(github.com/../...)
 Provides:      golang(%{import_path}) = %{version}-%{release}
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description devel
 %{summary}

diff --git a/java.spec b/java.spec
index a53be0c43a281b683cc008ba6ce2e59718da87fb..f7b2b87f81d1acda5a4ba79bad3b5d6462636dce 100644 (file)
--- a/java.spec
+++ b/java.spec
@@ -34,12 +34,13 @@ BuildRequires:      glibc-localedb-all
 %endif
 BuildRequires: jpackage-utils
 BuildRequires: rpm-javaprov
+# if using noarch subpackage:
+#BuildRequires:        rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.745
-# if using noarchpackage, replace with
-#BuildRequires:        rpmbuild(macros) >= 1.752
 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)
 
@@ -53,7 +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
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description doc
 Documentation for %{srcname}.
@@ -72,7 +73,7 @@ Summary:      Online manual for %{srcname}
 Summary(pl.UTF-8):     Dokumentacja online do %{srcname}
 Group:         Documentation
 Requires:      jpackage-utils
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description javadoc
 Documentation for %{srcname}.
@@ -99,7 +100,7 @@ Pliki demonstracyjne i przykłady dla pakietu %{srcname}.
 Summary:       Tutorial for %{srcname}
 Summary(pl.UTF-8):     Podręcznik do pakietu %{srcname}
 Group:         Documentation
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description manual
 Manual for %{srcname}.
@@ -112,7 +113,7 @@ Summary:    Source code of %{srcname}
 Summary(pl.UTF-8):     Kod źródłowy %{srcname}
 Group:         Documentation
 Requires:      jpackage-utils >= 1.7.5-2
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description source
 Source code of %{srcname}.

diff --git a/lib.spec b/lib.spec
index 404a2b1b247737c3cb8f8e16ac80ad1d72f31d95..dc3a992bc72081b108e227e92bba0f4d135dbaee 100644 (file)
--- a/lib.spec
+++ b/lib.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
-%bcond_without apidocs         # do not build and package API docs
-%bcond_without static_libs     # don't build static libraries
+%bcond_without apidocs         # API documentation
+%bcond_without static_libs     # static libraries
 #
 Summary:       -
 Summary(pl.UTF-8):     -
@@ -19,8 +19,8 @@ Source0:      %{name}-%{version}.tar.gz
 #BuildRequires:        automake
 #BuildRequires:        intltool
 #BuildRequires:        libtool
-# if using noarchpackage:
-#BuildRequires:        rpmbuild(macros) >= 1.752
+# if using noarch subpackages:
+#BuildRequires:        rpm-build >= 4.6
 #Requires(postun):     -
 #Requires(pre,post):   -
 #Requires(preun):      -
@@ -91,7 +91,7 @@ Summary:      API documentation for %{name} library
 Summary(pl.UTF-8):     Dokumentacja API biblioteki %{name}
 Group:         Documentation
 # if not arch-dependent
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description apidocs
 API documentation for %{name} library.

diff --git a/python-ext.spec b/python-ext.spec
index fb63d028e17290505d47e153452279282df1a876..b85c697012d5e31da762f1304995fa2edee6da1e 100644 (file)
--- a/python-ext.spec
+++ b/python-ext.spec
@@ -38,11 +38,11 @@ BuildRequires:      python3-devel >= 1:3.2
 #BuildRequires:        python3-
 %endif
 %endif
+# if using noarch subpackage:
+#BuildRequires:        rpm-build >= 4.6
 BuildRequires: rpm-pythonprov
 # for the py_build, py_install macros
 BuildRequires: rpmbuild(macros) >= 1.714
-# if using noarchpackage, replace with:
-#BuildRequires:        rpmbuild(macros) >= 1.752
 # when using /usr/bin/env or other in-place substitutions
 #BuildRequires:        sed >= 4.0
 %if %{with doc}
@@ -70,7 +70,7 @@ Requires:     python3-modules >= 1:3.2
 Summary:       API documentation for Python %{module} module
 Summary(pl.UTF-8):     Dokumentacja API modułu Pythona %{module}
 Group:         Documentation
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description apidocs
 API documentation for Python %{module} module.

diff --git a/python3-ext.spec b/python3-ext.spec
index 20968c4a0fbebbbb3647fc0e8e12d1c51ddca375..37edac290dd7fd91bb34391d17d1b3003a513212 100644 (file)
--- a/python3-ext.spec
+++ b/python3-ext.spec
@@ -26,10 +26,10 @@ BuildRequires:      python3-devel >= 1:3.2
 %if %{with tests}
 #BuildRequires:        python3-
 %endif
+# if using noarch subpackage:
+#BuildRequires:        rpm-build >= 4.6
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.714
-# if using noarchpackage, replace with:
-#BuildRequires:        rpmbuild(macros) >= 1.752
 # when using /usr/bin/env or other in-place substitutions
 #BuildRequires:        sed >= 4.0
 %if %{with doc}
@@ -47,7 +47,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Summary:       API documentation for Python %{module} module
 Summary(pl.UTF-8):     Dokumentacja API modułu Pythona %{module}
 Group:         Documentation
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description apidocs
 API documentation for Python %{module} module.

diff --git a/template.spec b/template.spec
index 6e64c3e3301604b4e195342062b39c3d4a673f30..f90e1a57215fa81cd012ba1384718219d040f4bb 100644 (file)
--- a/template.spec
+++ b/template.spec
@@ -18,8 +18,8 @@ Source0:      %{name}-%{version}.tar.gz
 # Source1-md5: -
 #Patch0:               %{name}-DESTDIR.patch
 URL:           -
-# if using noarchpackage macro
-#BuildRequires:        rpmbuild(macros) >= 1.752
+# if using noarch subpackage
+#BuildRequires:        rpm-build >= 4.6
 %if %{with initscript}
 BuildRequires: rpmbuild(macros) >= 1.228
 Requires(post,preun):  /sbin/chkconfig
@@ -56,7 +56,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Summary:       -
 Summary(pl.UTF-8):     -
 Group:         -
-%{?noarchpackage}
+#BuildArch:    noarch
 
 %description subpackage