- pl, completed dependencies, added ecore bcond

diff --git a/dbus-c++.spec b/dbus-c++.spec
index bbe9f689e7737be966eb86c7da1b4bb7fb387944..310710bab883884e143b1908bb94399f60409861 100644 (file)
--- a/dbus-c++.spec
+++ b/dbus-c++.spec
@@ -1,94 +1,143 @@
+#
+# Conditional build:
+%bcond_without ecore   # Ecore mainloop integration
+#
 Summary:       Native C++ bindings for D-Bus
+Summary(pl.UTF-8):     Natywne wiązania C++ do usługi D-Bus
 Name:          dbus-c++
 Version:       0.9.0
 Release:       1
-License:       LGPL v2+
+License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/dbus-cplusplus/lib%{name}-%{version}.tar.gz
 # Source0-md5: e752116f523fa88ef041e63d3dee4de2
-URL:           http://sourceforge.net/projects/dbus-cplusplus/
 Patch1:                %{name}-gcc4.7.patch
 Patch2:                %{name}-linkfix.patch
-BuildRequires: autoconf
+URL:           http://sourceforge.net/projects/dbus-cplusplus/
+BuildRequires: autoconf >= 2.59
 BuildRequires: automake
-BuildRequires: dbus-devel
-BuildRequires: ecore-devel
-BuildRequires: expat-devel
-BuildRequires: glib2-devel
-BuildRequires: gtkmm-devel
-BuildRequires: libtool
+BuildRequires: dbus-devel >= 1.0.0
+BuildRequires: doxygen
+%{?with_ecore:BuildRequires:   ecore-devel}
+BuildRequires: expat-devel >= 1.95
+BuildRequires: glib2-devel >= 2.0
+BuildRequires: gtkmm-devel >= 2.4
+BuildRequires: libstdc++-devel
+BuildRequires: libtool >= 2:1.5
+BuildRequires: pkgconfig
+Requires:      dbus-libs >= 1.0.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 dbus-c++ attempts to provide a C++ API for D-Bus. The library has a
-glib/gtk and an Ecore mainloop integration.
+GLib/GTK+ and an Ecore mainloop integration.
+
+%description -l pl.UTF-8
+dbus-c++ to próba dostarczenia API C++ do usługi D-Bus. Biblioteka
+zapewnia integrację z pętlami głównymi GLib/GTK+ oraz Ecore.
 
 %package devel
 Summary:       Development files for dbus-c++
+Summary(pl.UTF-8):     Pliki programistyczne biblioteki dbus-c++
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      pkgconfig
+Requires:      dbus-devel >= 1.0.0
+Requires:      libstdc++-devel
 
 %description devel
-This package contains libraries and header files for developing
-applications that use %{name}.
+This package contains the header files for developing applications
+that use dbus-c++.
+
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji
+wykorzystujących bibliotekę dbus-c++.
 
 %package static
 Summary:       Static dbus-c++ library
+Summary(pl.UTF-8):     Statyczna biblioteka dbus-c++
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 This package contains static dbus-c++ library.
 
+%description static -l pl.UTF-8
+Ten pakiet zawiera statyczną bibliotekę dbus-c++.
+
 %package glib
-Summary:       Native C++ bindings for D-Bus (Glib Mainloop)
+Summary:       Native C++ bindings for D-Bus (GLib Mainloop)
+Summary(pl.UTF-8):     Natywne wiązania C++ do usługi D-Bus (pętla główna GLiba)
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
 
 %description glib
-Native C++ bindings for D-Bus (Glib Mainloop).
+Native C++ bindings for D-Bus (GLib Mainloop).
+
+%description glib -l pl.UTF-8
+Natywne wiązania C++ do usługi D-Bus (pętla główna GLiba).
 
 %package glib-devel
 Summary:       Development files for dbus-c++-glib
+Summary(pl.UTF-8):     Pliki programistyczne biblioteki dbus-c++-glib
 Group:         Development/Libraries
 Requires:      %{name}-glib = %{version}-%{release}
+Requires:      glib2-devel >= 2.0
 
 %description glib-devel
 Development files for dbus-c++-glib.
 
+%description glib-devel -l pl.UTF-8
+Pliki programistyczne biblioteki dbus-c++-glib.
+
 %package glib-static
 Summary:       Static dbus-c++-glib library
+Summary(pl.UTF-8):     Statyczna biblioteka dbus-c++-glib
 Group:         Development/Libraries
 Requires:      %{name}-glib-devel = %{version}-%{release}
 
 %description glib-static
 Static dbus-c++-glib library.
 
+%description glib-static -l pl.UTF-8
+Statyczna biblioteka dbus-c++-glib.
+
 %package ecore
 Summary:       Native C++ bindings for D-Bus (Ecore Mainloop)
+Summary(pl.UTF-8):     Natywne wiązania C++ do usługi D-Bus (pętla główna Ecore)
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
 
 %description ecore
 Native C++ bindings for D-Bus (Ecore Mainloop).
 
+%description ecore -l pl.UTF-8
+Natywne wiązania C++ do usługi D-Bus (pętla główna Ecore).
+
 %package ecore-devel
 Summary:       Development files for dbus-c++-ecore
+Summary(pl.UTF-8):     Pliki programistyczne biblioteki dbus-c++-ecore
 Group:         Development/Libraries
 Requires:      %{name}-ecore = %{version}-%{release}
+Requires:      ecore-devel
 
 %description ecore-devel
 Development files for dbus-c++-ecore.
 
+%description ecore-devel -l pl.UTF-8
+Pliki programistyczne biblioteki dbus-c++-ecore.
+
 %package ecore-static
 Summary:       Static dbus-c++-ecore library
+Summary(pl.UTF-8):     Statyczna biblioteka dbus-c++-ecore
 Group:         Development/Libraries
 Requires:      %{name}-ecore-devel = %{version}-%{release}
 
 %description ecore-static
 Static dbus-c++-ecore library.
 
+%description ecore-static -l pl.UTF-8
+Statyczna biblioteka dbus-c++-ecore.
+
 %prep
 %setup -q -n lib%{name}-%{version}
 %patch1 -p1
@@ -98,8 +147,10 @@ Static dbus-c++-ecore library.
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-%configure
+%configure \
+       %{!?with_ecore:--disable-ecore}
 
 %{__make}
 
@@ -116,8 +167,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
+
 %post  glib -p /sbin/ldconfig
 %postun        glib -p /sbin/ldconfig
+
 %post  ecore -p /sbin/ldconfig
 %postun        ecore -p /sbin/ldconfig
 
@@ -134,7 +187,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/dbus-c++-1
 %dir %{_includedir}/dbus-c++-1/dbus-c++
 %{_includedir}/dbus-c++-1/dbus-c++/*.h
-%exclude %{_includedir}/dbus-c++-1/dbus-c++/ecore-integration.h
+%{?with_ecore:%exclude %{_includedir}/dbus-c++-1/dbus-c++/ecore-integration.h}
 %exclude %{_includedir}/dbus-c++-1/dbus-c++/glib-integration.h
 %attr(755,root,root) %{_libdir}/libdbus-c++-1.so
 %{_pkgconfigdir}/dbus-c++-1.pc
@@ -158,6 +211,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libdbus-c++-glib-1.a
 
+%if %{with ecore}
 %files ecore
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdbus-c++-ecore-1.so.*.*.*
@@ -172,3 +226,4 @@ rm -rf $RPM_BUILD_ROOT
 %files ecore-static
 %defattr(644,root,root,755)
 %{_libdir}/libdbus-c++-ecore-1.a
+%endif