[packages/ntrack] - more fine-grained split (separated glib binding, individual -devel packages for base, -glib, -qt4)

qboosh qboosh at pld-linux.org
Sat Jan 12 18:32:09 CET 2013 

commit c45d3162efdcc78743667993afc8ace1c6fb508e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jan 12 18:32:24 2013 +0100

    - more fine-grained split (separated glib binding, individual -devel packages for base, -glib, -qt4)
    - added am patch (fixes build with automake 1.13)

 ntrack-am.patch |  11 ++++
 ntrack.spec     | 174 +++++++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 138 insertions(+), 47 deletions(-)
---
diff --git a/ntrack.spec b/ntrack.spec
index fede1f8..8a2bb59 100644
--- a/ntrack.spec
+++ b/ntrack.spec
@@ -1,8 +1,8 @@
 #
-%bcond_without	tests
+# Conditional build:
+%bcond_without	tests	# don't perform "make check"
 #
 %define		file_ver	%(echo %{version} | tr -d .)
-
 Summary:	Network status tracking made easy for desktop applications
 Summary(pl.UTF-8):	Łatwe śledzenie stanu sieci dla aplikacji użytkowych
 Name:		ntrack
@@ -40,30 +40,6 @@ biblioteki dla programistów aplikacji chcących otrzymywać zdarzenia
 przy zmianach stanu podłączenia do sieci, tzn. podłączenia, odłączenia
 lub zmianach trasowania.
 
-%package qt4
-Summary:	Qt4 bindings for ntrack library
-Summary(pl.UTF-8):	Wiązania Qt4 do biblioteki ntrack
-Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%description qt4
-Qt4 bindings for ntrack library.
-
-%description qt4 -l pl.UTF-8
-Wiązania Qt4 do biblioteki ntrack.
-
-%package -n python-ntrack
-Summary:	Python bindings for ntrack library
-Summary(pl.UTF-8):	Wiązania Pythona do biblioteki ntrack
-Group:		Libraries/Python
-Requires:	%{name} = %{version}-%{release}
-
-%description -n python-ntrack
-Python bindings for ntrack library.
-
-%description -n python-ntrack -l pl.UTF-8
-Wiązania Pythona do biblioteki ntrack.
-
 %package devel
 Summary:	Header files for ntrack library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki ntrack
@@ -89,6 +65,92 @@ Static ntrack library.
 %description static -l pl.UTF-8
 Statyczna biblioteka ntrack.
 
+%package glib
+Summary:	GLib 2 and GObject bindings for ntrack library
+Summary(pl.UTF-8):	Wiązania GLib 2 i GObject do biblioteki ntrack
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description glib
+GLib 2 and GObject bindings for ntrack library.
+
+%description glib -l pl.UTF-8
+Wiązania GLib 2 i GObject do biblioteki ntrack.
+
+%package glib-devel
+Summary:	GLib 2 and GObject bindings for ntrack library - header files
+Summary(pl.UTF-8):	Wiązania GLib 2 i GObject do biblioteki ntrack - pliki nagłówkowe
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	%{name}-glib = %{version}-%{release}
+
+%description glib-devel
+GLib 2 and GObject bindings for ntrack library - header files.
+
+%description glib-devel -l pl.UTF-8
+Wiązania GLib 2 i GObject do biblioteki ntrack - pliki nagłówkowe.
+
+%package glib-static
+Summary:	GLib 2 and GObject bindings for ntrack library - static libraries
+Summary(pl.UTF-8):	Wiązania GLib 2 i GObject do biblioteki ntrack - biblioteki statyczne
+Group:		Development/Libraries
+Requires:	%{name}-glib-devel = %{version}-%{release}
+
+%description glib-static
+GLib 2 and GObject bindings for ntrack library - static libraries.
+
+%description glib-static -l pl.UTF-8
+Wiązania GLib 2 i GObject do biblioteki ntrack - biblioteki statyczne.
+
+%package qt4
+Summary:	Qt4 bindings for ntrack library
+Summary(pl.UTF-8):	Wiązania Qt4 do biblioteki ntrack
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description qt4
+Qt4 bindings for ntrack library.
+
+%description qt4 -l pl.UTF-8
+Wiązania Qt4 do biblioteki ntrack.
+
+%package qt4-devel
+Summary:	Qt4 bindings for ntrack library - header files
+Summary(pl.UTF-8):	Wiązania Qt4 do biblioteki ntrack - pliki nagłówkowe
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	%{name}-qt4 = %{version}-%{release}
+
+%description qt4-devel
+Qt4 bindings for ntrack library - header files.
+
+%description qt4-devel -l pl.UTF-8
+Wiązania Qt4 do biblioteki ntrack - pliki nagłówkowe.
+
+%package qt4-static
+Summary:	Qt4 bindings for ntrack library - static library
+Summary(pl.UTF-8):	Wiązania Qt4 do biblioteki ntrack - biblioteka statyczna
+Group:		Development/Libraries
+Requires:	%{name}-qt4-devel = %{version}-%{release}
+
+%description qt4-static
+Qt4 bindings for ntrack library - static library.
+
+%description qt4-static -l pl.UTF-8
+Wiązania Qt4 do biblioteki ntrack - biblioteka statyczna.
+
+%package -n python-ntrack
+Summary:	Python bindings for ntrack library
+Summary(pl.UTF-8):	Wiązania Pythona do biblioteki ntrack
+Group:		Libraries/Python
+Requires:	%{name} = %{version}-%{release}
+
+%description -n python-ntrack
+Python bindings for ntrack library.
+
+%description -n python-ntrack -l pl.UTF-8
+Wiązania Pythona do biblioteki ntrack.
+
 %prep
 %setup -q -n %{name}-%{file_ver}
 %patch0 -p1
@@ -123,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
+%post	glib -p /sbin/ldconfig
+%postun	glib -p /sbin/ldconfig
+
 %post	qt4 -p /sbin/ldconfig
 %postun	qt4 -p /sbin/ldconfig
 
@@ -131,42 +196,57 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/libntrack.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libntrack.so.0
-%attr(755,root,root) %{_libdir}/libntrack-glib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libntrack-glib.so.2
-%attr(755,root,root) %{_libdir}/libntrack-gobject.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libntrack-gobject.so.1
 %dir %{_libdir}/ntrack
 %dir %{_libdir}/ntrack/modules
 %attr(755,root,root) %{_libdir}/ntrack/modules/ntrack-libnl3_x.so
 
-%files qt4
+%files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libntrack-qt4.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libntrack-qt4.so.1
+%attr(755,root,root) %{_libdir}/libntrack.so
+%dir %{_includedir}/ntrack
+%{_includedir}/ntrack/common
+%{_pkgconfigdir}/libntrack.pc
 
-%files -n python-ntrack
+%files static
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/pyntrack.so
+%attr(755,root,root) %{_libdir}/libntrack.a
 
-%files devel
+%files glib
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libntrack-glib.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libntrack-glib.so.2
+%attr(755,root,root) %{_libdir}/libntrack-gobject.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libntrack-gobject.so.1
+
+%files glib-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libntrack.so
 %attr(755,root,root) %{_libdir}/libntrack-glib.so
 %attr(755,root,root) %{_libdir}/libntrack-gobject.so
-%attr(755,root,root) %{_libdir}/libntrack-qt4.so
-%{_pkgconfigdir}/libntrack.pc
-%{_pkgconfigdir}/libntrack-glib.pc
-%{_pkgconfigdir}/libntrack-gobject.pc
-%{_pkgconfigdir}/libntrack-qt4.pc
-%dir %{_includedir}/ntrack
-%{_includedir}/ntrack/common
 %{_includedir}/ntrack/glib
 %{_includedir}/ntrack/gobject
-%{_includedir}/ntrack/qt4
+%{_pkgconfigdir}/libntrack-glib.pc
+%{_pkgconfigdir}/libntrack-gobject.pc
 
-%files static
+%files glib-static
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libntrack-glib.a
 %attr(755,root,root) %{_libdir}/libntrack-gobject.a
+
+%files qt4
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libntrack-qt4.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libntrack-qt4.so.1
+
+%files qt4-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libntrack-qt4.so
+%{_pkgconfigdir}/libntrack-qt4.pc
+%{_includedir}/ntrack/qt4
+
+%files qt4-static
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libntrack-qt4.a
-%attr(755,root,root) %{_libdir}/libntrack.a
+
+%files -n python-ntrack
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py_sitedir}/pyntrack.so
diff --git a/ntrack-am.patch b/ntrack-am.patch
new file mode 100644
index 0000000..7b03ad2
--- /dev/null
+++ b/ntrack-am.patch
@@ -0,0 +1,11 @@
+--- ntrack-016/configure.ac.orig	2011-11-13 01:55:30.000000000 +0100
++++ ntrack-016/configure.ac	2013-01-12 17:30:59.800293663 +0100
+@@ -29,7 +29,7 @@
+ AM_INIT_AUTOMAKE(ntrack, 016)
+ 
+ dnl create a config.h file (Automake will add -DHAVE_CONFIG_H)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ dnl enable maintainer mode by default
+ AM_MAINTAINER_MODE([enable])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ntrack.git/commitdiff/c45d3162efdcc78743667993afc8ace1c6fb508e

More information about the pld-cvs-commit mailing list