- pl, cleanups, don't own system mibs directory

diff --git a/pacemaker.spec b/pacemaker.spec
index c34ed6145d6ba61cac6bc0e598d9b11ec837fae9..1697581c21c32bf48baf5e46c4eeaa654cd5868b 100644 (file)
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -1,11 +1,14 @@
 #
-%bcond_without corosync        # build with corosync stack
-%bcond_without heartbeat       # build without heartbeat stack
+# Conditional build:
+%bcond_without corosync        # Corosync stack support
+%bcond_without heartbeat       # Heartbeat stack support
+#
 Summary:       The scalable High-Availability cluster resource manager
+Summary(pl.UTF-8):     Skalowalny zarządca zasobów klastrów o wysokiej dostępności
 Name:          pacemaker
 Version:       1.1.10
 Release:       1
-License:       GPL v2+; LGPL v2.1+
+License:       GPL v2+, LGPL v2.1+
 Group:         Applications/System
 Source0:       https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-%{version}.tar.gz
 # Source0-md5: 532ec5d62b9437204a9f18fa3d5a89fc
@@ -19,12 +22,13 @@ BuildRequires:      asciidoc
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bzip2-devel
+BuildRequires: cluster-glue-libs-devel
 %{?with_corosync:BuildRequires:        corosync-devel >= 2.0}
 BuildRequires: docbook-style-xsl
 BuildRequires: e2fsprogs-devel
 BuildRequires: glib2-devel
 BuildRequires: gnutls-devel
-%{?with_heartbeat:BuildRequires: heartbeat-devel >= 3.0.5-6}
+%{?with_heartbeat:BuildRequires:       heartbeat-devel >= 3.0.5-6}
 BuildRequires: libesmtp-devel
 BuildRequires: libqb
 BuildRequires: libtool
@@ -34,16 +38,15 @@ BuildRequires:      libxslt-progs
 BuildRequires: ncurses-devel
 BuildRequires: net-snmp-devel
 BuildRequires: pam-devel
+BuildRequires: pciutils-devel
 BuildRequires: pkgconfig
 BuildRequires: python-devel
 BuildRequires: rpm-pythonprov
 BuildRequires:  rpmbuild(macros) >= 1.644
 BuildRequires: swig
-BuildRequires: pciutils-devel
-BuildRequires: cluster-glue-libs-devel
+Requires:      %{name}-libs = %{version}-%{release}
 Requires:      cluster-glue
 Requires:      resource-agents
-Requires:      %{name}-libs = %{version}-%{release}
 Provides:      group(haclient)
 Provides:      user(hacluster)
 Suggests:      pacemaker-shell
@@ -51,12 +54,12 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # Unresolved symbol in libpe_status.so.3.0.0: get_object_root
 # not handled by -libs patch, as it is a circular dependency
-%define skip_post_check_so libpe_status.so.*
+%define                skip_post_check_so libpe_status.so.*
 
 %description
 Pacemaker makes use of your cluster infrastructure (either 
 Corosync/OpenAIS or Heartbeat) to stop, start and monitor the health
-of the services (aka.  resources) you want the cluster to provide.
+of the services (aka. resources) you want the cluster to provide.
 
 It can do this for clusters of practically any size and comes with a
 powerful dependency model that allows the administrator to accurately
@@ -65,63 +68,100 @@ cluster resources.
 
 Pacemaker was formely a part of Heartbeat.
 
+%description -l pl.UTF-8
+Pacemaker wykorzystuje infrastrukturę klastrową (Corosync/OpenAIS lub
+Heartbeat) do zatrzymywania, uruchamiania i monitorowania działania
+usług (tzw. zasobów), które ma udostępniać klaster.
+
+Jest w stanie obsłużyć klastry praktycznie dowolnych rozmiarów,
+zawiera elastyczny model zależności, pozwalający administratorowi
+dokładnie opisać powiązania (zarówno kolejność, jak i położenie)
+między zasobami klastra.
+
+Pacemaker był wcześniej częścią pakietu Heartbeat.
+
 %package libs
 Summary:       Pacemaker libraries
+Summary(pl.UTF-8):     Biblioteki Pacemakera
 Group:         Libraries
 
 %description libs
 Shared libraries for Pacemaker.
 
+%description libs -l pl.UTF-8
+Biblioteki współdzielone Pacemakera.
+
+%package devel
+Summary:       Header files for Pacemaker libraries
+Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek Pacemakera
+Group:         Development/Libraries
+Requires:      %{name}-libs = %{version}-%{release}
+
+%description devel
+Header files for Pacemaker libraries.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe bibliotek Pacemakera.
+
+%package static
+Summary:       Static Pacemaker libraries
+Summary(pl.UTF-8):     Statyczne biblioteki Pacemakera
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description static
+Static Pacemaker libraries.
+
+%description static -l pl.UTF-8
+Statyczne biblioteki Pacemakera.
+
 %package heartbeat
 Summary:       Pacemaker for Heartbeat cluster
+Summary(pl.UTF-8):     Pacemaker dla klastra Heartbeat
 Group:         Applications/System
+Requires:      %{name} = %{version}-%{release}
 Requires:      heartbeat
-Obsoletes:     %{name} < 1.1
+Obsoletes:     pacemaker < 1.1
 Conflicts:     heartbeat < 2.99.0
-Requires:      %{name} = %{version}-%{release}
 
 %description heartbeat
 This package allows using Pacemaker on a Heartbeat cluster.
 
+%description heartbeat -l pl.UTF-8
+Ten pakiet pozwala na używanie Pacemakera na klastrze Heartbeat.
+
 %package corosync
 Summary:       Pacemaker for Corosync cluster
+Summary(pl.UTF-8):     Pacemaker dla klastra Corosync
 Group:         Applications/System
+Requires:      %{name} = %{version}-%{release}
 Requires:      corosync
 Requires:       systemd-units >= 38
 %{?with_heartbeat:%requires_eq heartbeat-libs}
-Requires:      %{name} = %{version}-%{release}
 
 %description corosync
 This package allows using Pacemaker on a Corosync cluster.
 
+%description corosync -l pl.UTF-8
+Ten pakiet pozwala na używanie Pacemakera na klastrze Corosync.
+
 %package remote
 Summary:       Remote services manager for Pacemaker
+Summary(pl.UTF-8):     Zarządca usług zdalnych dla Pacemakera
 Group:         Applications/System
 Requires:       systemd-units >= 38
 Requires:      %{name} = %{version}-%{release}
 
 %description remote
 This package allows running Pacemaker-managed services on 'virtual'
-nodes without actual cluster stack. This is usefull to manage services
-in virtual machines or containers runnin on a Pacemaker cluster.
-
-%package devel
-Summary:       Header files for Pacemaker libraries
-Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek Pacemaker
-Group:         Development/Libraries
-Requires:      %{name}-libs = %{version}-%{release}
+nodes without actual cluster stack. This is useful to manage services
+in virtual machines or containers running on a Pacemaker cluster.
 
-%description devel
-Header files for Pacemaker libraries.
-
-%package static
-Summary:       Static Pacemaker libraries
-Summary(pl.UTF-8):     Statyczne biblioteki Pacemaker
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-
-%description static
-Static Pacemaker libraries.
+%description remote -l pl.UTF-8
+Ten pakiet pozwala na uruchamianie usług zarządzanych przez Pacemakera
+na węzłach "wirtualnych" bez zainstalowanego całego stosu klastrowego.
+Jest to przydatne przy zarządzaniu usługami na maszynach wirtualncych
+lub w kontenerach uruchomionych na klastrze opartym o Pacemaker.
 
 %prep
 %setup -qn pacemaker-Pacemaker-%{version}
@@ -137,12 +177,12 @@ Static Pacemaker libraries.
 
 %configure \
        CPPFLAGS="%{rpmcppflags} %{?with_heartbeat:-I/usr/include/heartbeat}" \
-       --with-heartbeat%{!?with_heartbeat:=no} \
+       --with-acl \
        --with-corosync%{!?with_corosync:=no} \
-       --with-snmp \
        --with-esmtp \
-       --with-acl \
+       --with-heartbeat%{!?with_heartbeat:=no} \
        --with-initdir=/etc/rc.d/init.d \
+       --with-snmp \
        --disable-fatal-warnings
 
 %{__make}
@@ -154,7 +194,7 @@ install -d $RPM_BUILD_ROOT{/usr/lib/tmpfiles.d,/etc/rc.d/init.d,%{systemdunitdir
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -r $RPM_BUILD_ROOT%{_docdir}/pacemaker
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/pacemaker
 
 install %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
@@ -201,17 +241,6 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc doc/README* doc/*.html doc/*.txt AUTHORS COPYING*
-%{_datadir}/pacemaker
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/attrd
-%attr(755,root,root) %{_libdir}/%{name}/cib
-%attr(755,root,root) %{_libdir}/%{name}/cibmon
-%attr(755,root,root) %{_libdir}/%{name}/crmd
-%attr(755,root,root) %{_libdir}/%{name}/lrmd
-%attr(755,root,root) %{_libdir}/%{name}/lrmd_test
-%attr(755,root,root) %{_libdir}/%{name}/pengine
-%attr(755,root,root) %{_libdir}/%{name}/stonith-test
-%attr(755,root,root) %{_libdir}/%{name}/stonithd
 %attr(755,root,root) %{_sbindir}/attrd_updater
 %attr(755,root,root) %{_sbindir}/cibadmin
 %attr(755,root,root) %{_sbindir}/crm_attribute
@@ -233,31 +262,42 @@ fi
 %attr(755,root,root) %{_sbindir}/fence_pcmk
 %attr(755,root,root) %{_sbindir}/iso8601
 %attr(755,root,root) %{_sbindir}/stonith_admin
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/attrd
+%attr(755,root,root) %{_libdir}/%{name}/cib
+%attr(755,root,root) %{_libdir}/%{name}/cibmon
+%attr(755,root,root) %{_libdir}/%{name}/crmd
+%attr(755,root,root) %{_libdir}/%{name}/lrmd
+%attr(755,root,root) %{_libdir}/%{name}/lrmd_test
+%attr(755,root,root) %{_libdir}/%{name}/pengine
+%attr(755,root,root) %{_libdir}/%{name}/stonith-test
+%attr(755,root,root) %{_libdir}/%{name}/stonithd
+%{_datadir}/pacemaker
+%{_datadir}/snmp/mibs/*
 %{py_sitedir}/cts
-%{_datadir}/snmp/mibs
-%{_mandir}/man8/attrd_updater.8.gz
-%{_mandir}/man8/cibadmin.8.gz
-%{_mandir}/man8/crm_attribute.8.gz
-%{_mandir}/man8/crm_diff.8.gz
-%{_mandir}/man8/crm_error.8.gz
-%{_mandir}/man8/crm_failcount.8.gz
-%{_mandir}/man8/crm_master.8.gz
-%{_mandir}/man8/crm_mon.8.gz
-%{_mandir}/man8/crm_node.8.gz
-%{_mandir}/man8/crm_report.8.gz
-%{_mandir}/man8/crm_resource.8.gz
-%{_mandir}/man8/crm_shadow.8.gz
-%{_mandir}/man8/crm_simulate.8.gz
-%{_mandir}/man8/crm_standby.8.gz
-%{_mandir}/man8/crm_ticket.8.gz
-%{_mandir}/man8/crm_verify.8.gz
-%{_mandir}/man8/crmadmin.8.gz
-%{_mandir}/man8/fence_legacy.8.gz
-%{_mandir}/man8/fence_pcmk.8.gz
-%{_mandir}/man8/iso8601.8.gz
-%{_mandir}/man8/stonith_admin.8.gz
+%{_mandir}/man8/attrd_updater.8*
+%{_mandir}/man8/cibadmin.8*
+%{_mandir}/man8/crm_attribute.8*
+%{_mandir}/man8/crm_diff.8*
+%{_mandir}/man8/crm_error.8*
+%{_mandir}/man8/crm_failcount.8*
+%{_mandir}/man8/crm_master.8*
+%{_mandir}/man8/crm_mon.8*
+%{_mandir}/man8/crm_node.8*
+%{_mandir}/man8/crm_report.8*
+%{_mandir}/man8/crm_resource.8*
+%{_mandir}/man8/crm_shadow.8*
+%{_mandir}/man8/crm_simulate.8*
+%{_mandir}/man8/crm_standby.8*
+%{_mandir}/man8/crm_ticket.8*
+%{_mandir}/man8/crm_verify.8*
+%{_mandir}/man8/crmadmin.8*
+%{_mandir}/man8/fence_legacy.8*
+%{_mandir}/man8/fence_pcmk.8*
+%{_mandir}/man8/iso8601.8*
+%{_mandir}/man8/stonith_admin.8*
 %{_mandir}/man7/*.7*
-%dir %attr(750,hacluster,haclient) %{_var}/run/crm
+
 %dir %{_prefix}/lib/ocf/resource.d/pacemaker
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/ClusterMon
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/Dummy
@@ -271,23 +311,36 @@ fi
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/ping
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/pingd
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/remote
-/usr/lib/tmpfiles.d/%{name}.conf
+
 %dir /var/lib/%{name}
 %dir %attr(750,hacluster,haclient) /var/lib/%{name}/blackbox
 %dir %attr(750,hacluster,haclient) /var/lib/%{name}/cib
 %dir %attr(750,hacluster,haclient) /var/lib/%{name}/pengine
+%dir %attr(750,hacluster,haclient) %{_var}/run/crm
+/usr/lib/tmpfiles.d/%{name}.conf
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %attr(755,root,root) %{_libdir}/lib*.so.[0-9]
 
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/*.so
+%{_libdir}/*.la
+%{_includedir}/pacemaker
+%{_pkgconfigdir}/*.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/*.a
+
 %files remote
 %defattr(644,root,root,755)
-%{_mandir}/man8/pacemaker_remoted.8.gz
 %attr(755,root,root) %{_sbindir}/pacemaker_remoted
 %attr(755,root,root) /etc/rc.d/init.d/pacemaker_remote
 %{systemdunitdir}/pacemaker_remote.service
+%{_mandir}/man8/pacemaker_remoted.8*
 
 %if %{with heartbeat}
 %files heartbeat
@@ -298,25 +351,14 @@ fi
 %attr(755,root,root) %{_libdir}/heartbeat/crmd
 %attr(755,root,root) %{_libdir}/heartbeat/pengine
 %attr(755,root,root) %{_libdir}/heartbeat/stonithd
-%{_mandir}/man8/crm_uuid.8.gz
+%{_mandir}/man8/crm_uuid.8*
 %endif
 
 %if %{with corosync}
 %files corosync
 %defattr(644,root,root,755)
-%{_mandir}/man8/pacemakerd.8.gz
 %attr(755,root,root) %{_sbindir}/pacemakerd
 %attr(755,root,root) /etc/rc.d/init.d/%{name}
 %{systemdunitdir}/%{name}.service
+%{_mandir}/man8/pacemakerd.8*
 %endif
-
-%files devel
-%defattr(644,root,root,755)
-%{_includedir}/pacemaker
-%{_libdir}/*.so
-%{_libdir}/*.la
-%{_pkgconfigdir}/*.pc
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/*.a