[packages/squashfs] require libgcc_s.so.1 for pthread_* to work; move tools to user bin
glen
glen at pld-linux.org
Mon Apr 14 17:18:01 CEST 2014
commit ee5770446ab7de8a4b19155a20103b0f9c6ee106
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Apr 14 18:17:41 2014 +0300
require libgcc_s.so.1 for pthread_* to work; move tools to user bin
squashfs.spec | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/squashfs.spec b/squashfs.spec
index c05cbaa..8ba1a67 100644
--- a/squashfs.spec
+++ b/squashfs.spec
@@ -2,7 +2,7 @@ Summary: Set of tools which creates squashfs filesystem
Summary(pl.UTF-8): Zestaw narzędzi do tworzenia systemu plików squashfs
Name: squashfs
Version: 4.2
-Release: 1
+Release: 2
License: GPL
Group: Base/Utilities
Source0: http://downloads.sourceforge.net/squashfs/%{name}%{version}.tar.gz
@@ -12,6 +12,11 @@ BuildRequires: attr-devel
BuildRequires: lzo-devel >= 2.04
BuildRequires: xz-devel >= 5.0.0
BuildRequires: zlib-devel
+%ifarch %{x8664}
+Requires: libgcc_s.so.1()(64bit)
+%else
+Requires: libgcc_s.so.1
+%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sbindir /sbin
@@ -56,13 +61,14 @@ sed -i -e "s/-O2 -Wall/%{rpmcflags}/" squashfs-tools/Makefile
%install
rm -rf $RPM_BUILD_ROOT
-
-install -D squashfs-tools/mksquashfs $RPM_BUILD_ROOT%{_sbindir}/mksquashfs
-install squashfs-tools/unsquashfs $RPM_BUILD_ROOT%{_sbindir}
+install -d $RPM_BUILD_ROOT%{_bindir}
+install -p squashfs-tools/mksquashfs $RPM_BUILD_ROOT%{_bindir}
+install -p squashfs-tools/unsquashfs $RPM_BUILD_ROOT%{_bindir}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_bindir}/mksquashfs
+%attr(755,root,root) %{_bindir}/unsquashfs
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/squashfs.git/commitdiff/ee5770446ab7de8a4b19155a20103b0f9c6ee106
More information about the pld-cvs-commit
mailing list