require libgcc_s.so.1 for pthread_* to work; move tools to user bin

[packages/squashfs.git] / squashfs.spec

diff --git a/squashfs.spec b/squashfs.spec
index f65852f4c9c7e239410ee43ce92c7a2395e28e4b..8ba1a6762e30d3e0d995c3e673c3588b2e5a36fc 100644 (file)
--- a/squashfs.spec
+++ b/squashfs.spec
@@ -1,18 +1,22 @@
-%define        snap    20091213
 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.1
-Release:       0.%{snap}.1
+Version:       4.2
+Release:       2
 License:       GPL
 Group:         Base/Utilities
-# Source0:     http://dl.sourceforge.net/squashfs/%{name}%{version}.tar.gz
-Source0:       %{name}-%{snap}.tar.bz2
-# Source0-md5: 595391e4ae095e82214e7f96d53bc505
-Source1:       http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2
-# Source1-md5: 29d5ffd03a5a3e51aef6a74e9eafb759
+Source0:       http://downloads.sourceforge.net/squashfs/%{name}%{version}.tar.gz
+# Source0-md5: 1b7a781fb4cf8938842279bd3e8ee852
 URL:           http://squashfs.sourceforge.net/
+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
@@ -46,24 +50,25 @@ można używać plików .tar.gz) oraz w systemach z dużymi ograniczeniami
 pamięci i urządzeń blokowych (np. systemach wbudowanych).
 
 %prep
-%setup -q -n %{name} -a1
-sed -i -e 's#^\#LZMA_SUPPORT.*=.*#LZMA_SUPPORT=1#g' squashfs-tools/Makefile
-sed -i -e "s#^LZMA_DIR.*=.*#LZMA_DIR = $(pwd)#g" squashfs-tools/Makefile
+%setup -q -n %{name}%{version}
+sed -i -e 's/^#XZ_SUPPORT.*=.*/XZ_SUPPORT = 1/'  squashfs-tools/Makefile
+sed -i -e 's/^#LZO_SUPPORT.*=.*/LZO_SUPPORT = 1/' squashfs-tools/Makefile
+sed -i -e "s/-O2 -Wall/%{rpmcflags}/" squashfs-tools/Makefile
 
 %build
 %{__make} -C squashfs-tools \
-       CC="%{__cc}" \
-       CFLAGS="-I. -I$(pwd)/C -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -DLZMA_SUPPORT=1 -DCOMP_DEFAULT=\\\"gzip\\\" %{rpmcflags}"
+       CC="%{__cc}"
 
 %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