[obexftp] new release 0.24, adjust to new buildsystem, some patches from SUSE
Adam Williamson
adamwill at fedoraproject.org
Sat Jan 11 02:57:17 UTC 2014
commit a751d7e7148ea2ec744ae2f116d5ac3550cd966e
Author: Adam Williamson <awilliam at redhat.com>
Date: Fri Jan 10 18:57:09 2014 -0800
new release 0.24, adjust to new buildsystem, some patches from SUSE
.gitignore | 1 +
obexftp-0.24-fix-absurd-install-path.patch | 20 +++++++
obexftp-0.24-fuse.patch | 35 +++++++++++++
obexftp-pkgconfig_requires.patch | 11 ++++
obexftp.spec | 76 ++++++++++++----------------
sources | 2 +-
6 files changed, 101 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ac5647..c27ef27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
obexftp-0.23.tar.bz2
+/obexftp-0.24-Source.tar.gz
diff --git a/obexftp-0.24-fix-absurd-install-path.patch b/obexftp-0.24-fix-absurd-install-path.patch
new file mode 100644
index 0000000..0f5bebd
--- /dev/null
+++ b/obexftp-0.24-fix-absurd-install-path.patch
@@ -0,0 +1,20 @@
+Index: obexftp-0.24-Source/swig/python/CMakeLists.txt
+===================================================================
+--- obexftp-0.24-Source.orig/swig/python/CMakeLists.txt
++++ obexftp-0.24-Source/swig/python/CMakeLists.txt
+@@ -36,13 +36,13 @@ swig_link_libraries ( obexftp-python
+ #
+ execute_process (
+ COMMAND ${PYTHON_EXECUTABLE} -c
+- "import site, sys; sys.stdout.write(site.PREFIXES[-1])"
++ "import site, sys; sys.stdout.write(site.PREFIXES[0])"
+ OUTPUT_VARIABLE PYTHON_PREFIX
+ )
+ file ( TO_CMAKE_PATH "${PYTHON_PREFIX}" PYTHON_PREFIX )
+ execute_process (
+ COMMAND ${PYTHON_EXECUTABLE} -c
+- "import site, sys; sys.stdout.write(site.getsitepackages()[-1])"
++ "import site, sys; sys.stdout.write(site.getsitepackages()[0])"
+ OUTPUT_VARIABLE PYTHON_SITE_DIR
+ )
+ file ( TO_CMAKE_PATH "${PYTHON_SITE_DIR}" PYTHON_SITE_DIR )
diff --git a/obexftp-0.24-fuse.patch b/obexftp-0.24-fuse.patch
new file mode 100644
index 0000000..260cfc2
--- /dev/null
+++ b/obexftp-0.24-fuse.patch
@@ -0,0 +1,35 @@
+From 2cc82e0ab5a30eaab5461dcc4eed41b095edba3f Mon Sep 17 00:00:00 2001
+From: Hendrik Sattler <post at hendrik-sattler.de>
+Date: Sun, 11 Aug 2013 20:27:29 +0200
+Subject: [PATCH] Install fuse apps
+
+---
+ fuse/CMakeLists.txt | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/fuse/CMakeLists.txt b/fuse/CMakeLists.txt
+index c31a5fc..7d5f7ea 100644
+--- a/fuse/CMakeLists.txt
++++ b/fuse/CMakeLists.txt
+@@ -14,7 +14,6 @@ if ( Fuse_FOUND )
+ ${Fuse_LIBRARIES}
+ )
+
+-
+ add_executable ( obexautofs
+ obexautofs.c
+ )
+@@ -23,4 +22,10 @@ if ( Fuse_FOUND )
+ obexftp
+ ${Fuse_LIBRARIES}
+ )
++
++ install ( TARGETS obexfs obexautofs
++ RUNTIME
++ DESTINATION ${CMAKE_INSTALL_BINDIR}
++ COMPONENT applications
++ )
+ endif ( Fuse_FOUND )
+--
+1.7.1
+
diff --git a/obexftp-pkgconfig_requires.patch b/obexftp-pkgconfig_requires.patch
new file mode 100644
index 0000000..ded4a58
--- /dev/null
+++ b/obexftp-pkgconfig_requires.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -71,7 +71,7 @@
+ set ( exec_prefix "\${prefix}" )
+ set ( libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}" )
+ set ( includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}" )
+-set ( REQUIRES "bluetooth openobex" )
++set ( REQUIRES "bluez openobex" )
+ configure_file (
+ ${CMAKE_CURRENT_SOURCE_DIR}/obexftp.pc.in
+ ${CMAKE_CURRENT_BINARY_DIR}/obexftp.pc
diff --git a/obexftp.spec b/obexftp.spec
index ee4c2ac..a2177a3 100644
--- a/obexftp.spec
+++ b/obexftp.spec
@@ -1,17 +1,18 @@
-%define python_sitelib %(%{__python} -c "from distutils import sysconfig; print sysconfig.get_python_lib()")
-%define python_sitearch %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)')
-
Name: obexftp
Summary: Tool to access devices via the OBEX protocol
Group: Applications/File
-Version: 0.23
-Release: 15%{?dist}
+Version: 0.24
+Release: 1%{?dist}
License: GPLv2+
-URL: http://openobex.triq.net/
-Source: http://triq.net/obexftp/%{name}-%{version}.tar.bz2
+URL: https://gitorious.org/obexftp
+Source: http://download.sourceforge.net/openobex/%{name}-%{version}-Source.tar.gz
Patch0: %{name}-norpath.patch
-Patch1: %{name}-perl.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
+# From upstream git, fixes fuse apps not being installed
+Patch1: %{name}-0.24-fuse.patch
+# From OpenSUSE, thanks: fix pkgconfig to require bluez not bluetooth
+Patch2: %{name}-pkgconfig_requires.patch
+# From OpenSUSE, thanks: fix python install path
+Patch3: %{name}-0.24-fix-absurd-install-path.patch
BuildRequires: bluez-libs-devel
BuildRequires: gettext-devel
BuildRequires: libtool
@@ -21,6 +22,11 @@ BuildRequires: python-devel
BuildRequires: ruby
BuildRequires: ruby-devel
BuildRequires: tcl-devel
+BuildRequires: cmake
+BuildRequires: swig
+BuildRequires: fuse-devel
+BuildRequires: asciidoc
+BuildRequires: xmlto
%description
The overall goal of this project is to make mobile devices featuring the OBEX
@@ -92,50 +98,36 @@ documentation for %{name}. If you like to develop programs using %{name},
you will need to install %{name}-devel.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-Source
%patch0 -p1 -b .norpath
-%patch1 -p1 -b .p
+%patch1 -p1 -b .fuse
+%patch2 -p1 -b .pkgconfig
+%patch3 -p1 -b .pythonpath
%build
-autoreconf -f -i
-%configure --disable-static --disable-dependency-tracking --disable-rpath
-# fix for Ruby 1.9
-sed -i 's|RSTRING(argv\[0\])->len|RSTRING_LEN(argv[0])|' swig/ruby/ruby_wrap.c
-%{__make} %{?_smp_mflags}
+%cmake
+# 'all' doesn't include doc, it seems - thanks, SUSE.
+%{__make} %{?_smp_mflags} all doc
%install
-%{__rm} -rf %{buildroot}
-# ruby_headers= added to workaround bug in Ruby.
-# https://bugzilla.redhat.com/show_bug.cgi?id=921650
-%{__make} DESTDIR=%{buildroot} RUBYARCHDIR=%{buildroot}%{ruby_vendorarchdir} ruby_headers= install
-
-%{__rm} %{buildroot}%{_libdir}/*.la
-%{__rm} %{buildroot}%{perl_archlib}/perllocal.pod
-%{__rm} -f %{buildroot}%{perl_vendorarch}/*/OBEXFTP/{.packlist,OBEXFTP.bs}
-
-chmod 755 %{buildroot}%{perl_vendorarch}/*/OBEXFTP/OBEXFTP.so
-chmod 755 %{buildroot}%{python_sitearch}/obexftp/_obexftp.so
-
-%clean
-%{__rm} -rf %{buildroot}
+%{__make} DESTDIR=%{buildroot} RUBYARCHDIR=%{buildroot}%{ruby_vendorarchdir} install
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files
-%defattr(-, root, root, -)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+%doc AUTHORS ChangeLog NEWS README THANKS TODO
%{_mandir}/man1/obexftp.1*
%{_mandir}/man1/obexftpd.1*
%{_bindir}/obexftp
%{_bindir}/obexftpd
+%{_bindir}/obexautofs
+%{_bindir}/obexfs
%files libs
-%defattr(-, root, root, -)
%{_libdir}/*.so.*
%files devel
-%defattr(-, root, root, -)
%{_includedir}/bfb/
%{_includedir}/multicobex/
%{_includedir}/obexftp/
@@ -143,25 +135,23 @@ chmod 755 %{buildroot}%{python_sitearch}/obexftp/_obexftp.so
%{_libdir}/pkgconfig/obexftp.pc
%files -n python-%{name}
-%defattr(-, root, root, -)
-%dir %{python_sitearch}/obexftp
-%{python_sitearch}/obexftp/_obexftp.so*
-%{python_sitearch}/obexftp/__init__.py*
-%if 0%{?fedora} >= 9
-%{python_sitearch}/*.egg-info
-%endif
+%{python_sitearch}/_obexftp.so*
+%{python_sitearch}/obexftp.py*
%files -n perl-%{name}
-%defattr(-, root, root, -)
%{perl_vendorarch}/OBEXFTP.pm
%dir %{perl_vendorarch}/*/OBEXFTP
%{perl_vendorarch}/*/OBEXFTP/OBEXFTP.so
%files -n ruby-%{name}
-%defattr(-, root, root, -)
%{ruby_vendorarchdir}/obexftp.so
%changelog
+* Fri Jan 10 2014 Adam Williamson <awilliam at redhat.com> - 0.24-1
+- new upstream release 0.24
+- convert to new cmake build system
+- drop cruft and now-unnecessary workarounds/fixes from spec
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index e94b3e1..9f04257 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f20762061b68bc921e80be4aebc349eb obexftp-0.23.tar.bz2
+31a50dbbd09c63cbb5399772aaff7936 obexftp-0.24-Source.tar.gz
More information about the scm-commits
mailing list