- updated to 1.3.0 (note: new soname)

- updated makefile patch

diff --git a/libebml-makefile.patch b/libebml-makefile.patch
index 5e00d5eda947af3feb917455988cd1140729c316..5c2f12f479cb21f4b787f7dc5118f754f2d254cc 100644 (file)
--- a/libebml-makefile.patch
+++ b/libebml-makefile.patch
@@ -1,6 +1,6 @@
---- libebml-1.0.0/make/linux/Makefile~ 2010-08-05 23:04:21.000000000 +0300
-+++ libebml-1.0.0/make/linux/Makefile  2010-08-05 23:04:54.438670198 +0300
-@@ -28,6 +28,7 @@
+--- libebml-1.3.0/make/linux/Makefile.orig     2013-03-22 22:37:42.558227596 +0100
++++ libebml-1.3.0/make/linux/Makefile  2013-03-22 22:38:41.438225125 +0100
+@@ -29,6 +29,7 @@
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
  INSTALL_DIR_OPTS = -m 755
@@ -8,18 +8,18 @@
  
  # Options
  EXTENSION=.cpp
-@@ -50,9 +51,7 @@
+@@ -47,9 +48,7 @@
  LIBS=
  
  # Names
 -LIBRARY=libebml.a
 -LIBRARY_SO=libebml.so
--LIBRARY_SO_VER=libebml.so.3
+-LIBRARY_SO_VER=libebml.so.4
 +LIBRARY=libebml.la
  
  # source-files
  sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
-@@ -60,9 +59,8 @@
+@@ -57,9 +56,8 @@
  # header files; replace .cxx extension with .h
  headers:=$(patsubst %$(EXTENSION),%.h,$(sources))
  
@@ -29,9 +29,9 @@
 +# object files; replace .cxx extension with .lo
 +objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))
  
- WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
+ WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
  COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
-@@ -78,20 +78,11 @@
+@@ -80,20 +78,11 @@
        @false
  
  # Build rules
@@ -50,11 +50,11 @@
 -      $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
 -      rm -f $(LIBRARY_SO)
 -      ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
-+      $(LIBTOOL) --mode=link --tag=CXX $(LD) $(LDFLAGS) -version-info 3:0:0 -o $@ $^ $(LIBS) -rpath $(libdir)
++      $(LIBTOOL) --mode=link --tag=CXX $(LD) $(LDFLAGS) -version-info 4:0:0 -o $@ $^ $(LIBS) -rpath $(libdir)
  
  clean:
        rm -f $(objects) $(objects_so)
-@@ -121,27 +110,22 @@
+@@ -118,27 +107,22 @@
  ifeq (Darwin,$(shell uname -s))
  install: install_staticlib install_headers
  else
@@ -90,4 +90,3 @@
  
  
  ifneq ($(wildcard .depend),)
-

diff --git a/libebml.spec b/libebml.spec
index 1c4b2cac9122d510095f8eebe4593e55ba2f57dc..ed7228a7acb939e42b961ce5d402d5b5f076c9fa 100644 (file)
--- a/libebml.spec
+++ b/libebml.spec
@@ -1,12 +1,12 @@
 Summary:       Extensible Binary Meta Language access library
 Summary(pl.UTF-8):     Biblioteka dostępu rozszerzalnego metajęzyka binarnego
 Name:          libebml
-Version:       1.2.2
+Version:       1.3.0
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://dl.matroska.org/downloads/libebml/%{name}-%{version}.tar.bz2
-# Source0-md5: 726cc2bd1a525929ff35ff9854c0ebab
+# Source0-md5: efec729bf5a51e649e1d9d1f61c0ae7a
 Patch0:                %{name}-makefile.patch
 URL:           http://www.matroska.org/
 BuildRequires: libstdc++-devel
@@ -82,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ChangeLog
 %attr(755,root,root) %{_libdir}/libebml.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libebml.so.3
+%attr(755,root,root) %ghost %{_libdir}/libebml.so.4
 
 %files devel
 %defattr(644,root,root,755)