From 7b2dcb4f326d33c3240ddcdc3659031ab46861214443c0f39118dde0d2eb2594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 9 Sep 2016 09:19:59 +0000 Subject: [PATCH 1/3] Accepting request 426098 from GNOME:Next 1 OBS-URL: https://build.opensuse.org/request/show/426098 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libical?expand=0&rev=39 --- libical.changes | 6 ++++++ libical.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/libical.changes b/libical.changes index ac13626..d895607 100644 --- a/libical.changes +++ b/libical.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 9 07:36:22 UTC 2016 - zaitor@opensuse.org + +- Add pkgconfig(icu-i18n) BuildRequires: Build the new RSCALE + support. + ------------------------------------------------------------------- Thu Jul 21 07:42:45 UTC 2016 - dimstar@opensuse.org diff --git a/libical.spec b/libical.spec index e09d225..377e001 100644 --- a/libical.spec +++ b/libical.spec @@ -29,6 +29,7 @@ Source2: baselibs.conf BuildRequires: cmake >= 2.4 BuildRequires: gcc-c++ BuildRequires: pkg-config +BuildRequires: pkgconfig(icu-i18n) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description From 13a315df744e359dd832517155245870d0da80d093fe8bd947ec89c73752f7a8 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Fri, 30 Sep 2016 10:00:49 +0000 Subject: [PATCH 2/3] Accepting request 431275 from home:jengelh:branches:devel:libraries:c_c++ - Fix wrong baselibs provides OBS-URL: https://build.opensuse.org/request/show/431275 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libical?expand=0&rev=40 --- baselibs.conf | 4 +--- libical.changes | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 3690429..02ab568 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,5 +1,3 @@ libical2 obsoletes "libical- <= " - provides "libical- = " - - + provides "libical2- = " diff --git a/libical.changes b/libical.changes index d895607..20ecb9a 100644 --- a/libical.changes +++ b/libical.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 29 14:06:35 UTC 2016 - jengelh@inai.de + +- Fix wrong baselibs provides + ------------------------------------------------------------------- Fri Sep 9 07:36:22 UTC 2016 - zaitor@opensuse.org From 1688dfea79758004e9990058022bf15547cd4cda92a41a31697d6c1a43aaab00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 6 Oct 2016 16:50:22 +0000 Subject: [PATCH 3/3] Accepting request 432854 from home:jengelh:branches:devel:libraries:c_c++ - Add 0001-build-ICU-must-appear-as-Requires-in-pkgconfig.patch OBS-URL: https://build.opensuse.org/request/show/432854 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libical?expand=0&rev=41 --- ...must-appear-as-Requires-in-pkgconfig.patch | 43 +++++++++++++++++++ libical.changes | 5 +++ libical.spec | 4 ++ 3 files changed, 52 insertions(+) create mode 100644 0001-build-ICU-must-appear-as-Requires-in-pkgconfig.patch diff --git a/0001-build-ICU-must-appear-as-Requires-in-pkgconfig.patch b/0001-build-ICU-must-appear-as-Requires-in-pkgconfig.patch new file mode 100644 index 0000000..4a4f9f8 --- /dev/null +++ b/0001-build-ICU-must-appear-as-Requires-in-pkgconfig.patch @@ -0,0 +1,43 @@ +From 101a29ef57341a786012eb07dcfcec5c597f4493 Mon Sep 17 00:00:00 2001 +X-Backport: Rediff for 2.0.0 +From: Jan Engelhardt +Date: Mon, 3 Oct 2016 10:25:00 +0200 +Subject: [PATCH] build: ICU must appear as Requires in pkgconfig +References: https://github.com/libical/libical/pull/244 + +libical.pc specifies -licu-i18n in its Libs: field, +but no Requires: icu-i18n. As a result, the automatic dependency +generator in Linux distributions won't see the ICU requirement, +won't install it, and builds of secondary software fails. + +$ gcc icalthing.c `pkg-config libical --cflags --libs` +[...] +gcc: error: /usr/lib64/libicuuc.so: No such file or directory + +Move ICU from Libs to Requires, so the dependency scanner can do its +job. Specifically move it to Requires.private, since specifying -licu* +is not normally needed when libical is a shared library since it +already has it recorded in the ELF. +--- + libical.pc.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +Index: libical-2.0.0/libical.pc.in +=================================================================== +--- libical-2.0.0.orig/libical.pc.in ++++ libical-2.0.0/libical.pc.in +@@ -2,11 +2,11 @@ prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ +-threadslib=@PTHREAD_LIBS@ +-iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@ + + Name: libical + Description: An implementation of basic iCAL protocols + Version: @VERSION@ +-Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib} ++Libs: -L${libdir} -lical -licalss -licalvcal ++Libs.private: @PTHREAD_LIBS@ ++Requires.private: icu-i18n + Cflags: -I${includedir} diff --git a/libical.changes b/libical.changes index 20ecb9a..21987e2 100644 --- a/libical.changes +++ b/libical.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 3 08:38:07 UTC 2016 - jengelh@inai.de + +- Add 0001-build-ICU-must-appear-as-Requires-in-pkgconfig.patch + ------------------------------------------------------------------- Thu Sep 29 14:06:35 UTC 2016 - jengelh@inai.de diff --git a/libical.spec b/libical.spec index 377e001..29db2fc 100644 --- a/libical.spec +++ b/libical.spec @@ -24,8 +24,11 @@ Summary: An Implementation of Basic iCAL Protocols License: MPL-1.0 or LGPL-2.1 Group: Development/Libraries/C and C++ Url: http://sourceforge.net/projects/freeassociation/ + +#Git-Clone: https://github.com/libical/libical Source: https://github.com/libical/libical/releases/download/v%{version}/%{name}-%{version}.tar.gz Source2: baselibs.conf +Patch1: 0001-build-ICU-must-appear-as-Requires-in-pkgconfig.patch BuildRequires: cmake >= 2.4 BuildRequires: gcc-c++ BuildRequires: pkg-config @@ -87,6 +90,7 @@ component properties, parameters, and subcomponents. %prep %setup -q +%patch -P 1 -p1 %build %cmake