- cleanup, completed dependencies, added -static

diff --git a/libcec.spec b/libcec.spec
index 7d5fcd3ac7b9ec776f89080c32bf92bf0e53a6d7..d5739a82d73d104b74dea679619f94a8873cfe2e 100644 (file)
--- a/libcec.spec
+++ b/libcec.spec
@@ -1,29 +1,36 @@
+#
+# Conditional build:
+%bcond_without static_libs     # static library build
+#
 Summary:       Pulse-Eight CEC adapter control library
-Summary(pl.UTF-8):     Biblioteka sterwania adapterem Pulse-Eight CEC
+Summary(pl.UTF-8):     Biblioteka sterowania adapterem CEC Pulse-Eight
 Name:          libcec
 Version:       2.1.1
 Release:       1
 License:       GPL v2+
 Group:         Libraries
-URL:           http://libcec.pulse-eight.com/
 Source0:       http://github.com/Pulse-Eight/libcec/archive/%{name}-%{version}.tar.gz
 # Source0-md5: 0317e6b8895d54f8f035fde90b25dc2d
-BuildRequires: autoconf >= 2.50
-BuildRequires: automake
+URL:           http://libcec.pulse-eight.com/
+BuildRequires: autoconf >= 2.59
+BuildRequires: automake >= 1:1.11
+BuildRequires: libstdc++-devel >= 6:4.2
 BuildRequires: libtool
-BuildRequires: lockdev-devel
+BuildRequires: lockdev-devel >= 1.0
 BuildRequires: pkgconfig
+BuildRequires: udev-devel >= 1:151
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Pulse-Eight CEC adapter control library.
 
 %description -l pl.UTF-8
-Biblioteka sterwania adapterem Pulse-Eight CEC.
+Biblioteka sterowania adapterem CEC firmy Pulse-Eight.
 
 %package utils
 Summary:       Utilities for Pulse-Eight CEC adapter control
-Summary(pl.UTF-8):     Narzędla dla adaptera Pulse-Eight CEC
-Group:         Base/Kernel
+Summary(pl.UTF-8):     Narzędla dla adaptera CEC Pulse-Eight
+Group:         Applications/System
 Requires:      %{name} = %{version}-%{release}
 
 %description utils
@@ -32,11 +39,19 @@ With libcec you can access your Pulse-Eight CEC adapter.
 This package contains the command-line tools to configure and test
 your Pulse-Eight CEC adapter.
 
+%description utils -l pl.UTF-8
+libcec pozwala na dostęp do adaptera CEC firmy Pulse-Eight.
+
+Ten pakiet zawiera narzędzie linii poleceń do konfiguracji i
+testowania adaptera CEC Pulse-Eight.
+
 %package devel
 Summary:       Header files for libcec library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libcec
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      libstdc++-devel >= 6:4.2
+Requires:      udev-devel >= 1:151
 
 %description devel
 Header files for libcec library.
@@ -44,6 +59,18 @@ Header files for libcec library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki libcec.
 
+%package static
+Summary:       Static libcec library
+Summary(pl.UTF-8):     Statyczna biblioteka libcec
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description static
+Static libcec library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka libcec.
+
 %prep
 %setup -q -n %{name}-%{name}-%{version}
 
@@ -54,7 +81,8 @@ Pliki nagłówkowe biblioteki libcec.
 %{__autoheader}
 %{__automake}
 %configure \
-       --disable-static
+       --disable-silent-rules \
+       %{!?with_static_libs:--disable-static}
 
 %{__make}
 
@@ -73,8 +101,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/%{name}.so.2
+# COPYING contains also general notes
+%doc AUTHORS COPYING ChangeLog README
+%attr(755,root,root) %{_libdir}/libcec.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcec.so.2
 
 %files utils
 %defattr(644,root,root,755)
@@ -82,6 +112,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}.so
-%{_pkgconfigdir}/%{name}.pc
-%{_includedir}/%{name}
+%attr(755,root,root) %{_libdir}/libcec.so
+%{_pkgconfigdir}/libcec.pc
+%{_includedir}/libcec
+
+%if %{with static_libs}
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libcec.a
+%endif