[packages/parallel] pld fixes

glen glen at pld-linux.org
Mon Dec 30 07:14:45 CET 2013


commit 8027a409657a62bba42ddfab56c3d8890d271e31
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Dec 30 08:13:33 2013 +0200

    pld fixes
    
    - fix group
    - fix missing buildroot
    - do not assume compressed manpages
    - remove whole doc dir not packaged
    - package parallel_tutorial.1

 parallel.spec | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)
---
diff --git a/parallel.spec b/parallel.spec
index f6e5034..58a8997 100644
--- a/parallel.spec
+++ b/parallel.spec
@@ -1,16 +1,17 @@
-%include        /usr/lib/rpm/macros.perl
+%include	/usr/lib/rpm/macros.perl
 Summary:	Shell tool for executing jobs in parallel
 Name:		parallel
 Version:	20131222
 Release:	1
 License:	GPL v3+
-Group:		X11/Applications
-URL:		http://www.gnu.org/software/parallel/
+Group:		Applications/System
 Source0:	http://ftp.gnu.org/gnu/parallel/%{name}-%{version}.tar.bz2
 # Source0-md5:	782e594b226454ef58ac4e3d4addaba4
+URL:		http://www.gnu.org/software/parallel/
 BuildRequires:	perl-tools-pod
 BuildRequires:	rpm-perlprov
 BuildArch:	noarch
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 GNU Parallel is a shell tool for executing jobs in parallel using one
@@ -34,7 +35,6 @@ GNU Parallel is command-line-compatible with moreutils' parallel, but
 offers additional features.
 
 %prep
-
 %setup -q
 
 %build
@@ -42,34 +42,31 @@ offers additional features.
 %{__make}
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/parallel
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-find $RPM_BUILD_ROOT -iname "*.html" -delete
-find $RPM_BUILD_ROOT -iname "*.texi" -delete
-find $RPM_BUILD_ROOT -iname "*.pod" -delete
-
-mv $RPM_BUILD_ROOT%{_mandir}/man1/sql.1 $RPM_BUILD_ROOT%{_mandir}/man1/parallel-sql.1
-
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/parallel
+mv $RPM_BUILD_ROOT%{_mandir}/man1/{sql,parallel-sql}.1
 :> $RPM_BUILD_ROOT%{_sysconfdir}/parallel/config
+rm -rv $RPM_BUILD_ROOT%{_docdir}/parallel
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README NEWS COPYING src/parallel.html src/sem.html src/sql.html
-%doc src/niceload.html src/*.texi
+%doc README NEWS
+%doc src/parallel.html src/sem.html src/sql.html src/niceload.html
+%doc src/*.texi
+%dir %{_sysconfdir}/parallel
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/parallel/config
 %attr(755,root,root) %{_bindir}/parallel
 %attr(755,root,root) %{_bindir}/sem
 %attr(755,root,root) %{_bindir}/sql
 %attr(755,root,root) %{_bindir}/niceload
-%dir %{_sysconfdir}/parallel/
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/parallel/config
-%{_mandir}/man1/niceload.1.*
-%{_mandir}/man1/parallel.1.*
-%{_mandir}/man1/sem.1.*
-%{_mandir}/man1/parallel-sql.1.*
+%{_mandir}/man1/niceload.1*
+%{_mandir}/man1/parallel.1*
+%{_mandir}/man1/sem.1*
+%{_mandir}/man1/parallel-sql.1*
+%{_mandir}/man1/parallel_tutorial.1*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/parallel.git/commitdiff/8027a409657a62bba42ddfab56c3d8890d271e31



More information about the pld-cvs-commit mailing list