- better makefile patch (use libtool, it takes care of using fPIC etc.)

- simplified build

Changed files:
    libebml-makefile.patch -> 1.2
    libebml.spec -> 1.2

diff --git a/libebml-makefile.patch b/libebml-makefile.patch
index 25988e9a2ce85ed601677350266ce7c22c159791..6bcd039896c1b454c21efab4f51bc6f61080372a 100644 (file)
--- a/libebml-makefile.patch
+++ b/libebml-makefile.patch
@@ -1,38 +1,71 @@
---- libebml-0.4.4/make/linux/Makefile.orig     2003-06-29 17:52:28.000000000 +0200
-+++ libebml-0.4.4/make/linux/Makefile  2003-06-29 17:53:09.000000000 +0200
-@@ -43,7 +43,7 @@
+--- libebml-0.4.4/make/linux/Makefile.orig     2003-06-13 20:54:48.000000000 +0200
++++ libebml-0.4.4/make/linux/Makefile  2003-07-08 22:00:10.000000000 +0200
+@@ -25,6 +25,7 @@
+ INSTALL_OPTS = -m 644
+ INSTALL_OPTS_LIB = -m 644
+ INSTALL_DIR_OPTS = -m 755
++LIBTOOL = libtool
+ 
+ # Options
+ EXTENSION=.cpp
+@@ -43,7 +44,7 @@
  LIBS=
  
  # Names
 -LIBRARY=libebml.a
-+LIBRARY=libebml
++LIBRARY=libebml.la
  
  # source-files
  sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
-@@ -68,10 +68,10 @@
-       $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
+@@ -54,8 +55,8 @@
+ # files holding dependency information; replace .cxx extension with .dep
+ dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources))
+ 
+-# object files; replace .cxx extension with .o
+-objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
++# object files; replace .cxx extension with .lo
++objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))
+ 
+ DEPENDFLAGS  = ${CXXFLAGS} ${INCLUDE}
+ 
+@@ -64,14 +65,12 @@
+ lib library: $(LIBRARY)
+ 
+ # Build rules
+-%.o: %$(EXTENSION)
+-      $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
++%.lo: %$(EXTENSION)
++      $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
  
  $(LIBRARY): $(objects)
 -      $(AR) $@ $(objects)
 -      $(RANLIB) $@
 -#     $(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 -#     ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}
-+      $(AR) $@.a $(objects)
-+      $(RANLIB) $@.a
-+      $(LD) $(LDFLAGS) -o $@.so $^ $(LIBS)
++      $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -rpath $(libdir)
 +
  
  clean:
        rm -f $(objects)
---- libebml-0.4.4/make/linux/Makefile~ 2003-06-29 18:18:36.000000000 +0200
-+++ libebml-0.4.4/make/linux/Makefile  2003-06-29 18:20:03.000000000 +0200
-@@ -85,7 +85,8 @@
+@@ -84,15 +83,15 @@
+       $(DEPEND) $(DEPENDFLAGS) $(sources)
  
  install: $(LIBRARY)
-       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
+-      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
 -      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
-+      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY).so $(libdir)
-+      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY).a $(libdir)
-       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
+-      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
++      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
++      $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
++      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
        for i in $(SRC_DIR)/*.h; do \
-               $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
+-              $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
++              $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
+       done
+-      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/api/c
++      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/api/c
+       for i in $(SRC_DIR)/api/c/*.h; do \
+-              $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/api/c ; \
++              $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/api/c ; \
+       done
+ 
+ # DO NOT DELETE

diff --git a/libebml.spec b/libebml.spec
index 6494171f3a9c7fc25f828537a23f337d053c8995..b2fef4990e7b15cf4a5d4e754e71dddf2397d252 100644 (file)
--- a/libebml.spec
+++ b/libebml.spec
@@ -3,86 +3,69 @@ Summary(pl):  Biblioteka dost
 Name:          libebml
 Version:       0.4.4
 Release:       1
-License:       GPL/QPL
+License:       GPL v2 or QPL
 Group:         Libraries
 Source0:       http://matroska.free.fr/downloads/libebml/%{name}-%{version}.tar.bz2
 # Source0-md5: 0b0cea70bbe04ecdbb3a0e2a603515b8
 Patch0:                %{name}-makefile.patch
 URL:           http://www.matroska.org/
+BuildRequires: libstdc++-devel
+BuildRequires: libtool
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Extensible Binary Meta Language access library
-A library for reading and writing files with the Extensible Binary
-Meta Language, a binary pendant to XML.
+Extensible Binary Meta Language access library is a library for
+reading and writing files with the Extensible Binary Meta Language, a
+binary pendant to XML.
    
 %description -l pl
-Biblioteki rozszerzalnego metajêzyka binarnego umo¿liwiaj±ce czytanie
-i zapisywanie plików w tym metajêzyku, dzia³aj±ca w oparciu o xml.
+Biblioteka rozszerzalnego metajêzyka binarnego (Extensible Binary Meta
+Language, w skrócie EBML) umo¿liwia czytanie i zapisywanie plików w
+tym metajêzyku, bêd±cym binarnym uzupe³nieniem XML.
 
 %package devel
-Summary:       Developmment files and headers for Extensible Binary Meta Language.
-Summary(pl):   Nag³ówki dla rozszerzalnego metajêzyka binarnego.
+Summary:       Header files for Extensible Binary Meta Language library
+Summary(pl):   Nag³ówki biblioteki rozszerzalnego metajêzyka binarnego
 Group:         Development/Libraries
-Requires:       %{name} >= %{version}
+Requires:      %{name} = %{version}
+Requires:      libstdc++-devel
 
 %description devel
-Developmment files and headers for Extensible Binary Meta Language.
+Header files for Extensible Binary Meta Language library.
 
 %description devel -l pl
-Nag³ówki dla rozszerzalnego metajêzyka binarnego.
+Nag³ówki biblioteki rozszerzalnego metajêzyka binarnego.
 
 %package static
-Summary:        Static libraries for Extensible Binary Meta Language.
-Summary(pl):           Biblioteki statyczne dla rozszerzalnego metajêzyka binarnego.
-Group:          Libraries
+Summary:       Static version of Extensible Binary Meta Language library
+Summary(pl):   Statyczna wersja biblioteki rozszerzalnego metajêzyka binarnego
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}
 
 %description static
-Static libraries for Extensible Binary Meta Language.
+Static version of Extensible Binary Meta Language library.
 
 %description static -l pl
-Biblioteki statyczne dla rozszerzalnego metajêzyka binarnego.
+Statyczna wersja biblioteki rozszerzalnego metajêzyka binarnego.
 
 %prep
 %setup -q 
 %patch0 -p1
 
 %build
-cd make/linux
-%{__make} clean
-%{__make} \
+%{__make} -C make/linux \
        prefix=%{_prefix} \
-       CXX=%{__cxx} \
-       LD=%{__cxx} \
-       AR="%{__ar} rcvu"  \
-       RANLIB=%{__ranlib} \
-       INSTALL=%{__install} \
-       %{?debug:DEBUG=yes} \
-       INSTALL_OPTS="" \
-       INSTALL_OPTS_LIB="" \
-       INSTALL_DIR_OPTS="" \
-       LDFLAGS="-shared"\
-       CXXFLAGS="%{rpmcflags}"  \
-       SRC_DIR=%{_builddir}/%{name}-%{version}/src/
+       CXX="%{__cxx}" \
+       LD="%{__cxx}" \
+       LDFLAGS="%{rpmldflags}"\
+       DEBUGFLAGS="%{rpmcflags} %{?debug:-DDEBUG}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT
-
-%{__make} -f make/linux/Makefile install \
-       prefix=$RPM_BUILD_ROOT%{_prefix} \
-       CXX=%{__cxx} \
-       LD=%{__cxx} \
-       AR="%{__ar} rcvu"  \
-       RANLIB=%{__ranlib} \
-       INSTALL=%{__install} \
-       %{?debug:DEBUG=yes} \
-       INSTALL_OPTS="" \
-       INSTALL_OPTS_LIB="" \
-       INSTALL_DIR_OPTS="" \
-       SRC_DIR=%{_builddir}/%{name}-%{version}/src/\
-       LDFLAGS="-shared" \
-        CXXFLAGS="%{rpmcflags}"
+
+%{__make} -C make/linux install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       prefix=%{_prefix}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -92,10 +75,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files 
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libebml.so
+%attr(755,root,root) %{_libdir}/libebml.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
+%doc src/api/index.html
+%attr(755,root,root) %{_libdir}/libebml.so
+%{_libdir}/libebml.la
 %{_includedir}/ebml
 
 %files static