From 366a84962b7571c1ac4a3e792ce8543930669980 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 5 Aug 2010 20:22:06 +0000 Subject: [PATCH] - up to 1.0.0, new soname Changed files: libebml-makefile.patch -> 1.12 libebml.spec -> 1.30 --- libebml-makefile.patch | 12 ++++++------ libebml.spec | 8 +++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libebml-makefile.patch b/libebml-makefile.patch index e3abe36..c3cb044 100644 --- a/libebml-makefile.patch +++ b/libebml-makefile.patch @@ -1,5 +1,5 @@ ---- libebml-0.7.8/make/linux/Makefile 2008-07-13 21:37:16.422034707 +0200 -+++ libebml-0.7.8/make/linux/Makefile 2010-08-05 22:54:21.405342023 +0300 +--- 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 @@ INSTALL_OPTS = -m 644 INSTALL_OPTS_LIB = -m 644 @@ -14,7 +14,7 @@ # Names -LIBRARY=libebml.a -LIBRARY_SO=libebml.so --LIBRARY_SO_VER=libebml.so.0 +-LIBRARY_SO_VER=libebml.so.2 +LIBRARY=libebml.la # source-files @@ -31,7 +31,7 @@ WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE) -@@ -83,20 +81,11 @@ +@@ -78,20 +78,11 @@ @false # Build rules @@ -43,14 +43,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) - rm -f $(LIBRARY_SO) - ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) -+ $(LIBTOOL) --mode=link --tag=CC $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -rpath $(libdir) ++ $(LIBTOOL) --mode=link --tag=CC $(LD) $(LDFLAGS) -version-info 2:0:0 -o $@ $^ $(LIBS) -rpath $(libdir) clean: rm -f $(objects) $(objects_so) diff --git a/libebml.spec b/libebml.spec index d6e0233..792dadc 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,16 +1,17 @@ Summary: Extensible Binary Meta Language access library Summary(pl.UTF-8): Biblioteka dostępu rozszerzalnego metajęzyka binarnego Name: libebml -Version: 0.7.8 +Version: 1.0.0 Release: 1 License: LGPL v2.1+ Group: Libraries Source0: http://dl.matroska.org/downloads/libebml/%{name}-%{version}.tar.bz2 -# Source0-md5: 6278109f52e4f9d2c8a8dfc0d668b587 +# Source0-md5: 6d438f03d8928d83a2d120ed02705f03 Patch0: %{name}-makefile.patch URL: http://www.matroska.org/ BuildRequires: libstdc++-devel BuildRequires: libtool +BuildRequires: rpmbuild(macros) >= 1.553 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -50,6 +51,7 @@ Statyczna wersja biblioteki rozszerzalnego metajęzyka binarnego. %prep %setup -q +%undos make/linux/Makefile %patch0 -p1 %build @@ -79,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libebml.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libebml.so.0 +%attr(755,root,root) %ghost %{_libdir}/libebml.so.2 %files devel %defattr(644,root,root,755) -- 2.44.0