- pl

- more verbose files
- added LICENSE to doc

Changed files:
    corosync.spec -> 1.10

diff --git a/corosync.spec b/corosync.spec
index 2270bf3366a8abc9a77f5014337234fc6a2e5df7..2d95a5f3429fec890069e309b4b79c697ed63eaa 100644 (file)
--- a/corosync.spec
+++ b/corosync.spec
@@ -1,7 +1,9 @@
+#
 # Conditional build:
 %bcond_with    apidocs         # build apidocs
 
 Summary:       Corosync - OSI Certified implementation of a complete cluster engine
+Summary(pl.UTF-8):     Corosync - implementacja silnika klastrowego certyfikowana przez OSI
 Name:          corosync
 Version:       1.2.8
 Release:       1
@@ -10,40 +12,60 @@ Group:              Base
 Source0:       http://devresources.linux-foundation.org/dev/openais/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
 # Source0-md5: 43e97ef0d964ccb4063f40a4478eb679
 URL:           http://www.corosync.org/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.61
 BuildRequires: automake
 BuildRequires: nss-devel
 BuildRequires: pkgconfig
 %{?with_apidocs:BuildRequires: doxygen}
+Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 The Corosync Cluster Engine is an OSI Certified implementation of a
 complete cluster engine.
 
+%description -l pl.UTF-8
+Corosync Cluster Engine to implementacja pełnego silnika klastrowego
+certyfikowana przez OSI.
+
 %package libs
-Summary:       The corosync OSI Certified implementation of a complete cluster engine libraries
+Summary:       Corosync Cluster Engine libraries
+Summary(pl.UTF-8):     Biblioteki silnika klastrowego Corosync
 Group:         Libraries
 
 %description libs
-This package contains the corosync libraries.
+This package contains the libraries of Corosync Cluster Engine, an OSI
+Certified implementation of a complete cluster engine.
+
+%description libs -l pl.UTF-8
+Ten pakiet zawiera biblioteki Corosync Cluster Engine - pełnego silnika
+klastrowego certyfikowanego przez OSI.
 
 %package devel
-Summary:       The corosync OSI Certified implementation of a complete cluster engine libraries development files
+Summary:       Header files for Corosync libraries
+Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek Corosync
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 
 %description devel
-This package contains the include files used to develop using corosync
+This package contains the include files used to develop using Corosync
 APIs.
 
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe potrzebne do tworzenia programów z
+użyciem API Corosync.
+
 %package static
-Summary:       The corosync OSI Certified implementation of a complete cluster engine static libraries
+Summary:       Corosync static libraries
+Summary(pl.UTF-8):     Statyczne biblioteki Corosync
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
-This package contains the corosync static libraries.
+This package contains the Corosync static libraries.
+
+%description static -l pl.UTF-8
+Ten pakiet zawiera statyczne biblioteki Corosync.
 
 %prep
 %setup -q
@@ -51,11 +73,13 @@ This package contains the corosync static libraries.
 %build
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-
 %configure \
        --enable-nss \
+       --with-initddir=/etc/rc.d/init.d \
        --with-lcrso-dir=%{_libdir}/lcrso
+# --enable-rdma (BR: librdmacm, libibverbs)
 
 %{__make}
 
@@ -63,12 +87,15 @@ This package contains the corosync static libraries.
     
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT/usr/share/doc/corosync
 
-mv $RPM_BUILD_ROOT/etc/corosync/corosync.conf{.example,}
-sed -i -e 's/\(^.*$\)/#\1/' $RPM_BUILD_ROOT/etc/corosync/corosync.conf
+%{__rm} -r $RPM_BUILD_ROOT/usr/share/doc/corosync
+
+sed -e 's/^/#/' $RPM_BUILD_ROOT%{_sysconfdir}/corosync/corosync.conf.example \
+       >$RPM_BUILD_ROOT%{_sysconfdir}/corosync/corosync.conf
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/corosync/corosync.conf.example
 
 %{?with_apidocs:install doc/api/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3}
 
@@ -80,26 +107,32 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CHANGELOG README.devmap README.recovery SECURITY
-%defattr(644,root,root,755)
-%attr(754,root,root) /etc/init.d/corosync
+%doc AUTHORS CHANGELOG LICENSE README.devmap README.recovery SECURITY TODO
+%attr(754,root,root) /etc/rc.d/init.d/corosync
 %dir %{_sysconfdir}/corosync
 %verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/corosync/corosync.conf
 %attr(755,root,root) %{_sbindir}/corosync
 %attr(755,root,root) %{_sbindir}/corosync-cfgtool
+%attr(755,root,root) %{_sbindir}/corosync-cpgtool
 %attr(755,root,root) %{_sbindir}/corosync-fplay
 %attr(755,root,root) %{_sbindir}/corosync-keygen
 %attr(755,root,root) %{_sbindir}/corosync-objctl
 %attr(755,root,root) %{_sbindir}/corosync-pload
-%attr(755,root,root) %{_sbindir}/corosync-cpgtool
 %attr(755,root,root) %{_sbindir}/corosync-quorumtool
 %attr(755,root,root) %{_libdir}/lcrso/*.lcrso
-%{_mandir}/man5/*.5*
-%{_mandir}/man8/*.8*
+%{_mandir}/man5/corosync.conf.5*
+%{_mandir}/man8/corosync.8*
+%{_mandir}/man8/corosync-blackbox.8*
+%{_mandir}/man8/corosync-cfgtool.8*
+%{_mandir}/man8/corosync-cpgtool.8*
+%{_mandir}/man8/corosync-fplay.8*
+%{_mandir}/man8/corosync-keygen.8*
+%{_mandir}/man8/corosync-objctl.8*
+%{_mandir}/man8/corosync-pload.8*
+%{_mandir}/man8/corosync-quorumtool.8*
 
 %files libs
 %defattr(644,root,root,755)
-%dir %{_libdir}/lcrso
 %attr(755,root,root) %{_libdir}/libcfg.so.4.*.*
 %attr(755,root,root) %ghost %{_libdir}/libcfg.so.4
 %attr(755,root,root) %{_libdir}/libconfdb.so.4.*.*
@@ -124,24 +157,50 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libtotem_pg.so.4
 %attr(755,root,root) %{_libdir}/libvotequorum.so.4.*.*
 %attr(755,root,root) %ghost %{_libdir}/libvotequorum.so.4
+%dir %{_libdir}/lcrso
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcfg.so
+%attr(755,root,root) %{_libdir}/libconfdb.so
+%attr(755,root,root) %{_libdir}/libcoroipcc.so
+%attr(755,root,root) %{_libdir}/libcoroipcs.so
+%attr(755,root,root) %{_libdir}/libcpg.so
+%attr(755,root,root) %{_libdir}/libevs.so
+%attr(755,root,root) %{_libdir}/liblogsys.so
+%attr(755,root,root) %{_libdir}/libpload.so
+%attr(755,root,root) %{_libdir}/libsam.so
+%attr(755,root,root) %{_libdir}/libquorum.so
+%attr(755,root,root) %{_libdir}/libtotem_pg.so
+%attr(755,root,root) %{_libdir}/libvotequorum.so
 %{_includedir}/corosync
-%{_libdir}/libcfg.so
-%{_libdir}/libconfdb.so
-%{_libdir}/libcoroipcc.so
-%{_libdir}/libcoroipcs.so
-%{_libdir}/libcpg.so
-%{_libdir}/libevs.so
-%{_libdir}/liblogsys.so
-%{_libdir}/libpload.so
-%{_libdir}/libsam.so
-%{_libdir}/libquorum.so
-%{_libdir}/libtotem_pg.so
-%{_libdir}/libvotequorum.so
-%{_pkgconfigdir}/*.pc
-%{_mandir}/man3/*.3*
+%{_pkgconfigdir}/corosync.pc
+%{_pkgconfigdir}/libcfg.pc
+%{_pkgconfigdir}/libconfdb.pc
+%{_pkgconfigdir}/libcoroipcc.pc
+%{_pkgconfigdir}/libcoroipcs.pc
+%{_pkgconfigdir}/libcpg.pc
+%{_pkgconfigdir}/libevs.pc
+%{_pkgconfigdir}/liblogsys.pc
+%{_pkgconfigdir}/libpload.pc
+%{_pkgconfigdir}/libquorum.pc
+%{_pkgconfigdir}/libsam.pc
+%{_pkgconfigdir}/libtotem_pg.pc
+%{_pkgconfigdir}/libvotequorum.pc
+%{_mandir}/man3/confdb_*.3*
+%{_mandir}/man3/cpg_*.3*
+%{_mandir}/man3/evs_*.3*
+%{_mandir}/man3/sam_*.3*
+%{_mandir}/man3/votequorum_*.3*
+# should be man7...
+%{_mandir}/man8/confdb_overview.8*
+%{_mandir}/man8/coroipc_overview.8*
+%{_mandir}/man8/corosync_overview.8*
+%{_mandir}/man8/cpg_overview.8*
+%{_mandir}/man8/evs_overview.8*
+%{_mandir}/man8/logsys_overview.8*
+%{_mandir}/man8/sam_overview.8*
+%{_mandir}/man8/votequorum_overview.8*
 
 %files static
 %defattr(644,root,root,755)