diff --git a/.gitignore b/.gitignore index 7f713d7..23d30a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libplist-1.10.tar.bz2 +SOURCES/libplist-1.12.tar.bz2 diff --git a/.libplist.metadata b/.libplist.metadata index 46f703e..400736b 100644 --- a/.libplist.metadata +++ b/.libplist.metadata @@ -1 +1 @@ -a642bb37eaa4bec428d0b2a4fa8399d80ee73a18 SOURCES/libplist-1.10.tar.bz2 +48f071c723387637ef2cc2980d4ca0627aab067b SOURCES/libplist-1.12.tar.bz2 diff --git a/SOURCES/libplist-1.8-cmake_lib_suffix.patch b/SOURCES/libplist-1.8-cmake_lib_suffix.patch deleted file mode 100644 index 941bbaf..0000000 --- a/SOURCES/libplist-1.8-cmake_lib_suffix.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up libplist-1.8/CMakeLists.txt.cmake_lib_suffix libplist-1.8/CMakeLists.txt ---- libplist-1.8/CMakeLists.txt.cmake_lib_suffix 2012-01-11 08:29:30.000000000 -0600 -+++ libplist-1.8/CMakeLists.txt 2012-04-11 08:57:36.208333767 -0500 -@@ -11,8 +11,12 @@ SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DI - - cmake_minimum_required(VERSION 2.6) - -+IF(${CMAKE_VERSION} VERSION_GREATER 2.8.4) -+ INCLUDE(GNUInstallDirs) -+ENDIF() -+ - IF(NOT DEFINED CMAKE_INSTALL_LIBDIR) -- SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries") -+ SET(CMAKE_INSTALL_LIBDIR lib${LIB_SUFFIX} CACHE PATH "Output directory for libraries") - ENDIF(NOT DEFINED CMAKE_INSTALL_LIBDIR) - - FIND_PACKAGE( LibXml2 REQUIRED ) diff --git a/SPECS/libplist.spec b/SPECS/libplist.spec index 2e239cd..9a99b40 100644 --- a/SPECS/libplist.spec +++ b/SPECS/libplist.spec @@ -1,8 +1,8 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: libplist -Version: 1.10 -Release: 4%{?dist} +Version: 1.12 +Release: 3%{?dist} Summary: Library for manipulating Apple Binary and XML Property Lists Group: System Environment/Libraries @@ -10,31 +10,27 @@ License: LGPLv2+ URL: http://www.libimobiledevice.org/ Source0: http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2 -## upstreamable patches -# add support for GNUInstallDirs (where available) and ${LIB_SUFFIX} convention -Patch50: libplist-1.8-cmake_lib_suffix.patch - +BuildRequires: chrpath +BuildRequires: Cython BuildRequires: libxml2-devel BuildRequires: python-devel -BuildRequires: swig -BuildRequires: cmake -BuildRequires: Cython +BuildRequires: python-setuptools %description libplist is a library for manipulating Apple Binary and XML Property Lists -%package devel -Summary: Development package for libplist -Group: Development/Libraries +%package devel +Summary: Development package for libplist +Group: Development/Libraries Requires: libplist = %{version}-%{release} Requires: pkgconfig %description devel %{name}, development headers and libraries. -%package python -Summary: Python package for libplist -Group: Development/Libraries +%package python +Summary: Python package for libplist +Group: Development/Libraries Requires: libplist = %{version}-%{release} Requires: python @@ -43,33 +39,38 @@ Requires: python %prep %setup -q -%patch50 -p1 -b .cmake_lib_suffix %build -export CFLAGS=-fno-strict-aliasing -export CMAKE_PREFIX_PATH=/usr -%{cmake} -DCMAKE_SKIP_RPATH:BOOL=ON . +export CFLAGS='%optflags -fno-strict-aliasing' +export CXXFLAGS='%optflags -fno-strict-aliasing' +%configure --disable-static make V=1 %install -export CMAKE_PREFIX_PATH=/usr make install DESTDIR=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name "*.la" -delete + +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/plistutil +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libplist++.so.3* +chrpath --delete $RPM_BUILD_ROOT%{python_sitearch}/plist* + +%check +make check + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) -%doc AUTHORS COPYING.LESSER README +%license COPYING.LESSER +%doc AUTHORS README %{_bindir}/plistutil -%{_bindir}/plistutil-%{version} -%{_libdir}/libplist.so.* -%{_libdir}/libplist++.so.* +%{_libdir}/libplist.so.3* +%{_libdir}/libplist++.so.3* %files devel -%defattr(-,root,root,-) %{_libdir}/pkgconfig/libplist.pc %{_libdir}/pkgconfig/libplist++.pc %{_libdir}/libplist.so @@ -77,10 +78,21 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_includedir}/plist %files python -%defattr(-,root,root,-) %{python_sitearch}/plist* %changelog +* Mon Mar 27 2017 Kalev Lember - 1.12-3 +- Drop previous ABI version compatibility +- Resolves: #1430798 + +* Thu Mar 09 2017 Kalev Lember - 1.12-2 +- Include previous ABI version for temporary binary compatibility +- Resolves: #1430798 + +* Thu Mar 09 2017 Kalev Lember - 1.12-1 +- New upstream 1.12 release +- Resolves: #1430798 + * Fri Jan 24 2014 Daniel Mach - 1.10-4 - Mass rebuild 2014-01-24