- adjusted noarch subpackage rules and some descriptions, more pl

diff --git a/golang-package.spec b/golang-package.spec
index ae3428f6aa79b9a27da740923d2ab22c1c66fe0a..bafb1b929fbff3fde365c54816fb84d76283d9cb 100644 (file)
--- a/golang-package.spec
+++ b/golang-package.spec
@@ -15,6 +15,8 @@ Source0:      %{name}-%{version}.tar.gz
 # Source0-md5: -
 URL:           -
 BuildRequires: golang >= 1.3.1
 # Source0-md5: -
 URL:           -
 BuildRequires: golang >= 1.3.1

+# if using noarchpackage
+#BuildRequires:        rpmbuild(macros) >= 1.752

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _enable_debug_packages 0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _enable_debug_packages 0


@@ -30,10 +32,7 @@ Summary:     %{summary}
 Group:         Development/Languages
 #Requires:     golang(github.com/../...)
 Provides:      golang(%{import_path}) = %{version}-%{release}
 Group:         Development/Languages
 #Requires:     golang(github.com/../...)
 Provides:      golang(%{import_path}) = %{version}-%{release}

-# noarch subpackages only when supported by rpm
-%if "%{_rpmversion}" >= "4.6"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}

 
 %description devel
 %{summary}
 
 %description devel
 %{summary}


@@ -49,7 +48,7 @@ ln -s ../../.. src/%{import_path}
 
 # alternative
 install -d src/$(dirname %{import_path})
 
 # alternative
 install -d src/$(dirname %{import_path})

-mv %{name}-%{version} src/%{import_path}
+%{__mv} %{name}-%{version} src/%{import_path}

 
 %build
 export GOPATH=$(pwd)
 
 %build
 export GOPATH=$(pwd)

diff --git a/java.spec b/java.spec
index 0b0511052d34bddf518eb3c792a5f10f2b3b91f8..a53be0c43a281b683cc008ba6ce2e59718da87fb 100644 (file)
--- a/java.spec
+++ b/java.spec
@@ -35,6 +35,8 @@ BuildRequires:        glibc-localedb-all
 BuildRequires: jpackage-utils
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.745
 BuildRequires: jpackage-utils
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.745

+# if using noarchpackage, replace with
+#BuildRequires:        rpmbuild(macros) >= 1.752

 BuildRequires: sed >= 4.0
 # for %{_javadir}
 Requires:      jpackage-utils
 BuildRequires: sed >= 4.0
 # for %{_javadir}
 Requires:      jpackage-utils


@@ -51,10 +53,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
 Summary(it.UTF-8):     Documentazione di %{srcname}
 Summary(pl.UTF-8):     Podręcznik dla %{srcname}
 Group:         Documentation

-# noarch subpackages only when supported by rpm
-%if "%{_rpmversion}" >= "4.6"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}

 
 %description doc
 Documentation for %{srcname}.
 
 %description doc
 Documentation for %{srcname}.


@@ -73,6 +72,7 @@ Summary:      Online manual for %{srcname}
 Summary(pl.UTF-8):     Dokumentacja online do %{srcname}
 Group:         Documentation
 Requires:      jpackage-utils
 Summary(pl.UTF-8):     Dokumentacja online do %{srcname}
 Group:         Documentation
 Requires:      jpackage-utils

+%{?noarchpackage}

 
 %description javadoc
 Documentation for %{srcname}.
 
 %description javadoc
 Documentation for %{srcname}.


@@ -97,16 +97,22 @@ Pliki demonstracyjne i przykłady dla pakietu %{srcname}.
 
 %package manual
 Summary:       Tutorial for %{srcname}
 
 %package manual
 Summary:       Tutorial for %{srcname}

+Summary(pl.UTF-8):     Podręcznik do pakietu %{srcname}

 Group:         Documentation
 Group:         Documentation

+%{?noarchpackage}

 
 %description manual
 Manual for %{srcname}.
 
 
 %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
 %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

+%{?noarchpackage}

 
 %description source
 Source code of %{srcname}.
 
 %description source
 Source code of %{srcname}.

diff --git a/lib.spec b/lib.spec
index 4efa5d507ec222a07cd981387b555ec60a60dba0..404a2b1b247737c3cb8f8e16ac80ad1d72f31d95 100644 (file)
--- a/lib.spec
+++ b/lib.spec
@@ -19,6 +19,8 @@ Source0:      %{name}-%{version}.tar.gz
 #BuildRequires:        automake
 #BuildRequires:        intltool
 #BuildRequires:        libtool
 #BuildRequires:        automake
 #BuildRequires:        intltool
 #BuildRequires:        libtool

+# if using noarchpackage:
+#BuildRequires:        rpmbuild(macros) >= 1.752

 #Requires(postun):     -
 #Requires(pre,post):   -
 #Requires(preun):      -
 #Requires(postun):     -
 #Requires(pre,post):   -
 #Requires(preun):      -


@@ -89,9 +91,7 @@ Summary:      API documentation for %{name} library
 Summary(pl.UTF-8):     Dokumentacja API biblioteki %{name}
 Group:         Documentation
 # if not arch-dependent
 Summary(pl.UTF-8):     Dokumentacja API biblioteki %{name}
 Group:         Documentation
 # if not arch-dependent

-%if "%{_rpmversion}" >= "4.6"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}

 
 %description apidocs
 API documentation for %{name} library.
 
 %description apidocs
 API documentation for %{name} library.

diff --git a/python-ext.spec b/python-ext.spec
index 8b71f2cca24e79fc37479e8b2186548f7f4c915b..fdebbed519a8d0604073e9bde46f32b444ca737c 100644 (file)
--- a/python-ext.spec
+++ b/python-ext.spec
@@ -4,8 +4,8 @@
 # use template-specs/python3-ext.spec for python3 only packages
 #
 # Conditional build:
 # use template-specs/python3-ext.spec for python3 only packages
 #
 # Conditional build:

-%bcond_without doc     # don't build doc
-%bcond_without tests   # do not perform "make test"
+%bcond_without doc     # API documentation
+%bcond_without tests   # unit tests

 %bcond_without python2 # CPython 2.x module
 %bcond_without python3 # CPython 3.x module
 
 %bcond_without python2 # CPython 2.x module
 %bcond_without python3 # CPython 3.x module
 


@@ -41,6 +41,8 @@ BuildRequires:        python3-devel >= 1:3.2
 BuildRequires: rpm-pythonprov
 # for the py_build, py_install macros
 BuildRequires: rpmbuild(macros) >= 1.714
 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}
 # when using /usr/bin/env or other in-place substitutions
 #BuildRequires:        sed >= 4.0
 %if %{with doc}


@@ -68,9 +70,7 @@ Requires:     python3-modules >= 1:3.2
 Summary:       %{module} API documentation
 Summary(pl.UTF-8):     Dokumentacja API %{module}
 Group:         Documentation
 Summary:       %{module} API documentation
 Summary(pl.UTF-8):     Dokumentacja API %{module}
 Group:         Documentation

-%if "%{_rpmversion}" >= "4.6"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}

 
 %description apidocs
 API documentation for %{module}.
 
 %description apidocs
 API documentation for %{module}.

diff --git a/python3-ext.spec b/python3-ext.spec
index 57d323f0ffa4149352ad815a73cfedb041a89c1e..8ca05bc3a5bc475422d76cd68f8f25a72cb86b09 100644 (file)
--- a/python3-ext.spec
+++ b/python3-ext.spec
@@ -3,8 +3,8 @@
 # use template-specs/python3.spec for pure python packages
 #
 # Conditional build:
 # use template-specs/python3.spec for pure python packages
 #
 # Conditional build:

-%bcond_without doc     # don't build doc
-%bcond_without tests   # do not perform "make test"
+%bcond_without doc     # API documentation
+%bcond_without tests   # unit tests

 
 %define        module  template
 Summary:       -
 
 %define        module  template
 Summary:       -


@@ -27,6 +27,8 @@ URL:          -
 %endif
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.714
 %endif
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.714

+# if using noarchpackage, replace with:
+#BuildRequires:        rpmbuild(macros) >= 1.752

 BuildRequires: python3-devel >= 1:3.2
 # when using /usr/bin/env or other in-place substitutions
 #BuildRequires:        sed >= 4.0
 BuildRequires: python3-devel >= 1:3.2
 # when using /usr/bin/env or other in-place substitutions
 #BuildRequires:        sed >= 4.0


@@ -45,9 +47,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Summary:       %{module} API documentation
 Summary(pl.UTF-8):     Dokumentacja API %{module}
 Group:         Documentation
 Summary:       %{module} API documentation
 Summary(pl.UTF-8):     Dokumentacja API %{module}
 Group:         Documentation

-%if "%{_rpmversion}" >= "4.6"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}

 
 %description apidocs
 API documentation for %{module}.
 
 %description apidocs
 API documentation for %{module}.

diff --git a/template.spec b/template.spec
index e1813393e5bbc47278bf96b8eca11d9fb595b4ff..6e64c3e3301604b4e195342062b39c3d4a673f30 100644 (file)
--- a/template.spec
+++ b/template.spec
@@ -18,6 +18,8 @@ Source0:      %{name}-%{version}.tar.gz
 # Source1-md5: -
 #Patch0:               %{name}-DESTDIR.patch
 URL:           -
 # Source1-md5: -
 #Patch0:               %{name}-DESTDIR.patch
 URL:           -

+# if using noarchpackage macro
+#BuildRequires:        rpmbuild(macros) >= 1.752

 %if %{with initscript}
 BuildRequires: rpmbuild(macros) >= 1.228
 Requires(post,preun):  /sbin/chkconfig
 %if %{with initscript}
 BuildRequires: rpmbuild(macros) >= 1.228
 Requires(post,preun):  /sbin/chkconfig


@@ -54,10 +56,7 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Summary:       -
 Summary(pl.UTF-8):     -
 Group:         -
 Summary:       -
 Summary(pl.UTF-8):     -
 Group:         -

-# noarch subpackages only when supported by rpm
-%if "%{_rpmversion}" >= "4.6"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}

 
 %description subpackage
 
 
 %description subpackage