[packages/abrt] - added pythondir patch (install python module to arch-specific dir); no longer noarch

qboosh qboosh at pld-linux.org
Fri Sep 27 19:56:41 CEST 2013


commit 497bc3520fe0b955eae39f36db0edb9d0ccb1a96
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Sep 27 19:57:18 2013 +0200

    - added pythondir patch (install python module to arch-specific dir); no longer noarch

 abrt-pythondir.patch | 10 ++++++++++
 abrt.spec            | 10 ++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/abrt.spec b/abrt.spec
index 14d4f24..d46e8c5 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -17,6 +17,7 @@ Patch0:		%{name}-rpm5.patch
 Patch1:		%{name}-rpm45.patch
 Patch2:		format_security.patch
 Patch3:		%{name}-link.patch
+Patch4:		%{name}-pythondir.patch
 URL:		https://fedorahosted.org/abrt/
 BuildRequires:	asciidoc
 BuildRequires:	autoconf >= 2.50
@@ -261,9 +262,6 @@ Summary:	ABRT Python API
 Summary(pl.UTF-8):	API Pythona do ABRT
 Group:		Libraries/Python
 Requires:	%{name} = %{version}-%{release}
-%if "%{_rpmversion}" >= "5.0"
-BuildArch:	noarch
-%endif
 
 %description python
 High-level API for querying, creating and manipulating problems
@@ -398,6 +396,7 @@ się do powłoki.
 %endif
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -431,6 +430,7 @@ cat >$RPM_BUILD_ROOT/usr/lib/tmpfiles.d/abrt.conf <<EOF
 /var/run/%{name} 0755 root root -
 EOF
 
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/problem/*.la
 # outdated copy of lt
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/lt_LT
 
@@ -684,7 +684,9 @@ fi
 
 %files python
 %defattr(644,root,root,755)
-%{py_sitescriptdir}/problem
+%dir %{py_sitedir}/problem
+%attr(755,root,root) %{py_sitedir}/problem/_pyabrt.so
+%{py_sitedir}/problem/*.py[co]
 %{_mandir}/man5/abrt-python.5*
 %{_docdir}/abrt-python-%{version}
 
diff --git a/abrt-pythondir.patch b/abrt-pythondir.patch
new file mode 100644
index 0000000..d51e3c2
--- /dev/null
+++ b/abrt-pythondir.patch
@@ -0,0 +1,10 @@
+--- abrt-2.1.7/src/python-problem/problem/Makefile.am.orig	2013-09-10 14:11:13.000000000 +0200
++++ abrt-2.1.7/src/python-problem/problem/Makefile.am	2013-09-27 19:40:42.648094557 +0200
+@@ -1,6 +1,6 @@
+ problem_PYTHON = __init__.py exception.py proxies.py tools.py watch.py config.py
+ 
+-problemdir = $(pythondir)/problem
++problemdir = $(pyexecdir)/problem
+ 
+ pyabrtdir = $(problemdir)
+ pyabrt_LTLIBRARIES = _pyabrt.la
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/abrt.git/commitdiff/497bc3520fe0b955eae39f36db0edb9d0ccb1a96



More information about the pld-cvs-commit mailing list