- updated to 0.9.2

- added cppunit-pkgconfig.patch (No cppunit-config in latest cppunit)

diff --git a/cppunit-pkgconfig.patch b/cppunit-pkgconfig.patch
new file mode 100644 (file)
index 0000000..7158ee8
--- /dev/null
+++ b/cppunit-pkgconfig.patch
@@ -0,0 +1,27 @@
+--- libfilezilla-0.9.2/m4/cppunit.m4.ddd       2015-11-02 14:47:31.000000000 +0100
++++ libfilezilla-0.9.2/m4/cppunit.m4   2017-06-06 19:08:00.329550653 +0200
+@@ -29,12 +29,14 @@ AC_ARG_WITH(cppunit-exec-prefix,[  --wit
+   no_cppunit=""
+   if test "$CPPUNIT_CONFIG" = "no" ; then
+     AC_MSG_RESULT(no)
+-    no_cppunit=yes
++    CPPUNIT_CFLAGS=`pkg-config --cflags cppunit`
++    CPPUNIT_LIBS=`pkg-config --libs cppunit`
++    cppunit_version=`pkg-config --modversion cppunit`
+   else
+     CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
+     CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
+     cppunit_version=`$CPPUNIT_CONFIG --version`
+-
++  fi
+     cppunit_major_version=`echo $cppunit_version | \
+            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+     cppunit_minor_version=`echo $cppunit_version | \
+@@ -74,7 +76,6 @@ AC_ARG_WITH(cppunit-exec-prefix,[  --wit
+       AC_MSG_RESULT(no)
+       no_cppunit=yes
+     fi
+-  fi
+ 
+   if test "x$no_cppunit" = x ; then
+      ifelse([$2], , :, [$2])

diff --git a/libfilezilla.spec b/libfilezilla.spec
index b649c8d9854fe3074044e7bd5d66c4c458b6e952..e5d38cfc00a439b4a96f12314d30dc75092fe7a8 100644 (file)
--- a/libfilezilla.spec
+++ b/libfilezilla.spec
@@ -7,18 +7,23 @@
 Summary:       Library for high-performing platform-independent programs
 Summary(pl.UTF-8):     Biblioteka do wydajnych programów niezależnych od platformy
 Name:          libfilezilla
-Version:       0.9.1
+Version:       0.9.2
 Release:       1
 License:       GPL v2
 Group:         Libraries
 Source0:       http://download.filezilla-project.org/libfilezilla/%{name}-%{version}.tar.bz2
-# Source0-md5: 4676304b048869ab6ac6ae09a1ab29f9
+# Source0-md5: d52a0e7229efb3c9fafc8a2b649d665d
+Patch0:                cppunit-pkgconfig.patch
 URL:           http://lib.filezilla-project.org/
 %{?with_tests:BuildRequires:   cppunit-devel >= 1.10.2}
 %{?with_apidocs:BuildRequires: doxygen}
 %if %{with tests} && %(locale -a | grep -q '^C\.UTF-8$'; echo $?)
 BuildRequires: glibc-localedb-all
 %endif
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake
+BuildRequires: libtool >= 2:2
+BuildRequires: pkgconfig >= 1:0.7
 # -std=c++14
 BuildRequires: libstdc++-devel >= 6:5
 BuildRequires: rpmbuild(macros) >= 1.583
@@ -89,8 +94,14 @@ Dokumentacja API biblioteki %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        %{!?with_static_libs:--disable-static}
 %{__make}