Hello community, here is the log from the commit of package libcompizconfig for openSUSE:Factory checked in at 2018-05-29 10:28:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcompizconfig (Old) and /work/SRC/openSUSE:Factory/.libcompizconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcompizconfig" Tue May 29 10:28:07 2018 rev:7 rq:607452 version:0.8.14 Changes: -------- --- /work/SRC/openSUSE:Factory/libcompizconfig/libcompizconfig.changes 2017-05-16 14:33:56.725628053 +0200 +++ /work/SRC/openSUSE:Factory/.libcompizconfig.new/libcompizconfig.changes 2018-05-29 10:28:15.369410072 +0200 @@ -1,0 +2,6 @@ +Tue May 15 10:49:46 UTC 2018 - [email protected] + +- Add libcompizconfig-0.8.14-fix-protobuf.patch: Fix protobuf + support. + +------------------------------------------------------------------- New: ---- libcompizconfig-0.8.14-fix-protobuf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcompizconfig.spec ++++++ --- /var/tmp/diff_new_pack.IlUQBO/_old 2018-05-29 10:28:16.245377708 +0200 +++ /var/tmp/diff_new_pack.IlUQBO/_new 2018-05-29 10:28:16.249377561 +0200 @@ -1,7 +1,7 @@ # # spec file for package libcompizconfig # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,14 +21,17 @@ Version: 0.8.14 Release: 0 Summary: CompizConfig plugin required for CCSM -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Libraries -Url: https://github.com/compiz-reloaded/libcompizconfig +URL: https://github.com/compiz-reloaded/libcompizconfig Source: https://github.com/compiz-reloaded/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE libcompizconfig-config-dir.patch boo#438081 [email protected] Patch0: %{name}-config-dir.patch +# PATCH-FIX-UPSTREAM libcompizconfig-0.8.14-fix-protobuf.patch [email protected] -- Fix protobuf support. +Patch1: %{name}-0.8.14-fix-protobuf.patch BuildRequires: autoconf BuildRequires: automake +BuildRequires: gcc-c++ BuildRequires: intltool BuildRequires: libtool BuildRequires: pkgconfig @@ -60,6 +63,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build NOCONFIGURE=1 ./autogen.sh @@ -76,7 +80,12 @@ %postun -p /sbin/ldconfig %files -%defattr(-,root,root) +%if 0%{?suse_version} >= 1500 +%license COPYING LICENSE* +%else +%doc COPYING LICENSE* +%endif +%doc NEWS README.md %dir %{_sysconfdir}/compizconfig/ %config %{_sysconfdir}/compizconfig/config %{_libdir}/%{name}.so.%{sover}* @@ -86,7 +95,6 @@ %{_datadir}/compiz/*ccp.* %files devel -%defattr(-,root,root) %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/compizconfig/ %{_libdir}/%{name}.so ++++++ libcompizconfig-0.8.14-fix-protobuf.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -91,19 +91,13 @@ AC_ARG_ENABLE(protobuf, [use_protobuf=$enableval], [use_protobuf=yes]) if test "x$use_protobuf" = "xyes"; then - protobuf_error_msg="\nWARNING: You need to install Protocol Buffers to get faster program startup.\n Sources are available at http://code.google.com/p/protobuf/downloads/list\n Package names for Ubuntu/Debian: libprotobuf0, libprotobuf-dev, protobuf-compiler\n Package names for other distributions: protobuf, protobuf-devel\n Disabling protobuf.\n" + protobuf_error_msg="\nWARNING: You need to install Protocol Buffers to get faster program startup.\n Sources are available at https://developers.google.com/protocol-buffers\n Package names for Debian/Ubuntu: libprotobuf0, libprotobuf-dev, protobuf-compiler\n Package names for other distributions: protobuf, protobuf-devel\n Disabling protobuf.\n" AC_CHECK_PROG(have_protoc, protoc, yes, no) if test "x$have_protoc" = "xno"; then echo -e $protobuf_error_msg; use_protobuf=no else - AC_CHECK_LIB(protobuf, _ZN6google8protobuf7MessageD2Ev, [], [ - echo -e $protobuf_error_msg; use_protobuf=no ], -lpthread) - if test "x$use_protobuf" = "xyes"; then - AC_LANG([C++]) - AC_CHECK_HEADER([google/protobuf/message.h],,[ - echo -e $protobuf_error_msg; use_protobuf=no ]) - AC_LANG([C]) - fi + PKG_CHECK_MODULES(PROTOBUF, "protobuf", [], [ + echo -e $protobuf_error_msg; use_protobuf=no ]) fi fi AM_CONDITIONAL([USE_PROTOBUF], [test "x$use_protobuf" = "xyes"]) --- a/src/Makefile.am +++ b/src/Makefile.am @@ -53,7 +53,7 @@ libcompizconfig_la_SOURCES = \ ccs-private.h \ iniparser.h -libcompizconfig_la_LIBADD = @LIBXML2_LIBS@ @LIBX11_LIBS@ $(PROTOBUF_LIB) +libcompizconfig_la_LIBADD = @LIBXML2_LIBS@ @LIBX11_LIBS@ @PROTOBUF_LIBS@ lib_LTLIBRARIES=libcompizconfig.la
