packages: libebml/libebml-makefile.patch, libebml/libebml.spec - up to 1.0....

[glen]

Author: glen                         Date: Thu Aug  5 20:22:11 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.0.0, new soname

---- Files affected:
packages/libebml:
   libebml-makefile.patch (1.11 -> 1.12) , libebml.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: packages/libebml/libebml-makefile.patch
diff -u packages/libebml/libebml-makefile.patch:1.11 packages/libebml/libebml-makefile.patch:1.12
--- packages/libebml/libebml-makefile.patch:1.11	Thu Aug  5 22:00:18 2010
+++ packages/libebml/libebml-makefile.patch	Thu Aug  5 22:22:06 2010
@@ -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)

================================================================
Index: packages/libebml/libebml.spec
diff -u packages/libebml/libebml.spec:1.29 packages/libebml/libebml.spec:1.30
--- packages/libebml/libebml.spec:1.29	Thu Aug  5 22:00:18 2010
+++ packages/libebml/libebml.spec	Thu Aug  5 22:22:06 2010
@@ -2,16 +2,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
@@ -51,6 +52,7 @@
 
 %prep
 %setup -q
+%undos make/linux/Makefile
 %patch0 -p1
 
 %build
@@ -80,7 +82,7 @@
 %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)
@@ -98,6 +100,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2010/08/05 20:22:06  glen
+- up to 1.0.0, new soname
+
 Revision 1.29  2010/08/05 20:00:18  glen
 - merge to main make patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libebml/libebml-makefile.patch?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libebml/libebml.spec?r1=1.29&r2=1.30&f=u