packages: libmatroska/libmatroska-makefile.patch, libmatroska/libmatroska.s...

[glen]

Author: glen                         Date: Thu Aug  5 20:46:07 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.0.0, new soname (versioned deps solved via sonames as well)

---- Files affected:
packages/libmatroska:
   libmatroska-makefile.patch (1.9 -> 1.10) , libmatroska.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: packages/libmatroska/libmatroska-makefile.patch
diff -u packages/libmatroska/libmatroska-makefile.patch:1.9 packages/libmatroska/libmatroska-makefile.patch:1.10
--- packages/libmatroska/libmatroska-makefile.patch:1.9	Thu Aug  5 22:26:31 2010
+++ packages/libmatroska/libmatroska-makefile.patch	Thu Aug  5 22:46:02 2010
@@ -1,5 +1,5 @@
---- libmatroska-0.8.1/make/linux/Makefile.orig	2006-06-02 16:32:52.000000000 +0200
-+++ libmatroska-0.8.1/make/linux/Makefile	2007-02-17 21:06:58.961639212 +0100
+--- libmatroska-1.0.0/make/linux/Makefile~	2010-08-05 23:37:39.000000000 +0300
++++ libmatroska-1.0.0/make/linux/Makefile	2010-08-05 23:38:53.361903703 +0300
 @@ -28,6 +28,7 @@
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
@@ -19,7 +19,7 @@
  EXTENSION=.cpp
  
  ifeq (yes,$(DEBUG))
-@@ -52,12 +53,10 @@
+@@ -50,12 +50,10 @@
  # Librarires
  INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
  LIBS=
@@ -29,7 +29,7 @@
  # Names
 -LIBRARY=libmatroska.a
 -LIBRARY_SO=libmatroska.so
--LIBRARY_SO_VER=libmatroska.so.0
+-LIBRARY_SO_VER=libmatroska.so.2
 +LIBRARY=libmatroska.la
  
  # source-files
@@ -47,7 +47,7 @@
  
  WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
  		-Wshadow
-@@ -79,32 +76,19 @@
+@@ -75,32 +73,19 @@
  ifeq (Darwin,$(shell uname -s))
  all: staticlib
  else
@@ -72,14 +72,14 @@
 +	$(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  
  $(LIBRARY): $(objects)
--	$(AR) $@ $(objects)
+-	$(AR) rcvu $@ $(objects)
 -	$(RANLIB) $@
 -
 -$(LIBRARY_SO): $(objects_so)
 -	$(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) -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
++	$(LIBTOOL) --mode=link --tag=CC $(LD) $(LDFLAGS) -version-info 2:0:0 -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
  
  clean:	cleantest
  	rm -f $(objects) $(objects_so)

================================================================
Index: packages/libmatroska/libmatroska.spec
diff -u packages/libmatroska/libmatroska.spec:1.25 packages/libmatroska/libmatroska.spec:1.26
--- packages/libmatroska/libmatroska.spec:1.25	Thu Aug  5 22:26:48 2010
+++ packages/libmatroska/libmatroska.spec	Thu Aug  5 22:46:02 2010
@@ -2,18 +2,19 @@
 Summary:	Extensible Binary Meta Language access library
 Summary(pl.UTF-8):	Biblioteka dostępu rozszerzalnego metajęzyka binarnego
 Name:		libmatroska
-Version:	0.8.1
+Version:	1.0.0
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://dl.matroska.org/downloads/libmatroska/%{name}-%{version}.tar.bz2
-# Source0-md5:	20cf624ace0c58a54c7752eebfbc0b19
+# Source0-md5:	4efcf3945b17a6f0320cf1aaa326a4de
 Patch0:		%{name}-makefile.patch
 URL:		http://www.matroska.org/
-BuildRequires:	libebml-devel >= 0.7.6
+BuildRequires:	libebml-devel >= 1.0.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
-Requires:	libebml >= 0.7.6
+BuildRequires:	rpmbuild(macros) >= 1.566
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,7 +38,7 @@
 Summary(pl.UTF-8):	Nagłówki dla biblioteki matroska
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	libebml-devel >= 0.7.6
+Requires:	libebml-devel
 Requires:	libstdc++-devel
 
 %description devel
@@ -60,6 +61,7 @@
 
 %prep
 %setup -q
+%undos make/linux/Makefile
 %patch0 -p1
 
 %build
@@ -93,7 +95,7 @@
 %defattr(644,root,root,755)
 %doc ChangeLog
 %attr(755,root,root) %{_libdir}/libmatroska.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmatroska.so.0
+%attr(755,root,root) %ghost %{_libdir}/libmatroska.so.2
 
 %files devel
 %defattr(644,root,root,755)
@@ -112,6 +114,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2010/08/05 20:46:02  glen
+- up to 1.0.0, new soname (versioned deps solved via sonames as well)
+
 Revision 1.25  2010/08/05 20:26:48  glen
 - package ghost soname symlink
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libmatroska/libmatroska-makefile.patch?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libmatroska/libmatroska.spec?r1=1.25&r2=1.26&f=u