- updated to 0.9.4 (note: new soname and .pc file version)

- removed obsolete automake-1.12 patch

diff --git a/libquvi-automake-1.12.patch b/libquvi-automake-1.12.patch
deleted file mode 100644 (file)
index 996d0aa..0000000
--- a/libquvi-automake-1.12.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- libquvi-0.4.1/configure.ac.orig    2012-06-24 17:06:22.799692074 +0200
-+++ libquvi-0.4.1/configure.ac 2012-06-24 17:11:14.781443604 +0200
-@@ -31,11 +31,14 @@ AC_DEFINE_UNQUOTED([CANONICAL_HOST], "$h
- AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2 dist-xz])
- AM_SILENT_RULES([yes])
- 
-+AM_PROG_AR
-+
- LT_INIT()
- LT_PREREQ([2.2])
- 
- # Checks for programs.
- AC_PROG_CC
-+AM_PROG_CC_C_O
- 
- AC_PATH_PROGS([ND], [naturaldocs NaturalDocs], [],
-   [$ND_PATH$PATH_SEPARATOR$PATH])

diff --git a/libquvi.spec b/libquvi.spec
index d3f117b5db2ddf4eb45c6d3eb37f07fe994842e8..6493c263435cc278cb4e209666c387927c69ea51 100644 (file)
--- a/libquvi.spec
+++ b/libquvi.spec
@@ -5,24 +5,33 @@
 Summary:       A cross-platform library for parsing flash media stream
 Summary(pl.UTF-8):     Wieloplatformowa biblioteka do analizy flashowych strumieni multimedialnych
 Name:          libquvi
-Version:       0.4.1
-Release:       2
-License:       LGPL v2+
+Version:       0.9.4
+Release:       1
+License:       AGPL v3+
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/quvi/%{name}-%{version}.tar.xz
-# Source0-md5: acc5a5da25a7f89c6ff5338d00eaaf58
-Patch0:                %{name}-automake-1.12.patch
+# Source0-md5: 8e3f2134a6b3376934bd884b07dcdac5
 URL:           http://quvi.sourceforge.net/
-BuildRequires: autoconf >= 2.68
-BuildRequires: automake
-BuildRequires: curl-devel >= 7.18.2
-BuildRequires: libquvi-scripts >= 0.4.0
-BuildRequires: libtool >= 2:2.2
+BuildRequires: asciidoc
+BuildRequires: autoconf >= 2.69
+BuildRequires: automake >= 1:1.11.1
+BuildRequires: curl-devel >= 7.21
+BuildRequires: doxygen
+BuildRequires: gettext-tools >= 0.18.1
+BuildRequires: glib2-devel >= 1:2.24
+BuildRequires: libgcrypt-devel >= 1.4.5
+BuildRequires: libproxy-devel >= 0.3.1
+BuildRequires: libquvi-scripts >= 0.9
+BuildRequires: libtool >= 2:2.2.6
 BuildRequires: lua51-devel >= 5.1
 BuildRequires: pkgconfig
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
-Requires:      libquvi-scripts >= 0.4.0
+Requires:      curl-libs >= 7.21
+Requires:      glib2 >= 1:2.24
+Requires:      libgcrypt >= 1.4.5
+Requires:      libproxy >= 0.3.1
+Requires:      libquvi-scripts >= 0.9
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -63,7 +72,6 @@ Statyczna biblioteka libquvi.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -72,7 +80,7 @@ Statyczna biblioteka libquvi.
 %{__autoheader}
 %{__automake}
 %configure \
-       %{!?with_static_libs:--disable-static} \
+       %{?with_static_libs:--enable-static} \
        --disable-silent-rules
 %{__make}
 
@@ -93,18 +101,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_libdir}/libquvi.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libquvi.so.7
+%attr(755,root,root) %{_libdir}/libquvi-0.9-%{version}.so
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libquvi.so
+%attr(755,root,root) %{_libdir}/libquvi-0.9.so
+%{_includedir}/quvi-0.9
+%{_pkgconfigdir}/libquvi-0.9.pc
 %{_mandir}/man3/libquvi.3*
-%{_includedir}/quvi
-%{_pkgconfigdir}/libquvi.pc
+%{_mandir}/man7/quvi-object.7*
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libquvi.a
+%{_libdir}/libquvi-0.9.a
 %endif