- updated to 1.4.2

- removed obsolete makefile patch (upstream switched to ac/am/lt based build system)
- added link patch (link libmatroska with libebml)

diff --git a/libmatroska-link.patch b/libmatroska-link.patch
new file mode 100644 (file)
index 0000000..941e011
--- /dev/null
+++ b/libmatroska-link.patch
@@ -0,0 +1,10 @@
+--- libmatroska-1.4.2/Makefile.am.orig 2015-01-04 14:31:17.000000000 +0100
++++ libmatroska-1.4.2/Makefile.am      2015-01-10 19:28:35.505841761 +0100
+@@ -27,6 +27,7 @@
+       src/KaxTracks.cpp \
+       src/KaxVersion.cpp
+ libmatroska_la_LDFLAGS = -version-info 6:0:0 -no-undefined
++libmatroska_la_LIBADD = $(EBML_LIBS)
+ 
+ nobase_include_HEADERS = \
+       matroska/c/libmatroska.h \

diff --git a/libmatroska-makefile.patch b/libmatroska-makefile.patch
deleted file mode 100644 (file)
index a8bafda..0000000
--- a/libmatroska-makefile.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- libmatroska-1.4.1/make/linux/Makefile.orig 2013-09-19 20:45:17.662069195 +0200
-+++ libmatroska-1.4.1/make/linux/Makefile      2013-09-19 20:51:55.232052511 +0200
-@@ -29,12 +29,13 @@
- INSTALL_OPTS = -m 644
- INSTALL_OPTS_LIB = -m 644
- INSTALL_DIR_OPTS = -m 755
-+LIBTOOL = libtool
- 
- CWD=$(shell pwd)
- 
- # Options
--LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml
--LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux
-+LIBEBML_INCLUDE_DIR=
-+LIBEBML_LIB_DIR=
- EXTENSION=.cpp
- 
- ifeq (yes,$(DEBUG))
-@@ -59,12 +60,10 @@
- # Libraries
- INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
- LIBS=
--MUX_LIBS=-lmatroska -lebml $(LIBICONV)
-+MUX_LIBS=libmatroska.la -lebml $(LIBICONV)
- 
- # Names
--LIBRARY=libmatroska.a
--LIBRARY_SO=libmatroska.so
--LIBRARY_SO_VER=libmatroska.so.6
-+LIBRARY=libmatroska.la
- 
- # source-files
- sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
-@@ -72,39 +71,24 @@
- # header files; replace .cxx extension with .h
- headers:=$(patsubst %$(EXTENSION),%.h,$(sources))
- 
--# object files; replace .cxx extension with .o
--objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
--
--objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
-+# object files; replace .cxx extension with .lo
-+objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))
- 
- WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -D_GNU_SOURCE -Wshadow
- COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE)
- LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS)
- DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
- 
--all: $(targets_$(link))
--
--staticlib: $(LIBRARY)
--
--sharedlib: $(LIBRARY_SO)
-+all: $(LIBRARY)
- 
- lib:
-       @echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
-       @false
- 
- # Build rules
--%.o: %$(EXTENSION)
--      $(CXX) -c $(COMPILEFLAGS) -o $@ $<
--
- %.lo: %$(EXTENSION)
--      $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
-+      $(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
- 
- $(LIBRARY): $(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 $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir) -version-info 6:0:0
- 
-@@ -134,24 +120,24 @@
- test: test6 test9
- 
- test6:        test6.o $(LIBRARY) $(LIBRARY_SO)
--      $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-+      $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
- 
- test6.o: $(MUX_SRC_DIR)test6.cpp
-       $(CXX) -c $(COMPILEFLAGS) -o $@ $<
- 
- test8:        test8.o $(LIBRARY) $(LIBRARY_SO)
--      $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-+      $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
- 
- test8.o: $(MUX_SRC_DIR)test8.cpp
-       $(CXX) -c $(COMPILEFLAGS) -o $@ $<
- 
- test9:        test9.o $(LIBRARY) $(LIBRARY_SO)
--      $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-+      $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
- 
- test9.o: $(TAG_SRC_DIR)test9.cpp
-       $(CXX) -c $(COMPILEFLAGS) -o $@ $<
- 
--install: $(targets_$(link):%=install_%) install_headers 
-+install: install_lib install_headers 
- 
- install_headers:
-       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
-@@ -163,14 +149,9 @@
-               $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
-       done
- 
--install_staticlib: $(LIBRARY)
--      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
--      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
--
--install_sharedlib: $(LIBRARY_SO)
-+install_lib: $(LIBRARY)
-       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
--      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)
--      ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)
-+      $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
- 
- ifneq ($(wildcard .depend),)
- include .depend

diff --git a/libmatroska.spec b/libmatroska.spec
index bf216a9287d044df835a9448a7af26d22efcf3ca..0d090dc8ae32b85a65a86c171c9a7ba072ef08c6 100644 (file)
--- a/libmatroska.spec
+++ b/libmatroska.spec
@@ -1,20 +1,22 @@
 Summary:       Extensible Binary Meta Language access library
 Summary(pl.UTF-8):     Biblioteka dostępu rozszerzalnego metajęzyka binarnego
 Name:          libmatroska
-Version:       1.4.1
+Version:       1.4.2
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://dl.matroska.org/downloads/libmatroska/%{name}-%{version}.tar.bz2
-# Source0-md5: f61b2e5086f4bb9d24a43cc8af43a719
-Patch0:                %{name}-makefile.patch
+# Source0-md5: f8fe42003e072a42a19ed40405f9efdb
+Patch0:                %{name}-link.patch
 URL:           http://www.matroska.org/
-BuildRequires: libebml-devel >= 1.3.0
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake
+BuildRequires: libebml-devel >= 1.3.1
 BuildRequires: libstdc++-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2
+BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.566
-#BuildRequires:        sed >= 4.0
-Requires:      libebml >= 1.3.0
+Requires:      libebml >= 1.3.1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,7 +40,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.3.0
+Requires:      libebml-devel >= 1.3.1
 Requires:      libstdc++-devel
 
 %description devel
@@ -61,29 +63,24 @@ Statyczna wersja biblioteki matroska.
 
 %prep
 %setup -q
-%undos make/linux/Makefile
 %patch0 -p1
 
 %build
-%{__make} -C make/linux \
-       prefix=%{_prefix} \
-       libdir=%{_libdir} \
-       CXX="%{__cxx}" \
-       LD="%{__cxx}" \
-       DEBUGFLAGS="%{rpmcflags} %{?debug:-DDEBUG}" \
-       LDFLAGS="%{rpmldflags}" \
-       LIBEBML_INCLUDE_DIR="%{_includedir}/ebml"
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+       %{?debug:--enable-debug}
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -C make/linux install \
-       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
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,10 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-##%doc doc/src/api/*
 %attr(755,root,root) %{_libdir}/libmatroska.so
 %{_libdir}/libmatroska.la
 %{_includedir}/matroska
+%{_pkgconfigdir}/libmatroska.pc
 
 %files static
 %defattr(644,root,root,755)