From d25a61e4ddbcc1e9e8e04634246c837bd357cac6 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Mon, 26 Sep 2011 15:19:28 +0000 Subject: [PATCH] - updated to 1.3.0 (note: new soname) - updated makefile patch Changed files: libmatroska-makefile.patch -> 1.13 libmatroska.spec -> 1.29 --- libmatroska-makefile.patch | 8 ++++---- libmatroska.spec | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libmatroska-makefile.patch b/libmatroska-makefile.patch index d057126..f521a7b 100644 --- a/libmatroska-makefile.patch +++ b/libmatroska-makefile.patch @@ -1,5 +1,5 @@ ---- libmatroska-1.2.0/make/linux/Makefile.orig 2011-06-30 19:44:13.460706988 +0200 -+++ libmatroska-1.2.0/make/linux/Makefile 2011-06-30 19:50:32.134053000 +0200 +--- libmatroska-1.3.0/make/linux/Makefile.orig 2011-09-26 17:14:10.104527029 +0200 ++++ libmatroska-1.3.0/make/linux/Makefile 2011-09-26 17:15:20.211196043 +0200 @@ -29,12 +29,13 @@ INSTALL_OPTS = -m 644 INSTALL_OPTS_LIB = -m 644 @@ -26,7 +26,7 @@ # Names -LIBRARY=libmatroska.a -LIBRARY_SO=libmatroska.so --LIBRARY_SO_VER=libmatroska.so.4 +-LIBRARY_SO_VER=libmatroska.so.5 +LIBRARY=libmatroska.la # source-files @@ -76,7 +76,7 @@ - $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml - rm -f $(LIBRARY_SO) - ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) -+ $(LIBTOOL) --mode=link --tag=CC $(LD) $(LDFLAGS) -version-info 4:0:0 -o $@ $^ $(LIBS) -lebml -rpath $(libdir) ++ $(LIBTOOL) --mode=link --tag=CC $(LD) $(LDFLAGS) -version-info 5:0:0 -o $@ $^ $(LIBS) -lebml -rpath $(libdir) clean: cleantest rm -f $(objects) $(objects_so) diff --git a/libmatroska.spec b/libmatroska.spec index 49ef2f5..2f69315 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,20 +1,20 @@ Summary: Extensible Binary Meta Language access library Summary(pl.UTF-8): Biblioteka dostępu rozszerzalnego metajęzyka binarnego Name: libmatroska -Version: 1.2.0 +Version: 1.3.0 Release: 1 License: LGPL v2.1+ Group: Libraries Source0: http://dl.matroska.org/downloads/libmatroska/%{name}-%{version}.tar.bz2 -# Source0-md5: a4f967f9ade56d5181714f3199ffa241 +# Source0-md5: f4a8c411f09d39c754eb726efd616043 Patch0: %{name}-makefile.patch URL: http://www.matroska.org/ -BuildRequires: libebml-devel >= 1.2.1 +BuildRequires: libebml-devel >= 1.2.2 BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: rpmbuild(macros) >= 1.566 BuildRequires: sed >= 4.0 -Requires: libebml >= 1.2.1 +Requires: libebml >= 1.2.2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -38,7 +38,7 @@ Summary: Header files for matroska library Summary(pl.UTF-8): Nagłówki dla biblioteki matroska Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libebml-devel >= 1.2.1 +Requires: libebml-devel >= 1.2.2 Requires: libstdc++-devel %description devel @@ -95,7 +95,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc ChangeLog %attr(755,root,root) %{_libdir}/libmatroska.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libmatroska.so.4 +%attr(755,root,root) %ghost %{_libdir}/libmatroska.so.5 %files devel %defattr(644,root,root,755) -- 2.43.0