- updated to 2.2.0 (note: new library name)

- removed outdated python3.8 patch
- added sh patch (stick to POSIX-compliant sh syntax)

diff --git a/libplist-sh.patch b/libplist-sh.patch
new file mode 100644 (file)
index 0000000..e01a916
--- /dev/null
+++ b/libplist-sh.patch
@@ -0,0 +1,104 @@
+--- libplist-2.2.0/configure.ac.orig   2020-06-15 14:45:49.000000000 +0200
++++ libplist-2.2.0/configure.ac        2020-09-12 08:15:33.382297575 +0200
+@@ -154,7 +154,7 @@
+ GLOBAL_LDFLAGS="$PTHREAD_LIBS"
+ 
+ if test "x$ac_cv_fmin_builtin" != "xyes"; then
+-      GLOBAL_LDFLAGS+=" -lm"
++      GLOBAL_LDFLAGS="$GLOBAL_LDFLAGS -lm"
+ fi
+ 
+ AC_ARG_ENABLE(debug,
+@@ -169,7 +169,7 @@
+ 
+ if (test "x$debug" = "xyes"); then
+        AC_DEFINE(DEBUG, 1, [Define if debug message output code should be built.])
+-       GLOBAL_CFLAGS+=" -g"
++       GLOBAL_CFLAGS="$GLOBAL_CFLAGS -g"
+ fi
+ 
+ AC_SUBST(GLOBAL_CFLAGS)
+@@ -201,23 +201,23 @@
+ 
+ if test "x$build_sanitizers" = "xyes"; then
+     AS_COMPILER_FLAG([-fsanitize=address], [
+-        SANITIZER_FLAGS+=" -fsanitize=address"
++        SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize=address"
+         ASAN_AVAILABLE=yes
+     ], [])
+     if test "$ASAN_AVAILABLE" = "yes"; then
+         AS_COMPILER_FLAG([-fsanitize=address -fsanitize-address-use-after-scope], [
+-            SANITIZER_FLAGS+=" -fsanitize-address-use-after-scope"
++            SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize-address-use-after-scope"
+         ], [])
+-        SANITIZERS+="ASAN "
++        SANITIZERS="${SANITIZERS}ASAN "
+     fi
+ 
+     AS_COMPILER_FLAG([-fsanitize=undefined], [
+-        SANITIZER_FLAGS+=" -fsanitize=undefined"
++        SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize=undefined"
+         UBSAN_AVAILABLE=yes
+     ], [])
+ 
+     if test "$UBSAN_AVAILABLE" = "yes"; then
+-        SANITIZERS+="UBSAN "
++        SANITIZERS="${SANITIZERS}UBSAN "
+     fi
+ 
+     if test -z "$SANITIZER_FLAGS"; then
+@@ -230,13 +230,13 @@
+             if test -z "$SAN_COV_FLAGS"; then
+                 SAN_COV_FLAGS="$COV_CHECK"
+             else
+-                SAN_COV_FLAGS+=",$COV_CHECK"
++                SAN_COV_FLAGS="${SAN_COV_FLAGS},$COV_CHECK"
+             fi
+         ], [])
+     done
+     if test -n "$SAN_COV_FLAGS"; then
+-        SANITIZER_FLAGS+=" -fsanitize-coverage=$SAN_COV_FLAGS"
+-        SANITIZERS+="+coverage "
++        SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize-coverage=$SAN_COV_FLAGS"
++        SANITIZERS="${SANITIZERS}+coverage "
+     else
+         AC_MSG_WARN([No sanitizer coverage supported by compiler])
+     fi
+@@ -244,20 +244,20 @@
+     CFLAGS="-O1"
+ 
+     AS_COMPILER_FLAG([-fno-omit-frame-pointer], [
+-        CFLAGS+=" -fno-omit-frame-pointer"
++        CFLAGS="$CFLAGS -fno-omit-frame-pointer"
+     ], [])
+ 
+     AS_COMPILER_FLAG([-gline-tables-only], [
+-        CFLAGS+=" -gline-tables-only"
++        CFLAGS="$CFLAGS -gline-tables-only"
+     ],
+     [
+-        CFLAGS+=" -g"
++        CFLAGS="$CFLAGS -g"
+     ])
+ 
+-    EXTRA_CONF+="  Enabled sanitizers ......: $SANITIZERS
++    EXTRA_CONF="$EXTRA_CONF  Enabled sanitizers ......: $SANITIZERS
+ "
+ 
+-    CFLAGS+=" $SANITIZER_FLAGS"
++    CFLAGS="$CFLAGS $SANITIZER_FLAGS"
+     CXXFLAGS="$CFLAGS -std=c++11"
+ fi
+ 
+@@ -266,9 +266,9 @@
+         AC_MSG_WARN([building fuzzers requires clang/clang++ (continuing anyway)])
+     fi
+ 
+-    CFLAGS+=" -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
++    CFLAGS="$CFLAGS -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
+ 
+-    EXTRA_CONF+="  Build fuzzers ...........: yes
++    EXTRA_CONF="$EXTRA_CONF  Build fuzzers ...........: yes
+ "
+ fi
+ 

diff --git a/libplist.spec b/libplist.spec
index 06bc29cee608e7768921078796757e3761ecf760..99c48a60971a72a127aabc43c6ea4a42050a31fa 100644 (file)
--- a/libplist.spec
+++ b/libplist.spec
@@ -10,15 +10,15 @@
 Summary:       Library for manipulating Apple Property Lists
 Summary(pl.UTF-8):     Biblioteka do manipulowania Apple Property Lists
 Name:          libplist
-Version:       2.0.0
-Release:       5
+Version:       2.2.0
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
-# Source0Download: http://www.libimobiledevice.org/
-Source0:       http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 16fb70d869f66e23cbe140109e78b650
-Patch0:                python-3.8.patch
-URL:           http://www.libimobiledevice.org/
+# Source0Download: https://libimobiledevice.org/
+Source0:       https://github.com/libimobiledevice/libplist/releases/download/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5: 63cc49401521662c94cd4107898c744c
+Patch0:                %{name}-sh.patch
+URL:           https://libimobiledevice.org/
 BuildRequires: autoconf >= 2.64
 BuildRequires: automake
 BuildRequires: libstdc++-devel
@@ -173,8 +173,6 @@ cd ..
 topdir=$(pwd)
 install -d build-py3
 cd build-py3
-export PYTHON_EXTRA_LIBS=$(python3-config --libs --embed)
-export PYTHON_LDFLAGS=$(python3-config --libs --embed)
 ../%configure \
        PYTHON=%{__python3} \
        --disable-silent-rules
@@ -193,10 +191,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 %if %{with cython}
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-%py_postclean
-
 install -d $RPM_BUILD_ROOT%{_includedir}/plist/cython
 cp -p cython/plist.pxd $RPM_BUILD_ROOT%{_includedir}/plist/cython/plist.pxd
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/plist.la \
@@ -207,10 +201,7 @@ cp -p cython/plist.pxd $RPM_BUILD_ROOT%{_includedir}/plist/cython/plist.pxd
        DESTDIR=$RPM_BUILD_ROOT \
        top_builddir="$(pwd)/build"
 
-%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
-%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
-
-%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/plist.la \
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/plist.la
        %{?with_static_libs:$RPM_BUILD_ROOT%{py3_sitedir}/plist.a}
 %endif
 %endif
@@ -226,32 +217,33 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README
+%doc AUTHORS NEWS README.md
 %attr(755,root,root) %{_bindir}/plistutil
-%attr(755,root,root) %{_libdir}/libplist.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libplist.so.3
+%attr(755,root,root) %{_libdir}/libplist-2.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libplist-2.0.so.3
+%{_mandir}/man1/plistutil.1*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libplist.so
+%attr(755,root,root) %{_libdir}/libplist-2.0.so
 %dir %{_includedir}/plist
 %{_includedir}/plist/plist.h
-%{_pkgconfigdir}/libplist.pc
+%{_pkgconfigdir}/libplist-2.0.pc
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libplist.a
+%{_libdir}/libplist-2.0.a
 %endif
 
 %files c++
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libplist++.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libplist++.so.3
+%attr(755,root,root) %{_libdir}/libplist++-2.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libplist++-2.0.so.3
 
 %files c++-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libplist++.so
+%attr(755,root,root) %{_libdir}/libplist++-2.0.so
 %{_includedir}/plist/Array.h
 %{_includedir}/plist/Boolean.h
 %{_includedir}/plist/Data.h
@@ -265,12 +257,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/plist/Structure.h
 %{_includedir}/plist/Uid.h
 %{_includedir}/plist/plist++.h
-%{_pkgconfigdir}/libplist++.pc
+%{_pkgconfigdir}/libplist++-2.0.pc
 
 %if %{with static_libs}
 %files c++-static
 %defattr(644,root,root,755)
-%{_libdir}/libplist++.a
+%{_libdir}/libplist++-2.0.a
 %endif
 
 %if %{with cython}

diff --git a/python-3.8.patch b/python-3.8.patch
deleted file mode 100644 (file)
index 19917d1..0000000
--- a/python-3.8.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- libplist-2.0.0/m4/ac_python_devel.m4~      2015-01-31 20:18:32.000000000 +0100
-+++ libplist-2.0.0/m4/ac_python_devel.m4       2019-11-02 21:47:11.479855891 +0100
-@@ -169,10 +169,10 @@
-       # Check for Python library path
-       #
-       AC_MSG_CHECKING([for Python library path])
--      if type $PYTHON-config; then
--              PYTHON_LDFLAGS=`$PYTHON-config --ldflags`
--      fi
-       if test -z "$PYTHON_LDFLAGS"; then
-+              if type $PYTHON-config; then
-+                      PYTHON_LDFLAGS=`$PYTHON-config --ldflags`
-+              fi
-               # (makes two attempts to ensure we've got a version number
-               # from the interpreter)
-               py_version=`$PYTHON -c "from distutils.sysconfig import *; \