From 920e58fe766d8002c0af95f0e81d0b972a6aa96ef49e5e29d812d0d28a489217 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 17 Jul 2014 04:57:44 +0000 Subject: [PATCH] Accepting request 240142 from hardware fix errors pointed by factory auto submit OBS-URL: https://build.opensuse.org/request/show/240142 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libplist?expand=0&rev=25 --- baselibs.conf | 4 +- libplist-1.11.tar.bz2 | 3 + libplist-1.8-pkgconfig.patch | 7 --- libplist-1.8.tar.bz2 | 3 - libplist.changes | 15 +++++ libplist.spec | 103 +++++++++++++++-------------------- 6 files changed, 63 insertions(+), 72 deletions(-) create mode 100644 libplist-1.11.tar.bz2 delete mode 100644 libplist-1.8-pkgconfig.patch delete mode 100644 libplist-1.8.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index a91116a..57d25ba 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,3 @@ -libplist1 -libplist++1 +libplist2 +libplist++2 diff --git a/libplist-1.11.tar.bz2 b/libplist-1.11.tar.bz2 new file mode 100644 index 0000000..6d5e9db --- /dev/null +++ b/libplist-1.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28e1518eeea054f4eec9a1c93d9575d56193b290c53c1b753773a5e0add95235 +size 355365 diff --git a/libplist-1.8-pkgconfig.patch b/libplist-1.8-pkgconfig.patch deleted file mode 100644 index 625aad8..0000000 --- a/libplist-1.8-pkgconfig.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- libplist.pc.in.orig -+++ libplist.pc.in -@@ -8,4 +8,3 @@ includedir=${CMAKE_INSTALL_PREFIX}/inclu - Version: ${LIBPLIST_VERSION} --Requires.private: libxml-2.0 >= 2.6.30 - Libs: -L${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} -lplist - Cflags: -I${CMAKE_INSTALL_PREFIX}/include diff --git a/libplist-1.8.tar.bz2 b/libplist-1.8.tar.bz2 deleted file mode 100644 index 8d83ab0..0000000 --- a/libplist-1.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec -size 81278 diff --git a/libplist.changes b/libplist.changes index a5c8e88..4fbf45a 100644 --- a/libplist.changes +++ b/libplist.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Jun 16 15:29:11 UTC 2014 - i@marguerite.su + +- update version 1.11 + * Deprecated plist_dict_insert_item() in favor of plist_dict_set_item() + * Updated cython bindings for Python 3.x + * Removed swig python bindings + * Changed build system to autotools + * Added new plist_dict_merge() function + * WIN32 (MinGW) + OSX compilation fixes + * Made base64 decoding thread safe +- remove patch: libplist-1.8-pkgconfig.patch + * upstream fixed +- added plist.pxd, needed by python-imobiledevice build + ------------------------------------------------------------------- Mon Apr 15 12:54:38 UTC 2013 - mmeister@suse.com diff --git a/libplist.spec b/libplist.spec index ae1fd48..b0fcbe8 100644 --- a/libplist.spec +++ b/libplist.spec @@ -1,7 +1,7 @@ # # spec file for package libplist # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,52 +17,52 @@ Name: libplist -Version: 1.8 +Version: 1.11 Release: 0 Summary: Library for handling Apple Binary and XML Property Lists -License: LGPL-2.1+ +License: GPL-2.0 and LGPL-2.1+ Group: System/Libraries Url: http://cgit.sukimashita.com/libplist.git -Source: http://cgit.sukimashita.com/libplist.git/snapshot/%{name}-%{version}.tar.bz2 -BuildRequires: cmake +# Factory_checker can't fetch this URL +#Source: http://cgit.sukimashita.com/libplist.git/snapshot/%{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.bz2 +Source99: baselibs.conf BuildRequires: gcc-c++ -BuildRequires: libxml2-devel +BuildRequires: libxml2-devel >= 2.7.8 BuildRequires: pkg-config -%if %{?suse_version} > 1140 BuildRequires: python-cython BuildRequires: python-devel -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -#remove when pkgconfig is fixed to handle Requires.private correctly -Patch0: libplist-1.8-pkgconfig.patch %description libplist is a library for handling Apple Binary and XML Property Lists. -%package -n libplist1 +%package -n libplist2 Summary: Library for handling Apple Binary and XML Property Lists Group: System/Libraries Provides: libplist = %{version} Obsoletes: libplist < %{version} -%description -n libplist1 +%description -n libplist2 libplist is a library for handling Apple Binary and XML Property Lists. -%package -n libplist++1 +%package -n libplist++2 Summary: Library for handling Apple Binary and XML Property Lists Group: System/Libraries Provides: libplist++ = %{version} Obsoletes: libplist++ < %{version} -%description -n libplist++1 +%description -n libplist++2 libplist is a library for handling Apple Binary and XML Property Lists. -%package -n plutil +%package -n plistutil Summary: Library for handling Apple Binary and XML Property Lists Group: System/Libraries -Requires: libplist1 = %{version} +Requires: libplist = %{version} +Provides: plutil = %{version} +Obsoletes: plutil < %{version} -%description -n plutil +%description -n plistutil libplist is a library for handling Apple Binary and XML Property Lists. This package contains an utility to convert PList files from binary to XML and @@ -71,8 +71,7 @@ from XML to binary. %package devel Summary: Library for handling Apple Binary and XML Property Lists -- Development Files Group: Development/Libraries/C and C++ -Requires: glibc-devel -Requires: libplist1 = %{version} +Requires: libplist = %{version} %description devel libplist is a library for handling Apple Binary and XML Property Lists. @@ -82,83 +81,68 @@ This package contains the development files for C. %package -n libplist++-devel Summary: Library for handling Apple Binary and XML Property Lists -- Development Files Group: Development/Libraries/C and C++ -Requires: libplist++1 = %{version} +Requires: libplist++ = %{version} Requires: libplist-devel -Requires: libstdc++-devel %description -n libplist++-devel libplist is a library for handling Apple Binary and XML Property Lists. This package contains the development files for C++. -%if %{?suse_version} > 1140 %package -n python-plist Summary: Library for handling Apple Binary and XML Property Lists -- Python Bindings Group: Development/Languages/Python -Requires: libplist1 = %{version} +Requires: libplist2 = %{version} Requires: python-cython >= 0.13 -%{py_requires} %description -n python-plist libplist is a library for handling Apple Binary and XML Property Lists. This package contains the python bindings. -%endif %prep %setup -q -%patch0 %build -export CFLAGS="%{optflags} -fno-strict-aliasing" -%configure || true -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_INSTALL_LIBDIR=%{_lib} \ - -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DPYTHON_VERSION=%{py_ver} \ - -DPYTHON_SITEDIR=%{py_sitedir} \ - -DCMAKE_FIND_ROOT_PATH=/%{?_sysroot} \ - -DPYTHON_LIBRARY=%_libdir/python%{py_ver} \ - -DENABLE_SWIG=OFF \ - -DPYTHON_INCLUDE_DIR=%{?_sysroot}/usr/include/python \ - . -# Workaround in order to make parallel build pass -cd libcnary -make %{?_smp_mflags} -cd .. -make %{?_smp_mflags} +%configure --disable-static +# libplist doesn't support parallel build +make %install -%makeinstall -rm %{buildroot}%{_bindir}/plutil -mv %{buildroot}%{_bindir}/plutil-%{version} %{buildroot}%{_bindir}/plutil +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print +rm -rf %{buildroot}%{python_sitearch}/*.la + +# needed by python-imobiledevice build +mkdir -p %{buildroot}%{_includedir}/plist/cython +install -m 0644 cython/plist.pxd %{buildroot}%{_includedir}/plist/cython/plist.pxd %if 0%{?_crossbuild} cp -a %{buildroot}%{?_sysroot}/* %{buildroot}/ rm -fr %{buildroot}%{?_sysroot} %endif -%post -n libplist1 -p /sbin/ldconfig +%post -n libplist2 -p /sbin/ldconfig -%postun -n libplist1 -p /sbin/ldconfig +%postun -n libplist2 -p /sbin/ldconfig -%post -n libplist++1 -p /sbin/ldconfig +%post -n libplist++2 -p /sbin/ldconfig -%postun -n libplist++1 -p /sbin/ldconfig +%postun -n libplist++2 -p /sbin/ldconfig -%files -n libplist1 +%files -n libplist2 %defattr(-,root,root) -%doc AUTHORS COPYING.LESSER README NEWS +%doc AUTHORS COPYING COPYING.LESSER README NEWS %{_libdir}/libplist.so.* -%files -n libplist++1 +%files -n libplist++2 %defattr(-,root,root) -%doc AUTHORS COPYING.LESSER README NEWS +%doc AUTHORS COPYING COPYING.LESSER README NEWS %{_libdir}/libplist++.so.* -%files -n plutil +%files -n plistutil %defattr(-,root,root) -%{_bindir}/plutil +%{_bindir}/plistutil %files devel %defattr(-,root,root,-) @@ -177,6 +161,8 @@ rm -fr %{buildroot}%{?_sysroot} %{_includedir}/plist/Date.h %{_includedir}/plist/Dictionary.h %{_includedir}/plist/Integer.h +%{_includedir}/plist/Key.h +%{_includedir}/plist/Uid.h %{_includedir}/plist/Node.h %{_includedir}/plist/Real.h %{_includedir}/plist/String.h @@ -184,13 +170,10 @@ rm -fr %{buildroot}%{?_sysroot} %{_libdir}/libplist++.so %{_libdir}/pkgconfig/libplist++.pc -%if %{?suse_version} > 1140 %files -n python-plist %defattr(-,root,root,-) -%{py_sitedir}/plist.so -%dir %{_includedir}/plist %dir %{_includedir}/plist/cython %{_includedir}/plist/cython/plist.pxd -%endif +%{python_sitearch}/plist.so %changelog