SPECS: apport.spec - drop patch2 (RPMSourcePackage - breaks apport) - insta...

[patrys]

Author: patrys                       Date: Sun Aug 24 18:26:45 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- drop patch2 (RPMSourcePackage - breaks apport)
- install to bindir
- rel 1

---- Files affected:
SPECS:
   apport.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/apport.spec
diff -u SPECS/apport.spec:1.13 SPECS/apport.spec:1.14
--- SPECS/apport.spec:1.13	Mon May  5 17:16:16 2008
+++ SPECS/apport.spec	Sun Aug 24 20:26:40 2008
@@ -1,17 +1,16 @@
 # $Revision$, $Date$
 Summary:	Read, write, and modify problem reports
 Name:		apport
-Version:	0.108.1
-Release:	0.4
+Version:	0.108.2
+Release:	1
 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
 URL:		https://wiki.ubuntu.com/Apport
 BuildRequires:	gettext
 BuildRequires:	intltool
@@ -89,10 +88,9 @@
 happen with normal user privileges.
 
 %prep
-%setup -q -n %{name}-0.108
+%setup -q -n hardy
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # only used by debian
 rm apport/packaging.py
@@ -114,8 +112,7 @@
 rm -rf $RPM_BUILD_ROOT
 python setup.py install \
 	--optimize=2 \
-	--root=$RPM_BUILD_ROOT \
-	--install-scripts %{_datadir}/apport
+	--root=$RPM_BUILD_ROOT
 
 %py_postclean
 
@@ -168,13 +165,13 @@
 %{_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
@@ -194,12 +191,12 @@
 
 %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
@@ -208,9 +205,9 @@
 %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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -218,7 +215,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.13  2008/05/05 15:16:16  patrys
+Revision 1.14  2008/08/24 18:26:40  patrys
+- drop patch2 (RPMSourcePackage - breaks apport)
+- install to bindir
+- rel 1
+
+Revision 1.13  2008-05-05 15:16:16  patrys
 - 0.108.1
 
 Revision 1.12  2008-04-24 12:06:14  glen
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apport.spec?r1=1.13&r2=1.14&f=u