[obexftp/f21] Add obsoletes: obexfs

[Christopher Meng]

commit c5267f45bb748f9ead53936a175b96fe3a1afd4d
Author: Christopher Meng <i at cicku.me>
Date:   Wed Jul 9 23:50:14 2014 +0800

    Add obsoletes: obexfs

 obexftp.spec |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/obexftp.spec b/obexftp.spec
index 25457ff..f6a7db3 100644
--- a/obexftp.spec
+++ b/obexftp.spec
@@ -1,6 +1,6 @@
 Name:           obexftp
 Version:        0.24
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tool to access devices via the OBEX protocol
 License:        GPLv2+
 URL:            https://gitorious.org/obexftp
@@ -19,7 +19,7 @@ BuildRequires:  fuse-devel
 BuildRequires:  gettext-devel
 BuildRequires:  openobex-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
 BuildRequires:  ruby
 BuildRequires:  ruby-devel
 BuildRequires:  swig
@@ -33,6 +33,13 @@ implementation. The common usage for ObexFTP is to access your mobile phones
 memory to store and retrieve e.g. your phonebook, logos, ringtones, music,
 pictures and alike.
 
+%package -n     fuse-%{name}
+Summary:        FUSE based filesystem using ObexFTP
+Obsoletes:      obexfs < 0.12-9
+
+%description -n fuse-%{name}
+This package provides a FUSE based filesystem using Obex protocol as backend.
+
 %package -n     python-%{name}
 Summary:        Python library to access devices via the OBEX protocol
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -94,10 +101,10 @@ developing applications that use %{name}.
 %build
 %cmake
 # 'all' doesn't include doc, it seems - thanks, SUSE.
-make %{?_smp_mflags} all doc
+%make_build all doc
 
 %install
-make DESTDIR=%{buildroot} RUBYARCHDIR=%{buildroot}%{ruby_vendorarchdir} install
+%make_install RUBYARCHDIR=%{buildroot}%{ruby_vendorarchdir}
 
 %post libs -p /sbin/ldconfig
 
@@ -107,8 +114,6 @@ make DESTDIR=%{buildroot} RUBYARCHDIR=%{buildroot}%{ruby_vendorarchdir} install
 %doc AUTHORS ChangeLog NEWS README THANKS TODO
 %{_bindir}/obexftp
 %{_bindir}/obexftpd
-%{_bindir}/obexautofs
-%{_bindir}/obexfs
 %{_mandir}/man1/obexftp.1*
 %{_mandir}/man1/obexftpd.1*
 
@@ -122,9 +127,13 @@ make DESTDIR=%{buildroot} RUBYARCHDIR=%{buildroot}%{ruby_vendorarchdir} install
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/obexftp.pc
 
+%files -n fuse-%{name}
+%{_bindir}/obexautofs
+%{_bindir}/obexfs
+
 %files -n python-%{name}
-%{python_sitearch}/_obexftp.so*
-%{python_sitearch}/obexftp.py*
+%{python2_sitearch}/_obexftp.so*
+%{python2_sitearch}/obexftp.py*
 
 %files -n perl-%{name}
 %{perl_vendorarch}/OBEXFTP.pm
@@ -135,6 +144,9 @@ make DESTDIR=%{buildroot} RUBYARCHDIR=%{buildroot}%{ruby_vendorarchdir} install
 %{ruby_vendorarchdir}/obexftp.so
 
 %changelog
+* Sat Jul 05 2014 Christopher Meng <rpm at cicku.me> - 0.24-4
+- Add proper obsoletes of obexfs.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.24-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild