Hello community, here is the log from the commit of package libebml for openSUSE:Factory checked in at 2013-05-27 09:51:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libebml (Old) and /work/SRC/openSUSE:Factory/.libebml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libebml" Changes: -------- --- /work/SRC/openSUSE:Factory/libebml/libebml.changes 2013-04-02 12:12:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libebml.new/libebml.changes 2013-05-27 09:51:52.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 21 13:40:34 UTC 2013 - [email protected] + +- Add libebml-1.3.0-6efcb74d1e.patch +- Simplify make calls + +------------------------------------------------------------------- New: ---- libebml-1.3.0-6efcb74d1e.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libebml.spec ++++++ --- /var/tmp/diff_new_pack.xaUhxb/_old 2013-05-27 09:51:52.000000000 +0200 +++ /var/tmp/diff_new_pack.xaUhxb/_new 2013-05-27 09:51:52.000000000 +0200 @@ -26,6 +26,8 @@ Group: Development/Libraries/Other Url: http://www.matroska.org/ Source: http://dl.matroska.org/downloads/libebml/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM libebml-1.3.0-6efcb74d1e.patch https://github.com/Matroska-Org/libebml/pull/1 [email protected] -- Add packaging updates from upstream +Patch0: libebml-1.3.0-6efcb74d1e.patch BuildRequires: gcc-c++ %description @@ -53,15 +55,15 @@ %prep %setup -q +%patch0 -p1 %build cd make/linux -sed -i -e 's|-ansi -fno-gnu-keywords||g' Makefile -%{__make} %{?_smp_mflags} CXXFLAGS="${CXXFLAGS:-%optflags -D_GNU_SOURCE}" sharedlib +make %{?_smp_mflags} link=shared CXXFLAGS="${CXXFLAGS:-%optflags}" %install cd make/linux -%{__make} libdir=%{buildroot}%{_libdir} includedir=%{buildroot}%{_includedir}/ebml install_sharedlib install_headers +%make_install link=shared prefix=%{_prefix} libdir=%{_libdir} %post -n libebml%{soname} -p /sbin/ldconfig ++++++ libebml-1.3.0-6efcb74d1e.patch ++++++ diff --git a/make/linux/Makefile b/make/linux/Makefile index 391b6e3..6b3bae1 100644 --- a/make/linux/Makefile +++ b/make/linux/Makefile @@ -37,6 +37,16 @@ ifeq (yes,$(DEBUG)) DEBUGFLAGS=-g -DDEBUG endif +ifeq (Darwin,$(shell uname -s)) +link=static +else +link=both +endif + +targets_both = staticlib sharedlib +targets_shared = sharedlib +targets_static = staticlib + CWD=$(shell pwd) SRC_DIR=$(CWD)/../../src/ @@ -61,15 +71,11 @@ headers:=$(patsubst %$(EXTENSION),%.h,$(sources)) objects:=$(patsubst %$(EXTENSION),%.o,$(sources)) objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources)) -WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow +WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -Wshadow COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE) DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE) -ifeq (Darwin,$(shell uname -s)) -all: staticlib -else -all: staticlib sharedlib -endif +all: $(targets_$(link)) staticlib: $(LIBRARY) @@ -115,30 +121,26 @@ depend: $(CXX) $(DEPENDFLAGS) -MM -MT $$o $$i >> .depend ; \ done -ifeq (Darwin,$(shell uname -s)) -install: install_staticlib install_headers -else -install: install_staticlib install_sharedlib install_headers -endif +install: $(targets_$(link):%=install_%) install_headers 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) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) + $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(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) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) + $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir) + ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO) ifneq ($(wildcard .depend),) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
