From d34e7f6a85c5b25ef32b81d29644c303acd8c51c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 21 Apr 2014 16:47:38 +0100 Subject: [PATCH] 1.11 --- libplist-1.8-cmake_lib_suffix.patch | 17 -------------- libplist.spec | 35 +++++++++++++---------------- sources | 2 +- 3 files changed, 17 insertions(+), 37 deletions(-) delete mode 100644 libplist-1.8-cmake_lib_suffix.patch diff --git a/libplist-1.8-cmake_lib_suffix.patch b/libplist-1.8-cmake_lib_suffix.patch deleted file mode 100644 index 941bbaf..0000000 --- a/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/libplist.spec b/libplist.spec index 1805986..cc73fe9 100644 --- a/libplist.spec +++ b/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: 2%{?dist} +Version: 1.11 +Release: 1%{?dist} Summary: Library for manipulating Apple Binary and XML Property Lists Group: System Environment/Libraries @@ -10,15 +10,11 @@ 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 @@ -43,32 +39,31 @@ Requires: python %prep %setup -q -%patch50 -p1 -b .cmake_lib_suffix %build -export CMAKE_PREFIX_PATH=/usr -%{cmake} -DCMAKE_SKIP_RPATH:BOOL=ON . +%configure --disable-static + +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make V=1 %install -export CMAKE_PREFIX_PATH=/usr make install DESTDIR=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name "*.la" -delete + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc AUTHORS COPYING.LESSER README %{_bindir}/plistutil -%{_bindir}/plistutil-%{version} -%{_libdir}/libplist.so.* -%{_libdir}/libplist++.so.* +%{_libdir}/libplist.so.2* +%{_libdir}/libplist++.so.2* %files devel -%defattr(-,root,root,-) %{_libdir}/pkgconfig/libplist.pc %{_libdir}/pkgconfig/libplist++.pc %{_libdir}/libplist.so @@ -76,10 +71,12 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_includedir}/plist %files python -%defattr(-,root,root,-) %{python_sitearch}/plist* %changelog +* Sat Mar 22 2014 Peter Robinson 1.11-1 +- New upstream 1.11 release + * Sat Aug 03 2013 Fedora Release Engineering - 1.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 9c751f9..efdb5c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fe642d0c8602d70c408994555c330dd1 libplist-1.10.tar.bz2 +82de65f38cb2f0a9fd0839679b46072b libplist-1.11.tar.bz2