Hello community, here is the log from the commit of package belcard for openSUSE:Factory checked in at 2017-07-03 09:36:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/belcard (Old) and /work/SRC/openSUSE:Factory/.belcard.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "belcard" Mon Jul 3 09:36:34 2017 rev:2 rq:507668 version:1.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/belcard/belcard.changes 2017-06-04 01:59:51.679926715 +0200 +++ /work/SRC/openSUSE:Factory/.belcard.new/belcard.changes 2017-07-03 09:36:45.444488292 +0200 @@ -1,0 +2,8 @@ +Sun Jul 2 14:21:11 UTC 2017 - [email protected] + +- Add belcard-1.0.1-fix-includedir.patch: Fix includedir + (from commit a515fda). +- Improve belcard-fix-pkgconfig.patch and remove extra dependencies + from belcard-devel. + +------------------------------------------------------------------- New: ---- belcard-1.0.1-fix-includedir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ belcard.spec ++++++ --- /var/tmp/diff_new_pack.ThGXGg/_old 2017-07-03 09:36:47.596184802 +0200 +++ /var/tmp/diff_new_pack.ThGXGg/_new 2017-07-03 09:36:47.600184238 +0200 @@ -1,5 +1,5 @@ # -# spec file for package belle-sip +# spec file for package belcard # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -29,6 +29,8 @@ Source1: baselibs.conf # PATCH-FIX-OPENSUSE belcard-fix-pkgconfig.patch [email protected] -- Install belcard.pc. Patch0: belcard-fix-pkgconfig.patch +# PATCH-FIX-UPSTREAM belcard-1.0.1-fix-includedir.patch -- Fix includedir (from commit a515fda). +Patch1: belcard-1.0.1-fix-includedir.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -49,8 +51,6 @@ Summary: Headers and libraries for the belcard library Group: Development/Libraries/C and C++ Requires: %{soname}%{sover} = %{version} -Requires: pkgconfig(bctoolbox) -Requires: pkgconfig(belr) %description devel Belcard is a C++ library to manipulate the vCard standard format files. @@ -61,6 +61,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %cmake \ ++++++ belcard-1.0.1-fix-includedir.patch ++++++ --- a/cmake/BelcardConfig.cmake.in +++ b/cmake/BelcardConfig.cmake.in @@ -41,7 +41,7 @@ get_filename_component(BELCARD_CMAKE_DIR if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS) set(BELCARD_INCLUDE_DIRS "${EP_belcard_INCLUDE_DIR}") else() - set(BELCARD_INCLUDE_DIRS "${BELCARD_CMAKE_DIR}/../../../include") + set(BELCARD_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@") endif() if(@ENABLE_SHARED@) ++++++ belcard-fix-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.ThGXGg/_old 2017-07-03 09:36:47.648177469 +0200 +++ /var/tmp/diff_new_pack.ThGXGg/_new 2017-07-03 09:36:47.648177469 +0200 @@ -1,10 +1,20 @@ +--- a/belcard.pc.in ++++ b/belcard.pc.in +@@ -5,5 +5,5 @@ Name: @PROJECT_NAME@ + Description: Belcard is Belledonne Communications' vCard 4 parsing library + Version: @PROJECT_VERSION@ + Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lbelcard +-Libs.private: @LIBS_PRIVATE@ ++Requires.private: @PACKAGES_PRIVATE@ + Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -94,6 +94,11 @@ configure_file(${CMAKE_CURRENT_SOURCE_DI +@@ -94,6 +94,12 @@ configure_file(${CMAKE_CURRENT_SOURCE_DI set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/config.h PROPERTIES GENERATED ON) add_definitions("-DHAVE_CONFIG_H") + ++set(PACKAGES_PRIVATE "belr bctoolbox") +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/belcard.pc.in ${CMAKE_CURRENT_BINARY_DIR}/belcard.pc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/belcard.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +
