- up to 1.6.1; fix build with openssl 1.1.1

diff --git a/build.patch b/build.patch
new file mode 100644 (file)
index 0000000..703c2ba
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,37 @@
+diff -urN xar-1.6.1.org/configure.ac xar-1.6.1/configure.ac
+--- xar-1.6.1.org/configure.ac 2012-09-17 13:30:07.000000000 +0200
++++ xar-1.6.1/configure.ac     2018-09-18 10:59:36.075915320 +0200
+@@ -329,7 +329,7 @@
+ dnl 
+ have_libcrypto="1"
+ AC_CHECK_HEADERS([openssl/evp.h], , [have_libcrypto="0"])
+-AC_CHECK_LIB([crypto], [OpenSSL_add_all_ciphers], , [have_libcrypto="0"])
++AC_CHECK_LIB([crypto], [EVP_DigestInit_ex], , [have_libcrypto="0"])
+ if test "x${have_libcrypto}" = "x0" ; then
+   AC_MSG_ERROR([Cannot build without libcrypto (OpenSSL)])
+ fi
+diff -urN xar-1.6.1.org/lib/ext2.c xar-1.6.1/lib/ext2.c
+--- xar-1.6.1.org/lib/ext2.c   2012-09-17 13:30:07.000000000 +0200
++++ xar-1.6.1/lib/ext2.c       2018-09-18 10:59:52.203069978 +0200
+@@ -140,8 +140,10 @@
+       if(! (flags & ~EXT2_NOCOMPR_FL) )
+               x_addprop(f, "NoCompBlock");
+ #endif
++#ifdef EXT2_ECOMPR_FL
+       if(! (flags & ~EXT2_ECOMPR_FL) )
+               x_addprop(f, "CompError");
++#endif
+       if(! (flags & ~EXT2_BTREE_FL) )
+               x_addprop(f, "BTree");
+       if(! (flags & ~EXT2_INDEX_FL) )
+@@ -229,8 +231,10 @@
+       if( e2prop_get(f, "NoCompBlock", (char **)&tmp) == 0 )
+               flags |= EXT2_NOCOMPR_FL ;
+ #endif
++#ifdef EXT2_ECOMPR_FL
+       if( e2prop_get(f, "CompError", (char **)&tmp) == 0 )
+               flags |= EXT2_ECOMPR_FL ;
++#endif
+       if( e2prop_get(f, "BTree", (char **)&tmp) == 0 )
+               flags |= EXT2_BTREE_FL ;
+       if( e2prop_get(f, "HashIndexed", (char **)&tmp) == 0 )

diff --git a/xar.spec b/xar.spec
index 8764318f6c4a2fcacf1260d588f01521923bb6c5..590668fe4d2a8fd7735921f1bede616b12ce66a1 100644 (file)
--- a/xar.spec
+++ b/xar.spec
@@ -1,13 +1,15 @@
 Summary:       Easily extensible archive format
 Summary(pl.UTF-8):     Łatwo rozszerzalny format archiwów
 Name:          xar
-Version:       1.5.2
-Release:       5
+Version:       1.6.1
+Release:       1
 License:       BSD
 Group:         Applications/Archiving
-Source0:       http://xar.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: 8eabb055d3387b8edc30ecfb08d2e80d
-URL:           http://code.google.com/p/xar/
+Source0:       https://github.com/downloads/mackyle/xar/xar-1.6.1.tar.gz
+# Source0-md5: a624535d6a1e8fdf420b36a6b334047b
+Patch0:                build.patch
+URL:           https://mackyle.github.io/xar/
+BuildRequires: autoconf
 BuildRequires: acl-devel
 BuildRequires: attr-devel
 BuildRequires: bzip2-devel
@@ -71,8 +73,11 @@ Statyczna biblioteka xara.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__aclocal}
+%{__autoconf}
 %configure
 %{__make}
 
@@ -90,7 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE TODO
+%doc LICENSE NEWS xar_README.txt ChangeLog
 %attr(755,root,root) %{_bindir}/xar
 %attr(755,root,root) %{_libdir}/libxar.so.1
 %{_mandir}/man1/xar.1*