[packages/gnome-common] drop m4 macros conflicting with autoconf-archive

glen glen at pld-linux.org
Wed Mar 25 11:18:15 CET 2015


commit 25285408f5980441530a0e37bdd39200b9aa3503
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Mar 25 12:18:04 2015 +0200

    drop m4 macros conflicting with autoconf-archive

 gnome-common.spec | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/gnome-common.spec b/gnome-common.spec
index 4752495..c36c34a 100644
--- a/gnome-common.spec
+++ b/gnome-common.spec
@@ -3,7 +3,7 @@ Summary(es.UTF-8):	Macros comunes útiles para construir paquetes de GNOME
 Summary(pl.UTF-8):	Wspólne makra przydatne do budowania pakietów GNOME
 Name:		gnome-common
 Version:	3.14.0
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Development/Tools
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-common/3.14/%{name}-%{version}.tar.xz
@@ -17,6 +17,7 @@ BuildRequires:	automake >= 1:1.9
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 Requires:	autoconf >= 2.53
+Requires:	autoconf-archive
 Requires:	automake >= 1:1.11.2
 Requires:	glib2-devel >= 1:2.42.1
 Requires:	pkgconfig >= 1:0.14.0
@@ -49,10 +50,13 @@ Ten pakiet dostarcza makra do budowania pakietów GNOME.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
+	INSTALL="install -p" \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_aclocaldir}/ax_check_enable_debug.m4
+%{__rm} $RPM_BUILD_ROOT%{_aclocaldir}/ax_code_coverage.m4
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -60,8 +64,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gnome-autogen.sh
 %attr(755,root,root) %{_bindir}/gnome-doc-common
-%{_aclocaldir}/ax_check_enable_debug.m4
-%{_aclocaldir}/ax_code_coverage.m4
 %{_aclocaldir}/gnome-code-coverage.m4
 %{_aclocaldir}/gnome-common.m4
 %{_aclocaldir}/gnome-compiler-flags.m4
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnome-common.git/commitdiff/25285408f5980441530a0e37bdd39200b9aa3503



More information about the pld-cvs-commit mailing list