[packages/meld] use new %py_* macros

atler atler at pld-linux.org
Thu Dec 17 21:18:42 CET 2015


commit 6b36fe2fa8ecf4013fc5ca838c87b645bfd9a021
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Dec 17 21:18:25 2015 +0100

    use new %py_* macros

 meld.spec | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/meld.spec b/meld.spec
index 2e0cc25..c716c98 100644
--- a/meld.spec
+++ b/meld.spec
@@ -5,7 +5,7 @@ Summary:	Visual diff and merge tool
 Summary(pl.UTF-8):	Wizualne narzędzie do oglądania i włączania zmian (diff)
 Name:		meld
 Version:	3.15.1
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/Text
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/meld/3.15/%{name}-%{version}.tar.xz
@@ -17,7 +17,7 @@ BuildRequires:	itstool
 BuildRequires:	python-modules >= 2.7
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	rpmbuild(macros) >= 1.710
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 Requires(post,postun):	desktop-file-utils
@@ -58,18 +58,13 @@ zakładkami, pozwalający na otwieranie wielu plików diff naraz.
 %patch0 -p1
 
 %build
-%{__python} setup.py build
+%py_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # NOTE: --skip-build breaks install
-%{__python} setup.py \
-	--no-compile-schemas \
-	--no-update-icon-cache \
-	install \
-        --optimize=2 \
-        --root=$RPM_BUILD_ROOT
+%py_install
 
 %py_postclean
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/meld.git/commitdiff/6b36fe2fa8ecf4013fc5ca838c87b645bfd9a021



More information about the pld-cvs-commit mailing list