[packages/ghc] - updated noarch rule, use __mv macro

qboosh qboosh at pld-linux.org
Fri Dec 18 20:47:46 CET 2020


commit 2f24ffdcb1eb79fd494b2046b7ef14fea071d596
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Dec 18 20:48:22 2020 +0100

    - updated noarch rule, use __mv macro

 ghc.spec | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/ghc.spec b/ghc.spec
index 87d75ed..39789ce 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -81,7 +81,7 @@ BuildRequires:	gmp-devel
 %{?with_system_libffi:BuildRequires:	libffi-devel}
 BuildRequires:	ncurses-devel
 BuildRequires:	readline-devel
-BuildRequires:	rpmbuild(macros) >= 1.607
+BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	sed >= 4.0
 %if %{with bootstrap}
 %ifarch %{x8664} %{ix86}
@@ -242,9 +242,7 @@ potrzebujemy systemu profilującego z GHC.
 Summary:	Documentation for GHC
 Summary(pl.UTF-8):	Dokumentacja do GHC
 Group:		Documentation
-%if "%{_rpmversion}" >= "5"
-BuildArch:	noarch
-%endif
+%{?noarchpackage}
 
 %description doc
 Documentation for GHC.
@@ -264,7 +262,7 @@ Dokumentacja do GHC.
 %ifarch %{x8664}
 %{__tar} -xf %{SOURCE4}
 %endif
-mv %{name}-%{bootversion} binsrc
+%{__mv} %{name}-%{bootversion} binsrc
 %endif
 
 # debian binaries for x32
@@ -399,7 +397,7 @@ rm -rf docs-root
 	DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with doc}
-mv -f $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} docs-root
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} docs-root
 
 # fix paths to docs in package list
 sed -i -e 's|%{_datadir}/doc/%{name}|%{_docdir}/%{name}-%{version}|g' $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/package.conf.d/*.conf
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ghc.git/commitdiff/2f24ffdcb1eb79fd494b2046b7ef14fea071d596



More information about the pld-cvs-commit mailing list