packages: libethos/libethos.spec - verbose files - nuke libtool files where...

Sun Apr 25 17:21:02 CEST 2010

Author: glen                         Date: Sun Apr 25 15:21:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- verbose files
- nuke libtool files where not needed (it seems to dlopen plugins as no linking with ltdl)
- do not package .py, compiled py[co] should be enough
- runtime deps due dirdeps
- add todo for subpackage suggests

---- Files affected:
packages/libethos:
   libethos.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/libethos/libethos.spec
diff -u packages/libethos/libethos.spec:1.5 packages/libethos/libethos.spec:1.6

--- packages/libethos/libethos.spec:1.5	Sat Apr 24 14:17:02 2010
+++ packages/libethos/libethos.spec	Sun Apr 25 17:20:57 2010
@@ -1,16 +1,20 @@
 # $Revision$, $Date$
+# TODO
+# - ui subpackage?
+# - subpackage for python?
+# - add -avoid-version libtool to avoid versioned libraries in %{_libdir}/ethos/plugin-loaders
 #
 # Conditional build
-%bcond_without	apidocs #disable gtk-doc
-#
-%define     _packname ethos
+%bcond_without	apidocs # disable gtk-doc
+
+%define     packname ethos
 Summary:	Reusable plugin framework for glib and gtk+
 Name:		libethos
 Version:	0.2.2
 Release:	3
 License:	LGPL v2.1
 Group:		Libraries
-Source0:	http://ftp.dronelabs.com/sources/%{_packname}/0.2/%{_packname}-%{version}.tar.gz
+Source0:	http://ftp.dronelabs.com/sources/%{packname}/0.2/%{packname}-%{version}.tar.gz
 # Source0-md5:	36cf1ef444a224556bba4d441c400300
 URL:		http://git.dronelabs.com/ethos/about/
 Patch0:		%{name}-pyc.patch
@@ -24,7 +28,10 @@
 BuildRequires:	python-pygobject-devel
 BuildRequires:	python-pygtk-devel
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.219
 BuildRequires:	vala
+Requires:	python-pygtk-gtk
+Requires:	vala
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -62,7 +69,7 @@
 Dokumentacja API biblioteki Ethos.
 
 %prep
-%setup -q -n %{_packname}-%{version}
+%setup -q -n %{packname}-%{version}
 %patch0 -p0
 
 %build
@@ -78,52 +85,79 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
+	INSTALL="install -p" \
 	HTML_DIR=%{_gtkdocdir}
 
 %{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}}
 
-%find_lang %{_packname}
+%py_postclean
+
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/gtk-2.0/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/ethos/plugin-loaders/*.la
+
+# TODO use -avoid-version in libtool instead
+rm -f $RPM_BUILD_ROOT%{_libdir}/ethos/plugin-loaders/*.so.0
+for a in $RPM_BUILD_ROOT%{_libdir}/ethos/plugin-loaders/lib*.so.*.*.*; do
+	l=${a%.0.0.0}
+	mv $a $l
+done
+
+%find_lang %{packname}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post	-p /sbin/ldconfig
-
 %postun	-p /sbin/ldconfig
 
-%files -f %{_packname}.lang
+%files -f %{packname}.lang
 %defattr(644,root,root,755)
 %doc COPYING AUTHORS README NEWS
-%attr(755,root,root) %{_libdir}/libethos*.so.*
+%attr(755,root,root) %{_libdir}/libethos-1.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libethos-1.0.so.0
+%attr(755,root,root) %{_libdir}/libethos-ui-1.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libethos-ui-1.0.so.0
+
 %dir %{_libdir}/ethos
 %dir %{_libdir}/ethos/plugin-loaders
-%attr(755,root,root) %{_libdir}/ethos/plugin-loaders/lib*.so.*
-%{_libdir}/girepository-1.0/Ethos-1.0.typelib
-%{_datadir}/vala/vapi/*.vapi
-%{_datadir}/pygtk/2.0/defs/ethos*
-%{py_sitedir}/gtk-2.0/ethos
-%{py_sitedir}/gtk-2.0/_ethos*
-%dir %{_datadir}/ethos/
-%dir %{_datadir}/ethos/icons/
+%attr(755,root,root) %{_libdir}/ethos/plugin-loaders/libcloader.so
+%attr(755,root,root) %{_libdir}/ethos/plugin-loaders/libjsloader.so
+%attr(755,root,root) %{_libdir}/ethos/plugin-loaders/libpythonloader.so
+
+%dir %{_datadir}/ethos
+%dir %{_datadir}/ethos/icons
 %{_datadir}/ethos/icons/*.png
 
+%{_libdir}/girepository-1.0/Ethos-1.0.typelib
+
+%{_datadir}/vala/vapi/ethos-1.0.vapi
+%{_datadir}/vala/vapi/ethos-ui-1.0.vapi
+
+%{_datadir}/pygtk/2.0/defs/ethos.defs
+%{_datadir}/pygtk/2.0/defs/ethosui.defs
+
+%attr(755,root,root) %{py_sitedir}/gtk-2.0/_ethos.so
+%attr(755,root,root) %{py_sitedir}/gtk-2.0/_ethosui.so
+%dir %{py_sitedir}/gtk-2.0/ethos
+%{py_sitedir}/gtk-2.0/ethos/*.py[co]
+
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/ethos-1.0
-%{_libdir}/ethos/plugin-loaders/lib*.so
-%{_libdir}/ethos/plugin-loaders/lib*.la
-%{_pkgconfigdir}/ethos*1.0.pc
-%{_libdir}/*.so
-%{_libdir}/*.la
+%{_pkgconfigdir}/ethos-1.0.pc
+%{_pkgconfigdir}/ethos-ui-1.0.pc
+%{_libdir}/libethos-1.0.so
+%{_libdir}/libethos-ui-1.0.so
+%{_libdir}/libethos-1.0.la
+%{_libdir}/libethos-ui-1.0.la
 %{_datadir}/gir-1.0/Ethos-1.0.gir
 
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/%{_packname}
+%{_gtkdocdir}/%{packname}
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -132,13 +166,20 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/04/25 15:20:57  glen
+- verbose files
+- nuke libtool files where not needed (it seems to dlopen plugins as no linking with ltdl)
+- do not package .py, compiled py[co] should be enough
+- runtime deps due dirdeps
+- add todo for subpackage suggests
+
 Revision 1.5  2010/04/24 12:17:02  caleb
 - added -j1 to make to fix periodic failed builds
 - added missing %dir
 - release 3
 
 Revision 1.4  2010/04/24 08:57:15  deejay1
-- add missing dir to %%files
+- add missing dir to %files
 
 Revision 1.3  2010/04/24 08:36:43  deejay1
 - autofoo*
@@ -151,4 +192,3 @@
 
 Revision 1.1  2010/04/23 22:20:19  caleb
 - initial add, nfy
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libethos/libethos.spec?r1=1.5&r2=1.6&f=u

