[fuse-encfs] Add el5 conditionals for obsoleted macros

Till Maas till at fedoraproject.org
Wed Jul 11 21:30:10 UTC 2012


commit 91f1d599c796bd5d2dbc284f87f77412c43ee531
Author: Till Maas <opensource at till.name>
Date:   Wed Jul 11 23:29:59 2012 +0200

    Add el5 conditionals for obsoleted macros
    
    - Use less globbing in %files
    - Use boost141 in el5

 fuse-encfs.spec |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/fuse-encfs.spec b/fuse-encfs.spec
index f1f99da..04e02cb 100644
--- a/fuse-encfs.spec
+++ b/fuse-encfs.spec
@@ -1,18 +1,24 @@
 Name:		fuse-encfs
 Version:	1.7.4
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Encrypted pass-thru filesystem in userspace
 License:	GPLv3+
 Group:		System Environment/Kernel
 Url:		http://www.arg0.net/encfs
 Source0:	http://encfs.googlecode.com/files/encfs-%{version}.tgz
 Source1:	http://encfs.googlecode.com/files/encfs-%{version}.tgz.asc
+%if 0%{?el5}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%endif
 Requires:	fuse >= 2.6
 Provides:	encfs = %{version}-%{release}
 BuildRequires:	rlog-devel >= 1.3
 BuildRequires:	openssl-devel
+%if 0%{?el5}
+BuildRequires:	boost141-devel
+%else
 BuildRequires:	boost-devel >= 1.34
+%endif
 BuildRequires:	fuse-devel >= 2.6
 BuildRequires:	gettext
 
@@ -27,11 +33,17 @@ it does not use NFS.
 %setup -q -n encfs-%{version}
 
 %build
+%if 0%{?el5}
+%configure --disable-static BOOST_CPPFLAGS="-I%{_includedir}/boost141 -L%{_libdir}/boost141" BOOST_LDFLAGS="-L%{_libdir}/boost141"
+%else
 %configure --disable-static --with-boost-libdir=%{_libdir}
+%endif
 make %{?_smp_mflags}
 
 %install
+%if 0%{?el5}
 rm -rf %{buildroot}
+%endif
 make DESTDIR=%{buildroot} install
 rm -f %{buildroot}/%{_libdir}/*.la
 rm -f %{buildroot}/%{_libdir}/*.so
@@ -41,17 +53,28 @@ rm -f %{buildroot}/%{_libdir}/*.so
 
 %postun -p /sbin/ldconfig
 
+%if 0%{?el5}
 %clean
 rm -rf %{buildroot}
+%endif
 
 %files -f encfs.lang
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog README
-%{_bindir}/*
-%{_libdir}/libencfs.so*
-%{_mandir}/man1/*
+%{_bindir}/encfs
+%{_bindir}/encfsctl
+%{_bindir}/encfssh
+%{_libdir}/libencfs.so.6
+%{_libdir}/libencfs.so.6.0.1
+%{_mandir}/man1/encfs.1*
+%{_mandir}/man1/encfsctl.1*
 
 %changelog
+* Wed Jul 11 2012 Till Maas <opensource at till.name> - 1.7.4-7
+- Add el5 conditionals for obsoleted macros
+- Use less globbing in %%files
+- Use boost141 in el5
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.4-6
 - Rebuilt for c++ ABI breakage
 


More information about the scm-commits mailing list