From 3f26d87c2acb833c230ec96c6601b0ea45abef88 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 28 Jan 2014 19:30:47 +0100 Subject: [PATCH] - cleaned up subpackages and files - rel 1 --- dbus-c++.spec | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/dbus-c++.spec b/dbus-c++.spec index 902878f..a882a31 100644 --- a/dbus-c++.spec +++ b/dbus-c++.spec @@ -1,7 +1,7 @@ Summary: Native C++ bindings for D-Bus Name: dbus-c++ Version: 0.9.0 -Release: 0.1 +Release: 1 License: LGPL v2+ Group: Libraries Source0: http://downloads.sourceforge.net/dbus-cplusplus/lib%{name}-%{version}.tar.gz @@ -23,7 +23,7 @@ dbus-c++ attempts to provide a C++ API for D-Bus. The library has a glib/gtk and an Ecore mainloop integration. %package devel -Summary: Development files for %{name} +Summary: Development files for dbus-c++ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig @@ -41,44 +41,55 @@ Requires: %{name}-devel = %{version}-%{release} This package contains static dbus-c++ library. %package glib +Summary: Native C++ bindings for D-Bus (Glib Mainloop) Group: Libraries Requires: %{name} = %{version}-%{release} %description glib +Native C++ bindings for D-Bus (Glib Mainloop). %package glib-devel +Summary: Development files for dbus-c++-glib Group: Development/Libraries Requires: %{name}-glib = %{version}-%{release} -%description glib +%description glib-devel +Development files for dbus-c++-glib. %package glib-static +Summary: Static dbus-c++-glib library Group: Development/Libraries Requires: %{name}-glib-devel = %{version}-%{release} -%description glib +%description glib-static +Static dbus-c++-glib library. %package ecore +Summary: Native C++ bindings for D-Bus (Ecore Mainloop) Group: Libraries Requires: %{name} = %{version}-%{release} %description ecore +Native C++ bindings for D-Bus (Ecore Mainloop). %package ecore-devel +Summary: Development files for dbus-c++-ecore Group: Development/Libraries Requires: %{name}-ecore = %{version}-%{release} %description ecore-devel +Development files for dbus-c++-ecore. %package ecore-static +Summary: Static dbus-c++-ecore library Group: Development/Libraries Requires: %{name}-ecore-devel = %{version}-%{release} %description ecore-static +Static dbus-c++-ecore library. %prep %setup -q -n lib%{name}-%{version} -%{__sed} -i 's/\r//' AUTHORS %patch1 -p1 %patch2 -p1 @@ -87,8 +98,7 @@ Requires: %{name}-ecore-devel = %{version}-%{release} %{__aclocal} %{__autoconf} %{__automake} -%configure \ - --disable-tests +%configure %{__make} @@ -105,20 +115,28 @@ 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 %files %defattr(644,root,root,755) -%doc COPYING AUTHORS +%doc AUTHORS TODO %attr(755,root,root) %{_bindir}/dbusxx-introspect %attr(755,root,root) %{_bindir}/dbusxx-xml2cpp %attr(755,root,root) %{_libdir}/libdbus-c++-1.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libdbus-c++-1.so.0 %files devel %defattr(644,root,root,755) -%doc TODO -%{_includedir}/* +%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 +%exclude %{_includedir}/dbus-c++-1/dbus-c++/glib-integration.h %attr(755,root,root) %{_libdir}/libdbus-c++-1.so -%{_pkgconfigdir}/* +%{_pkgconfigdir}/dbus-c++-1.pc %files static %defattr(644,root,root,755) @@ -127,10 +145,13 @@ rm -rf $RPM_BUILD_ROOT %files glib %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libdbus-c++-glib-1.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libdbus-c++-glib-1.so.0 %files glib-devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libdbus-c++-glib-1.so +%{_includedir}/dbus-c++-1/dbus-c++/glib-integration.h +%{_pkgconfigdir}/dbus-c++-glib-1.pc %files glib-static %defattr(644,root,root,755) @@ -139,10 +160,13 @@ rm -rf $RPM_BUILD_ROOT %files ecore %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libdbus-c++-ecore-1.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libdbus-c++-ecore-1.so.0 %files ecore-devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libdbus-c++-ecore-1.so +%{_includedir}/dbus-c++-1/dbus-c++/ecore-integration.h +%{_pkgconfigdir}/dbus-c++-ecore-1.pc %files ecore-static %defattr(644,root,root,755) -- 2.44.0