- updated to 0.7.6, updated makefile patch

[packages/libmatroska.git] / libmatroska.spec

diff --git a/libmatroska.spec b/libmatroska.spec
index 13598433bbc3bdacbc46f3b4db1f066b02895a3d..d4e983c3e3942fe43c4c7337e49b7a138f787e1b 100644 (file)
--- a/libmatroska.spec
+++ b/libmatroska.spec
@@ -1,17 +1,19 @@
 Summary:       Extensible Binary Meta Language access library
 Summary(pl):   Biblioteka dostêpu rozszerzalnego metajêzyka binarnego
 Name:          libmatroska
-Version:       0.4.4
+Version:       0.7.6
 Release:       1
-License:       GPL v2 or QPL
+License:       LGPL v2.1+
 Group:         Libraries
-Source0:       http://matroska.free.fr/downloads/%{name}/%{name}-%{version}.tar.bz2
-# Source0-md5: 1d855dc5d7a16d562efcac53f9cbdf7b
+Source0:       http://dl.matroska.org/downloads/libmatroska/%{name}-%{version}.tar.bz2
+# Source0-md5: 2c9ae5b7d72767b9c23fca6ecf3681e7
 Patch0:                %{name}-makefile.patch
+Patch1:                %{name}-version_define.patch
 URL:           http://www.matroska.org/
-BuildRequires: libebml-devel
+BuildRequires: libebml-devel >= 0.7.4
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
+Requires:      libebml >= 0.7.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -26,15 +28,16 @@ in old parsers.
 Matroska to rozszerzalny otwarty format kodowania d¼wiêku i obrazu,
 d±¿±cy do stania siê pewnego dnia standardem formatów zawieraj±cych
 multimedia. Jest on oparty na EBML (rozszerzalnym metajêzyku
-binarnym), binarnym odpowiedniku XML. W ten sposób ma on przewagê nad
-innymi formatami pod wzglêdem przysz³ej rozszerzalno¶ci przy
+binarnym), binarnym odpowiedniku XML-a. W ten sposób ma on przewagê
+nad innymi formatami pod wzglêdem przysz³ej rozszerzalno¶ci przy
 jednoczesnym zachowaniu kompatybilno¶ci wstecz.
 
 %package devel
 Summary:       Header files for matroska library
 Summary(pl):   Nag³ówki dla biblioteki matroska
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
+Requires:      libebml-devel >= 0.7.4
 Requires:      libstdc++-devel
 
 %description devel
@@ -47,7 +50,7 @@ Nag
 Summary:       Static version of matroska library
 Summary(pl):   Statyczna wersja biblioteki matroska
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 Static version of matroska library.
@@ -56,12 +59,14 @@ Static version of matroska library.
 Statyczna wersja biblioteki matroska.
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} -C make/linux \
        prefix=%{_prefix} \
+       libdir=%{_libdir} \
        CXX="%{__cxx}" \
        LD="%{__cxx}" \
        DEBUGFLAGS="%{rpmcflags} %{?debug:-DDEBUG}" \
@@ -72,11 +77,12 @@ Statyczna wersja biblioteki matroska.
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} -C make/linux install \
-       prefix=$RPM_BUILD_ROOT%{_prefix}
+       prefix=$RPM_BUILD_ROOT%{_prefix} \
+       libdir=$RPM_BUILD_ROOT%{_libdir}
 
 # prepare docs (with working hyperlinks)
-install -d doc
-cp --parents src/api/index.html src/api/c/index.html doc
+#install -d doc
+#cp --parents src/api/index.html src/api/c/index.html doc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -84,13 +90,14 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
-%files 
+%files
 %defattr(644,root,root,755)
+%doc ChangeLog
 %attr(755,root,root) %{_libdir}/libmatroska.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/src/api/*
+##%doc doc/src/api/*
 %attr(755,root,root) %{_libdir}/libmatroska.so
 %{_libdir}/libmatroska.la
 %{_includedir}/matroska