[packages/python-gnome] - revised some dependencies, package -apidocs

qboosh qboosh at pld-linux.org
Sun Jan 12 14:27:03 CET 2014


commit 5ce7696c4470907f5a520ab0c303f393cbeac4cc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jan 12 14:27:55 2014 +0100

    - revised some dependencies, package -apidocs

 python-gnome.spec | 152 +++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 105 insertions(+), 47 deletions(-)
---
diff --git a/python-gnome.spec b/python-gnome.spec
index a147869..de7a64e 100644
--- a/python-gnome.spec
+++ b/python-gnome.spec
@@ -1,12 +1,13 @@
 %define		module		gnome-python
-%define		pygtk_req	2:2.16.0
-%define		pyorbit_req	2.14.2
+%define		pygobject_ver	2.17.0
+%define		pygtk_ver	2:2.16.0
+%define		pyorbit_ver	2.14.2
 Summary:	GNOME bindings for Python
 Summary(pl.UTF-8):	Wiązania Pythona do bibliotek GNOME
 Name:		python-gnome
 Version:	2.28.1
 Release:	7
-License:	GPL v2+/LGPL v2.1+
+License:	LGPL v2.1+
 Group:		Libraries/Python
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-python/2.28/%{module}-%{version}.tar.bz2
 # Source0-md5:	a17ad952813ed86f520de8e07194a2bf
@@ -15,21 +16,24 @@ BuildRequires:	glib2-devel >= 1:2.16.0
 BuildRequires:	gnome-common >= 2.20.0
 BuildRequires:	gnome-vfs2-devel >= 2.22.0
 BuildRequires:	gtk+2-devel >= 2:2.12.0
+BuildRequires:	libbonobo-devel >= 2.22.0
 BuildRequires:	libbonoboui-devel >= 2.22.0
+BuildRequires:	libgnome-devel >= 2.22.0
+BuildRequires:	libgnomecanvas-devel >= 2.8.0
 BuildRequires:	libgnomeui-devel >= 2.22.0
-BuildRequires:	libtool
+BuildRequires:	libxslt-progs
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
 BuildRequires:	python-devel >= 1:2.3.2
-BuildRequires:	python-pygtk-devel >= %{pygtk_req}
-BuildRequires:	python-pyorbit-devel >= %{pyorbit_req}
+BuildRequires:	python-pygobject-devel >= %{pygobject_ver}
+BuildRequires:	python-pygtk-devel >= %{pygtk_ver}
+BuildRequires:	python-pyorbit-devel >= %{pyorbit_ver}
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.197
-%pyrequires_eq	python-modules
-Requires:	%{name}-bonobo = %{version}-%{release}
-Requires:	%{name}-gconf = %{version}-%{release}
-Requires:	%{name}-vfs = %{version}-%{release}
-Requires:	libgnomeui >= 2.22.0
+BuildRequires:	rpmbuild(macros) >= 1.219
+BuildRequires:	sed >= 4.0
+Requires:	%{name}-common = %{version}-%{release}
+Requires:	libgnome-libs >= 2.22.0
+Requires:	python-pygobject >= %{pygobject_ver}
 Obsoletes:	gnome-python
 Obsoletes:	gnome-python-nautilus
 Obsoletes:	python-gnome-nautilus
@@ -47,8 +51,9 @@ Wiązania Pythona do bibliotek GNOME.
 Summary:	Bonobo bindings for Python
 Summary(pl.UTF-8):	Wiązania Pythona do biblioteki Bonobo
 Group:		Libraries/Python
-Requires:	python-pygobject >= 2.14.0
-Requires:	python-pyorbit >= %{pyorbit_req}
+Requires:	libbonobo-libs >= 2.22.0
+Requires:	python-pygobject >= %{pygobject_ver}
+Requires:	python-pyorbit >= %{pyorbit_ver}
 
 %description bonobo
 Bonobo bindings for Python.
@@ -60,11 +65,12 @@ Wiązania Pythona do biblioteki Bonobo.
 Summary:	Bonobo User Interface bindings for Python
 Summary(pl.UTF-8):	Wiązania Pythona do biblioteki interfejsu użytkownika Bonobo
 Group:		Libraries/Python
-Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-bonobo = %{version}-%{release}
 Requires:	%{name}-canvas = %{version}-%{release}
-Requires:	%{name}-gconf = %{version}-%{release}
-Requires:	%{name}-vfs = %{version}-%{release}
+Requires:	libbonoboui >= 2.22.0
+Requires:	libgnome-libs >= 2.22.0
+Requires:	python-pygobject >= %{pygobject_ver}
+Requires:	python-pygtk-gtk >= %{pygtk_ver}
 
 %description bonobo-ui
 Bonobo User Interface bindings for Python.
@@ -76,7 +82,10 @@ Wiązania Pythona do biblioteki interfejsu użytkownika Bonobo.
 Summary:	GNOME Canvas bindings for Python
 Summary(pl.UTF-8):	Wiązania Pythona do biblioteki GNOME Canvas
 Group:		Libraries/Python
-Requires:	python-pygtk-gtk >= %{pygtk_req}
+Requires:	%{name}-common = %{version}-%{release}
+Requires:	libgnomecanvas >= 2.8.0
+Requires:	python-pygobject >= %{pygobject_ver}
+Requires:	python-pygtk-gtk >= %{pygtk_ver}
 
 %description canvas
 GNOME Canvas bindings for Python.
@@ -88,8 +97,9 @@ Wiązania Pythona do biblioteki GNOME Canvas.
 Summary:	GConf bindings for Python
 Summary(pl.UTF-8):	Wiązania Pythona do biblioteki GConf
 Group:		Libraries/Python
-Requires:	python-pygobject >= 2.14.0
-Requires:	python-pyorbit >= %{pyorbit_req}
+Requires:	%{name}-common = %{version}-%{release}
+Requires:	GConf2-libs >= 2.22.0
+Requires:	python-pygobject >= %{pygobject_ver}
 
 %description gconf
 GConf bindings for Python.
@@ -102,6 +112,10 @@ Summary:	GNOME User Interface bindings for Python
 Summary(pl.UTF-8):	Wiązania Pythona do biblioteki interfejsu użytkownika GNOME
 Group:		Libraries/Python
 Requires:	%{name}-bonobo-ui = %{version}-%{release}
+Requires:	%{name}-canvas = %{version}-%{release}
+Requires:	libgnomeui >= 2.22.0
+Requires:	python-pygobject >= %{pygobject_ver}
+Requires:	python-pygtk-gtk >= %{pygtk_ver}
 
 %description ui
 GNOME User Interface bindings for Python.
@@ -113,8 +127,11 @@ Wiązania Pythona do biblioteki interfejsu użytkownika GNOME.
 Summary:	GNOME VFS bindings for Python
 Summary(pl.UTF-8):	Wiązania Pythona do biblioteki GNOME VFS
 Group:		Libraries/Python
-Requires:	%{name}-bonobo = %{version}-%{release}
-Requires:	%{name}-gconf = %{version}-%{release}
+Requires:	%{name}-common = %{version}-%{release}
+Requires:	gnome-vfs2-libs >= 2.22.0
+Requires:	libbonobo-libs >= 2.22.0
+Requires:	python-pygobject >= %{pygobject_ver}
+Requires:	python-pyorbit >= %{pyorbit_ver}
 
 %description vfs
 GNOME VFS bindings for Python.
@@ -122,19 +139,50 @@ GNOME VFS bindings for Python.
 %description vfs -l pl.UTF-8
 Wiązania Pythona do biblioteki GNOME VFS.
 
+%package common
+Summary:	Common files for Python GNOME bindings
+Summary(pl.UTF-8):	Pliki wspólne wiązań Pythona do GNOME
+Group:		Libraries/Python
+Requires:	python-libs >= 1:2.3.2
+Requires:	python-pygobject >= %{pygobject_ver}
+
+%description common
+Common files for Python GNOME bindings.
+
+%description common -l pl.UTF-8
+Pliki wspólne wiązań Pythona do GNOME.
+
 %package devel
-Summary:	Development files for GNOME bindings for Python
+Summary:	Development files for Python GNOME bindings
 Summary(pl.UTF-8):	Pliki programistyczne wiązań Pythona do GNOME
-Group:		Libraries/Python
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-bonobo = %{version}-%{release}
+Requires:	%{name}-bonobo-ui = %{version}-%{release}
+Requires:	%{name}-canvas = %{version}-%{release}
+Requires:	%{name}-gconf = %{version}-%{release}
 Requires:	%{name}-ui = %{version}-%{release}
-Requires:	python-pygtk-devel >= %{pygtk_req}
+Requires:	%{name}-vfs = %{version}-%{release}
+Requires:	gnome-vfs2-devel >= 2.22.0
+Requires:	python-pygtk-devel >= %{pygtk_ver}
 
 %description devel
-Development files for GNOME bindings for Python.
+Development files for Python GNOME bindings.
 
 %description devel -l pl.UTF-8
 Pliki programistyczne wiązań Pythona do GNOME.
 
+%package apidocs
+Summary:	API documentation for Python GNOME bindings
+Summary(pl.UTF-8):	Dokumentacja API wiązań Pythona do GNOME
+Group:		Documentation
+
+%description apidocs
+API documentation for Python GNOME bindings.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API wiązań Pythona do GNOME.
+
 %package examples
 Summary:	Example programs for python-gnome
 Summary(pl.UTF-8):	Przykładowe programy do python-gnome
@@ -150,11 +198,16 @@ Ten pakiet zawiera przykładowe programy dla python-gnome.
 %prep
 %setup -q -n %{module}-%{version}
 
+%{__sed} -i -e 's,${DATADIR}/gtk-doc/html/,%{_gtkdocdir}/,' docs/gnomevfs/wscript
+
 %build
+CC="%{__cc}" \
+CFLAGS="%{rpmcflags}" \
 ./waf configure \
 	--prefix %{_prefix} \
 	--libdir %{_libdir}
-./waf build
+./waf build \
+	--verbose
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -164,13 +217,11 @@ rm -rf $RPM_BUILD_ROOT
 # waf is sucker, and does not +x executables
 find $RPM_BUILD_ROOT -name '*.so' | xargs chmod a+rx
 
+%py_postclean
+
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-# waf doesn't install .la, but we want to be sure not to package them
-%{__rm} -f $RPM_BUILD_ROOT%{py_sitedir}/gtk-2.0/{*.la,*/{*.la,*.py}}
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.la
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -179,24 +230,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog AUTHORS
-%dir %{py_sitedir}/gtk-2.0/gnome
 %{py_sitedir}/gtk-2.0/gnome/__init__.py[co]
 %attr(755,root,root) %{py_sitedir}/gtk-2.0/gnome/_gnome.so
 
-%files devel
-%defattr(644,root,root,755)
-%{_includedir}/gnome-python-2.0
-%dir %{_datadir}/pygtk/2.0/argtypes
-%{_datadir}/pygtk/2.0/argtypes/bonobo-arg-types.py*
-%{_datadir}/pygtk/2.0/argtypes/gconf-arg-types.py*
-%{pydefsdir}/*.defs
-%{_pkgconfigdir}/gnome-python-2.0.pc
-
-%files examples
-%defattr(644,root,root,755)
-%{_examplesdir}/%{name}-%{version}
-
 %files bonobo
 %defattr(644,root,root,755)
 %dir %{py_sitedir}/gtk-2.0/bonobo
@@ -223,9 +259,31 @@ rm -rf $RPM_BUILD_ROOT
 
 %files vfs
 %defattr(644,root,root,755)
-%{py_sitedir}/gtk-2.0/gnome/vfs.py[co]
 %dir %{py_sitedir}/gtk-2.0/gnomevfs
 %attr(755,root,root) %{py_sitedir}/gtk-2.0/gnomevfs/_gnomevfs.so
 %attr(755,root,root) %{py_sitedir}/gtk-2.0/gnomevfs/gnomevfsbonobo.so
 %{py_sitedir}/gtk-2.0/gnomevfs/__init__.py[co]
+%{py_sitedir}/gtk-2.0/gnome/vfs.py[co]
 %attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libpythonmethod.so
+
+%files common
+%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog NEWS README
+%dir %{py_sitedir}/gtk-2.0/gnome
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/gnome-python-2.0
+%dir %{_datadir}/pygtk/2.0/argtypes
+%{_datadir}/pygtk/2.0/argtypes/bonobo-arg-types.py*
+%{_datadir}/pygtk/2.0/argtypes/gconf-arg-types.py*
+%{pydefsdir}/*.defs
+%{_pkgconfigdir}/gnome-python-2.0.pc
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/pygnomevfs
+
+%files examples
+%defattr(644,root,root,755)
+%{_examplesdir}/%{name}-%{version}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-gnome.git/commitdiff/5ce7696c4470907f5a520ab0c303f393cbeac4cc



More information about the pld-cvs-commit mailing list