BR: rpmbuild(macros) >= 1.710

[packages/apport.git] / apport.spec

diff --git a/apport.spec b/apport.spec
index 60513597fdcbd017018104a9d1781c310f0c997e..af0f6a2591c827ea69f2fc5ecb717940952df91f 100644 (file)
--- a/apport.spec
+++ b/apport.spec
@@ -1,23 +1,26 @@
 Summary:       Read, write, and modify problem reports
 Name:          apport
-Version:       0.108.1
-Release:       0.4
+Version:       0.108.2
+Release:       5
 License:       GPL
 Group:         Applications/System
 Source0:       https://launchpad.net/ubuntu/hardy/+source/apport/%{version}/+files/%{name}_%{version}.tar.gz
-# Source0-md5: a4e7f9d2021b7669f10ac47235365ca7
+# Source0-md5: b2eb9a3b1168329ae7cdeb2a988d3443
 Source1:       %{name}.init
 Source2:       %{name}-backend-pld.py
 Patch0:                %{name}-pager.patch
 Patch1:                %{name}-crashdb.patch
-Patch2:                %{name}-sourcepackage.patch
+Patch2:                %{name}-gtk-glade.patch
 URL:           https://wiki.ubuntu.com/Apport
-BuildRequires: gettext
+BuildRequires: gettext-tools
 BuildRequires: intltool
 BuildRequires: python-devel >= 1:2.5
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: python-modules
+BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.710
 #BuildRequires:        tetex-format-pdflatex
 #BuildRequires:        tetex-latex
+Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): hicolor-icon-theme
 Requires(post,postun): shared-mime-info
 Requires(post,preun):  /sbin/chkconfig
@@ -88,7 +91,7 @@ variables), the entire process of retracing crashes in chroots can
 happen with normal user privileges.
 
 %prep
-%setup -q -n %{name}-0.108
+%setup -q -n hardy
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -102,7 +105,7 @@ cp %{SOURCE2} apport/packaging_pld.py
 ln -s packaging_pld.py apport/packaging_impl.py
 
 %build
-python setup.py build
+%py_build
 %{__make} -C po
 %{__make} -C gtk
 %{__make} -C qt4
@@ -111,10 +114,7 @@ python setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python setup.py install \
-       --optimize=2 \
-       --root=$RPM_BUILD_ROOT \
-       --install-scripts %{_datadir}/apport
+%py_install
 
 %py_postclean
 
@@ -167,13 +167,13 @@ fi
 %{_datadir}/mime/packages/apport.xml
 %{py_sitescriptdir}/apport-*.egg-info
 %dir %{_datadir}/apport
-%attr(755,root,root) %{_datadir}/apport/apport
-%attr(755,root,root) %{_datadir}/apport/apport-cli
-%attr(755,root,root) %{_datadir}/apport/gcc_ice_hook
-%attr(755,root,root) %{_datadir}/apport/apport-checkreports
-%attr(755,root,root) %{_datadir}/apport/package_hook
-%attr(755,root,root) %{_datadir}/apport/kernel_hook
-%attr(755,root,root) %{_datadir}/apport/apport-unpack
+%attr(755,root,root) %{_bindir}/apport
+%attr(755,root,root) %{_bindir}/apport-cli
+%attr(755,root,root) %{_bindir}/gcc_ice_hook
+%attr(755,root,root) %{_bindir}/apport-checkreports
+%attr(755,root,root) %{_bindir}/package_hook
+%attr(755,root,root) %{_bindir}/kernel_hook
+%attr(755,root,root) %{_bindir}/apport-unpack
 %attr(755,root,root) %{_datadir}/apport/testsuite/
 %dir %{_datadir}/apport/general-hooks/
 %attr(755,root,root) %{_datadir}/apport/general-hooks/*.py
@@ -193,12 +193,12 @@ fi
 
 %files gtk
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_datadir}/apport/apport-gtk
+%attr(755,root,root) %{_bindir}/apport-gtk
 %{_datadir}/apport/apport-gtk.glade
 
 %files qt
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_datadir}/apport/apport-qt
+%attr(755,root,root) %{_bindir}/apport-qt
 %{_datadir}/apport/*.ui
 %{_desktopdir}/apport-qt.desktop
 %{_desktopdir}/apport-qt-mime.desktop
@@ -207,6 +207,6 @@ fi
 %files retrace
 %defattr(644,root,root,755)
 %{_mandir}/man1/apport-retrace.1*
-%attr(755,root,root) %{_datadir}/apport/apport-retrace
-%attr(755,root,root) %{_datadir}/apport/apport-chroot
-%attr(755,root,root) %{_datadir}/apport/dupdb-admin
+%attr(755,root,root) %{_bindir}/apport-retrace
+%attr(755,root,root) %{_bindir}/apport-chroot
+%attr(755,root,root) %{_bindir}/dupdb-admin