diff --git a/.gitignore b/.gitignore index 247c4e9..99d733d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -dbus-python-0.83.0.tar.gz +/dbus-python-0.83.0.tar.gz +/dbus-python-1.1.1.tar.gz diff --git a/dbus-python-0.83.0-memleak.patch b/dbus-python-0.83.0-memleak.patch deleted file mode 100644 index e80e1d3..0000000 --- a/dbus-python-0.83.0-memleak.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- dbus/connection.py.orig 2008-09-13 14:54:49.000000000 +0200 -+++ dbus/connection.py 2008-09-13 14:55:01.000000000 +0200 -@@ -484,7 +484,15 @@ - deletions.append(match) - else: - new.append(match) -- by_member[signal_name] = new -+ -+ if new: -+ by_member[signal_name] = new -+ else: -+ del by_member[signal_name] -+ if not by_member: -+ del by_interface[dbus_interface] -+ if not by_interface: -+ del self._signal_recipients_by_object_path[path] - finally: - self._signals_lock.release() - diff --git a/dbus-python.spec b/dbus-python.spec index 5d259da..98f8bd6 100644 --- a/dbus-python.spec +++ b/dbus-python.spec @@ -1,84 +1,73 @@ -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python_inc:%global python_inc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)")} %define dbus_glib_version 0.70 %define dbus_version 0.90 Summary: D-Bus Python Bindings Name: dbus-python -Version: 0.83.0 -Release: 10%{?dist} +Version: 1.1.1 +Release: 1%{?dist} + +License: MIT URL: http://www.freedesktop.org/software/dbus/ Source0: http://dbus.freedesktop.org/releases/dbus-python/%{name}-%{version}.tar.gz -License: MIT -Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: python-devel - -Patch0: dbus-python-0.83.0-memleak.patch +# for %%check +BuildRequires: dbus-x11 pygobject3 %description - D-Bus python bindings for use with python programs. %package devel Summary: Libraries and headers for dbus-python -Group: Development/Libraries -Requires: %name = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel - Headers and static libraries for hooking up custom mainloops to the dbus python bindings. + %prep %setup -q -%patch0 -p0 -b .memleak %build %configure -make +make %{?_smp_mflags} -#CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install -rm -rf %{buildroot} - make install DESTDIR=$RPM_BUILD_ROOT -#PKG_CONFIG_PATH=%{_libdir}/pkgconfig %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +# unpackaged files +rm -fv $RPM_BUILD_ROOT%{python_sitearch}/*.la +rm -rfv $RPM_BUILD_ROOT%{_datadir}/doc/dbus-python/ -rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*.la -%clean -rm -rf %{buildroot} +%check +make check + %files -%defattr(-,root,root) - -%doc COPYING ChangeLog README NEWS TODO -%doc doc/API_CHANGES.txt doc/HACKING.txt doc/tutorial.txt -%exclude %{_datadir}/doc/dbus-python - -%dir %{python_sitelib}/dbus -%dir %{python_sitelib}/dbus/mainloop +%doc COPYING ChangeLog README NEWS %{python_sitearch}/*.so -%{python_sitelib}/*.py* -%{python_sitelib}/dbus/*.py* -%{python_sitelib}/dbus/mainloop/*.py* +%{python_sitelib}/dbus/ %files devel -%defattr(-,root,root) - +%doc doc/API_CHANGES.txt doc/HACKING.txt doc/tutorial.txt %{_includedir}/dbus-1.0/dbus/dbus-python.h %{_libdir}/pkgconfig/dbus-python.pc + %changelog +* Tue Aug 07 2012 Rex Dieter 1.1.1-1 +- dbus-python-1.1.1 (#800487) + * Wed Jul 18 2012 Fedora Release Engineering - 0.83.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index e49b2df..c26884b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -562c78876219bf458d79a041af18293d dbus-python-0.83.0.tar.gz +742c7432ad0f7c3f98291d58fa2e35dc dbus-python-1.1.1.tar.gz