[fusecompress] Rebase to later upstream snapshot:
Lubomir Rintel
lkundrak at fedoraproject.org
Sun Dec 28 09:59:05 UTC 2014
commit b23b0b69003116613c09d4c46af06bbcb137fc56
Author: Lubomir Rintel <lkundrak at v3.sk>
Date: Sun Dec 28 10:59:00 2014 +0100
Rebase to later upstream snapshot:
- Fix the arm sign bug
- Upstreaming of the boost patchs
fusecompress-2.5-gcc44.patch | 22 ------------------
fusecompress-boost-1.44.patch | 31 --------------------------
fusecompress-boost-1.48.patch | 41 ----------------------------------
fusecompress.spec | 49 +++++++++++++---------------------------
mount.fusecompress | 12 ----------
sources | 2 +-
6 files changed, 17 insertions(+), 140 deletions(-)
---
diff --git a/fusecompress.spec b/fusecompress.spec
index fd8909d..8fbc7be 100644
--- a/fusecompress.spec
+++ b/fusecompress.spec
@@ -1,34 +1,16 @@
+%global commit a65cc33270ee5169c663ac002eeddd6f17782b29
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
Name: fusecompress
Version: 2.6
-Release: 24.20110801git913897f4%{?dist}
+Release: 24.20120812git%{shortcommit}%{?dist}
Summary: FUSE based compressed filesystem implementation
Group: System Environment/Libraries
License: GPLv2
URL: http://miio.net/fusecompress/
-#Source0: http://download.github.com/tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb.tar.gz
-# Snapshot instructions
-# git clone git://github.com/tex/fusecompress.git
-# cd fusecompress
-# git checkout 913897f424af319a0fa67d5356454de1512efeae
-# cd ..
-# mv fusecompress fusecompress-2.6
-# tar -cvf - fusecompress-2.6 |xz -c > fusecompress-20110801.tar.xz
-Source0: fusecompress-20110801.tar.xz
+Source0: https://github.com/tex/fusecompress/archive/%{commit}/fusecompress-%{commit}.tar.gz
Source1: README.fedora
-# https://developer.berlios.de/bugs/?func=detailbug&bug_id=18285&group_id=5384
-Patch1: fusecompress-boost-1.44.patch
-# Compilation issue with Boost.Math for Boost-1.48
-# Fedora ticket: https://bugzilla.redhat.com/show_bug.cgi?id=760616
-# Upstream ticket (BerliOS): https://developer.berlios.de/bugs/?func=detailbug&bug_id=18442&group_id=5384
-# Upstream ticket (GitHub): https://github.com/tex/fusecompress/pull/7
-# Upstream keeps a partial embedded version of the Boost source tree.
-# That version seems outdated, and is incomplete. There are some clashes with
-# upstream Boost for the missing parts (e.g., with Boost.Lexical_Cast).
-# The tactic, to fix the issue here, is to remove the embedded Boost.Math
-# source tree part.
-Patch2: fusecompress-boost-1.48.patch
-
BuildRequires: fuse-devel file-devel boost-devel
BuildRequires: zlib-devel bzip2-devel lzo-devel
BuildRequires: xz-devel
@@ -44,24 +26,20 @@ compressed files and user applications.
%prep
-%setup -q -n fusecompress-%{version}
-%patch1 -p1 -b .boost44
-%patch2 -p1 -b .boost48
-
-rm -Rf src/boost/math
-autoreconf -fi
-find . -name ChangeLog -o -name '*.[ch]pp' |xargs chmod -x
+%setup -q -n fusecompress-%{commit}
+rm -rf src/boost/math
+find -name '*.[ch]pp' |xargs chmod -x
cp %{SOURCE1} .
%build
-%configure --with-boost-libdir=%{_libdir}
+autoreconf -fi
+%configure --with-boost-libdir=%{_libdir} --enable-crippled_boost
make %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot}
-install -d %{buildroot}/sbin
%files
@@ -72,10 +50,15 @@ install -d %{buildroot}/sbin
%{_bindir}/xattrs
%{_mandir}/man1/fusecompress.1*
%{_mandir}/man1/fusecompress_offline.1*
-%doc ChangeLog README AUTHORS COPYING NEWS README.fedora
+%doc README AUTHORS COPYING NEWS README.fedora
%changelog
+* Sun Dec 28 2014 Lubomir Rintel <lkundrak at v3.sk> - 2.6-24.20120812gita65cc33
+- Rebase to later upstream snapshot:
+- Fix the arm sign bug
+- Upstreaming of the boost patchs
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-24.20110801git913897f4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 6e62638..fb32297 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-850ce1b2d80fa8cfbbb3eb4839d04bd6 fusecompress-20110801.tar.xz
+7895e5c1e781609193b259256b0f7f22 fusecompress-a65cc33270ee5169c663ac002eeddd6f17782b29.tar.gz
More information about the scm-commits
mailing list