- updated to 1.3.1

- removed obsolete makefile patch (upstream switched to ac/am/lt based build system)

diff --git a/libebml-makefile.patch b/libebml-makefile.patch
deleted file mode 100644 (file)
index 5c2f12f..0000000
--- a/libebml-makefile.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- 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
-+LIBTOOL = libtool
- 
- # Options
- EXTENSION=.cpp
-@@ -47,9 +48,7 @@
- LIBS=
- 
- # Names
--LIBRARY=libebml.a
--LIBRARY_SO=libebml.so
--LIBRARY_SO_VER=libebml.so.4
-+LIBRARY=libebml.la
- 
- # source-files
- sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
-@@ -57,9 +56,8 @@
- # 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 -ansi -fno-gnu-keywords -Wshadow
- COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
-@@ -80,20 +78,11 @@
-       @false
- 
- # Build rules
--%.o: %$(EXTENSION)
--      $(CXX) -c $(COMPILEFLAGS) -o $@ $<
--
- %.lo: %$(EXTENSION)
--      $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
-+      $(LIBTOOL) --mode=compile --tag=CXX $(CXX) -c $(COMPILEFLAGS) -o $@ $<
- 
- $(LIBRARY): $(objects)
--      $(AR) rcvu $@ $(objects)
--      $(RANLIB) $@
--
--$(LIBRARY_SO): $(objects_so)
--      $(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 4:0:0 -o $@ $^ $(LIBS) -rpath $(libdir)
- 
- clean:
-       rm -f $(objects) $(objects_so)
-@@ -118,27 +107,22 @@
- ifeq (Darwin,$(shell uname -s))
- install: install_staticlib install_headers
- else
--install: install_staticlib install_sharedlib install_headers
-+install: install_lib install_headers
- endif
- 
- install_headers:
--      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
-+      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
-       for i in $(INCLUDE_DIR)/*.h; do \
--              $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
-+              $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
-       done
--      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
-+      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
-       for i in $(INCLUDE_DIR)/c/*.h; do \
--              $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
-+              $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
-       done
- 
--install_staticlib: $(LIBRARY)
--      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
--      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
--
--install_sharedlib: $(LIBRARY_SO)
--      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
--      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
--      ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
-+install_lib: $(LIBRARY)
-+      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
-+      $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
- 
- 
- ifneq ($(wildcard .depend),)

diff --git a/libebml.spec b/libebml.spec
index ed7228a7acb939e42b961ce5d402d5b5f076c9fa..beac6e33d2d1d3e7f36945c80e8c3aef712e110a 100644 (file)
--- a/libebml.spec
+++ b/libebml.spec
@@ -1,16 +1,14 @@
 Summary:       Extensible Binary Meta Language access library
 Summary(pl.UTF-8):     Biblioteka dostępu rozszerzalnego metajęzyka binarnego
 Name:          libebml
-Version:       1.3.0
+Version:       1.3.1
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://dl.matroska.org/downloads/libebml/%{name}-%{version}.tar.bz2
-# Source0-md5: efec729bf5a51e649e1d9d1f61c0ae7a
-Patch0:                %{name}-makefile.patch
+# Source0-md5: 2d5a0e502fabedfded2a890c6b5513a5
 URL:           http://www.matroska.org/
 BuildRequires: libstdc++-devel
-BuildRequires: libtool
 BuildRequires: rpmbuild(macros) >= 1.553
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -51,26 +49,17 @@ Statyczna wersja biblioteki rozszerzalnego metajęzyka binarnego.
 
 %prep
 %setup -q
-%undos make/linux/Makefile
-%patch0 -p1
 
 %build
-%{__make} -C make/linux \
-       prefix=%{_prefix} \
-       libdir=%{_libdir} \
-       CXX="%{__cxx}" \
-       CXXFLAGS="%{rpmcxxflags}" \
-       LD="%{__cxx}" \
-       LDFLAGS="%{rpmldflags}"\
-       DEBUGFLAGS="%{rpmcflags} %{?debug:-DDEBUG}"
+%configure
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -C make/linux install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       prefix=%{_prefix} \
-       libdir=%{_libdir}
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -89,6 +78,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libebml.so
 %{_libdir}/libebml.la
 %{_includedir}/ebml
+%{_pkgconfigdir}/libebml.pc
 
 %files static
 %defattr(644,root,root,755)