[packages/libplist] up to 1.11; new soname

glen glen at pld-linux.org
Wed Jan 20 07:49:37 CET 2016


commit 4bc15581b64a483937ef679bc28503f465468d12
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Jan 20 08:32:29 2016 +0200

    up to 1.11; new soname
    
    - Removed swig python bindings
    - Changed build system to autotools

 libplist.spec | 72 ++++++++++++++++++++---------------------------------------
 1 file changed, 24 insertions(+), 48 deletions(-)
---
diff --git a/libplist.spec b/libplist.spec
index 1a70223..ed11f12 100644
--- a/libplist.spec
+++ b/libplist.spec
@@ -1,43 +1,32 @@
 # TODO
-# - python bindings fail in both cython and swig mode:
-#   $ python -c "import plist" # cython
-#   Traceback (most recent call last):
-#    File "<string>", line 1, in <module>
-#   ImportError: dynamic module does not define init function (initplist)
-#  $ python -c "import plist" # swig
-#  Traceback (most recent call last):
-#    File "<string>", line 1, in <module>
-#    File "/usr/lib64/python2.7/site-packages/plist/__init__.py", line 3, in <module>
-#    File "/usr/lib64/python2.7/site-packages/plist/plist.py", line 26, in <module>
-#    File "/usr/lib64/python2.7/site-packages/plist/plist.py", line 22, in swig_import_helper
-#  ImportError: dynamic module does not define init function (init_plist)
+# - python3 package
+# - split C++ lib?
 #
 # Conditional build:
-%bcond_with	swig	# build with Swig
 %bcond_without	cython	# build with Cython
 
 Summary:	Library for manipulating Apple Property Lists
 Summary(pl.UTF-8):	Biblioteka do manipulowania Apple Property Lists
 Name:		libplist
-Version:	1.10
-Release:	4
+Version:	1.11
+Release:	1
 License:	LGPL v2+
 Group:		Libraries
 # Source0Download: http://www.libimobiledevice.org/
 Source0:	http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	fe642d0c8602d70c408994555c330dd1
+# Source0-md5:	82de65f38cb2f0a9fd0839679b46072b
 URL:		http://www.libimobiledevice.org/
-BuildRequires:	cmake >= 2.8.2-2
 BuildRequires:	glib2-devel >= 1:2.14.1
 BuildRequires:	libstdc++-devel
 BuildRequires:	libxml2-devel >= 1:2.6.30
 BuildRequires:	pkgconfig
-%{?with_cython:BuildRequires:	python-Cython}
+%if %{with cython}
+BuildRequires:	python-Cython
 BuildRequires:	python-devel
 BuildRequires:	python-modules
 BuildRequires:	rpm-pythonprov
+%endif
 BuildRequires:	rpmbuild(macros) >= 1.600
-%{?with_swig:BuildRequires:	swig-python}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -80,32 +69,29 @@ Wiązania libplist dla Pythona.
 touch cython/*.py[xh]
 
 %build
-install -d build
-cd build
-%cmake \
-	-DENABLE_SWIG=%{!?with_swig:NO}%{?with_swig:YES} \
-	-DENABLE_CYTHON=%{!?with_cython:NO}%{?with_cython:YES} \
-	../
-
-%{__make}
+%configure \
+	--disable-static \
+	--disable-silent-rules \
+	%{!?with_cython:--without-cython}
+# make -j1 due:
+# make[2]: *** No rule to make target '../src/libplist.la', needed by 'libplist++.la'.  Stop.
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-%{__make} -C build install \
+%{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by .pc
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
 
-# cmake sucks, fix perms
 %if %{with cython}
-chmod a+x $RPM_BUILD_ROOT%{py_sitedir}/plist.so
 cp -p cython/plist.pxd $RPM_BUILD_ROOT%{py_sitedir}
-%endif
-%if %{with swig}
-chmod a+x $RPM_BUILD_ROOT%{py_sitedir}/plist/_plist.so
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/plist.la
 %endif
 
 %clean
@@ -117,11 +103,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README
-%attr(755,root,root) %{_bindir}/plistutil*
+%attr(755,root,root) %{_bindir}/plistutil
 %attr(755,root,root) %{_libdir}/libplist++.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libplist++.so.1
+%attr(755,root,root) %ghost %{_libdir}/libplist++.so.2
 %attr(755,root,root) %{_libdir}/libplist.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libplist.so.1
+%attr(755,root,root) %ghost %{_libdir}/libplist.so.2
 
 %files devel
 %defattr(644,root,root,755)
@@ -131,19 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/libplist++.pc
 %{_pkgconfigdir}/libplist.pc
 
-%if %{with cython} || %{with swig}
+%if %{with cython}
 %files -n python-plist
 %defattr(644,root,root,755)
-
-%if %{with cython}
 %attr(755,root,root) %{py_sitedir}/plist.so
 %{py_sitedir}/plist.pxd
 %endif
-
-%if %{with swig}
-%dir %{py_sitedir}/plist
-%attr(755,root,root) %{py_sitedir}/plist/_plist.so
-%{py_sitedir}/plist/*.py[co]
-%endif
-
-%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libplist.git/commitdiff/4bc15581b64a483937ef679bc28503f465468d12



More information about the pld-cvs-commit mailing list