- merge to main make patch

Changed files:
    libebml-makefile.patch -> 1.11
    libebml.spec -> 1.29
    libtool-tag.patch -> 1.2

diff --git a/libebml-makefile.patch b/libebml-makefile.patch
index e48c079b39cd06d77bc1d5969e59422a45d903d8..e3abe363a88865992b44f46d90a01eb14ad8237b 100644 (file)
--- a/libebml-makefile.patch
+++ b/libebml-makefile.patch
@@ -1,5 +1,5 @@
---- libebml-0.7.8/make/linux/Makefile.orig     2006-06-02 16:32:15.000000000 +0200
-+++ libebml-0.7.8/make/linux/Makefile  2008-07-13 21:37:16.422034707 +0200
+--- 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
 @@ -28,6 +28,7 @@
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
@@ -40,7 +40,7 @@
 -
  %.lo: %$(EXTENSION)
 -      $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
-+      $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<
++      $(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  
  $(LIBRARY): $(objects)
 -      $(AR) $@ $(objects)
@@ -50,7 +50,7 @@
 -      $(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 $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -rpath $(libdir)
++      $(LIBTOOL) --mode=link --tag=CC $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -rpath $(libdir)
  
  clean:
        rm -f $(objects) $(objects_so)

diff --git a/libebml.spec b/libebml.spec
index 917ca1bf9bf19c0202053eaed0983cd39d008e0e..d6e0233ab19cd21ba5ea19486372d06e347a2e19 100644 (file)
--- a/libebml.spec
+++ b/libebml.spec
@@ -8,7 +8,6 @@ Group:          Libraries
 Source0:       http://dl.matroska.org/downloads/libebml/%{name}-%{version}.tar.bz2
 # Source0-md5: 6278109f52e4f9d2c8a8dfc0d668b587
 Patch0:                %{name}-makefile.patch
-Patch1:                libtool-tag.patch
 URL:           http://www.matroska.org/
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
@@ -52,7 +51,6 @@ Statyczna wersja biblioteki rozszerzalnego metajęzyka binarnego.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__make} -C make/linux \

diff --git a/libtool-tag.patch b/libtool-tag.patch
deleted file mode 100644 (file)
index 29c4a78..0000000
--- a/libtool-tag.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libebml-0.7.8/make/linux/Makefile~ 2010-08-05 22:53:47.000000000 +0300
-+++ libebml-0.7.8/make/linux/Makefile  2010-08-05 22:54:21.405342023 +0300
-@@ -82,10 +82,10 @@
- 
- # Build rules
- %.lo: %$(EXTENSION)
--      $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<
-+      $(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(COMPILEFLAGS) -o $@ $<
- 
- $(LIBRARY): $(objects)
--      $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -rpath $(libdir)
-+      $(LIBTOOL) --mode=link --tag=CC $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -rpath $(libdir)
- 
- clean:
-       rm -f $(objects) $(objects_so)