SHA256
1
0
forked from pool/libical

- Fix multibuild building. For baselibs.conf and _multibuild to

work correctly, we need to define all possible %package in the
  spec file irrespective of the "flavor". Packages are not generated
  if they do not have a %files section

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libical?expand=0&rev=64
This commit is contained in:
Adam Majer 2019-10-30 11:53:50 +00:00 committed by Git OBS Bridge
parent c60715fe87
commit a06af81c77
2 changed files with 33 additions and 29 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Oct 30 11:49:14 UTC 2019 - Adam Majer <adam.majer@suse.de>
- Fix multibuild building. For baselibs.conf and _multibuild to
work correctly, we need to define all possible %package in the
spec file irrespective of the "flavor". Packages are not generated
if they do not have a %files section
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 30 02:37:57 UTC 2019 - Yifan Jiang <yfjiang@suse.com> Wed Oct 30 02:37:57 UTC 2019 - Yifan Jiang <yfjiang@suse.com>

View File

@ -53,90 +53,87 @@ BuildRequires: pkgconfig(icu-i18n)
%if %{with glib} %if %{with glib}
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: vala BuildRequires: vala
BuildRequires: pkgconfig(libical)
BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(libical)
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
%endif %endif
%if %{without glib} %if %{without glib}
%description %description -n libical
Libical is an implementation of the IETF's iCalendar Libical is an implementation of the IETF's iCalendar
calendaring and scheduling protocols (RFC 2445, 2446, and 2447). It calendaring and scheduling protocols (RFC 2445, 2446, and 2447). It
parses iCal components and provides a C API for manipulating the parses iCal components and provides a C API for manipulating the
component properties, parameters, and subcomponents. component properties, parameters, and subcomponents.
%else %else
%description %description -n libical-glib
This package provides a GObject wrapper for libical library with support This package provides a GObject wrapper for libical library with support
for GObject Introspection. for GObject Introspection.
%endif %endif
%if %{without glib} %package -n libical%{sonum}
%package -n %{name}%{sonum}
Summary: An Implementation of Basic iCAL Protocols Summary: An Implementation of Basic iCAL Protocols
Group: System/Libraries Group: System/Libraries
Provides: %{name} = %{version} Provides: libical = %{version}
Obsoletes: %{name} < %{version} Obsoletes: libical < %{version}
%description -n %{name}%{sonum} %description -n libical%{sonum}
Libical is an implementation of the IETF's iCalendar Libical is an implementation of the IETF's iCalendar
calendaring and scheduling protocols (RFC 2445, 2446, and 2447). It calendaring and scheduling protocols (RFC 2445, 2446, and 2447). It
parses iCal components and provides a C API for manipulating the parses iCal components and provides a C API for manipulating the
component properties, parameters, and subcomponents. component properties, parameters, and subcomponents.
%package devel %package -n libical-devel
Summary: Development files for libical, an implementation of basic iCAL protocols Summary: Development files for libical, an implementation of basic iCAL protocols
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name}%{sonum} = %{version} Requires: libical%{sonum} = %{version}
# Typelib should be required, but might create a build cycle # Typelib should be required, but might create a build cycle
# Requires: typelib-1_0-libical%{sonum} = %%{version} # Requires: typelib-1_0-libical%%{sonum} = %%{version}
%description devel %description -n libical-devel
Libical is an implementation of the IETF's iCalendar Libical is an implementation of the IETF's iCalendar
Calendaring and Scheduling protocols. (RFC 2445, 2446, and 2447). It Calendaring and Scheduling protocols. (RFC 2445, 2446, and 2447). It
parses iCal components and provides a C API for manipulating the parses iCal components and provides a C API for manipulating the
component properties, parameters, and subcomponents. component properties, parameters, and subcomponents.
%package doc %package -n libical-doc
Summary: Example source code for programs to use libical Summary: Example source code for programs to use libical
Group: Documentation/Other Group: Documentation/Other
BuildArch: noarch BuildArch: noarch
%description doc %description -n libical-doc
Libical is an implementation of the IETF's iCalendar Libical is an implementation of the IETF's iCalendar
calendaring and scheduling protocols (RFC 2445, 2446, and 2447). It calendaring and scheduling protocols (RFC 2445, 2446, and 2447). It
parses iCal components and provides a C API for manipulating the parses iCal components and provides a C API for manipulating the
component properties, parameters, and subcomponents. component properties, parameters, and subcomponents.
%else %package -n libical-glib%{sonum}
%package -n %{name}%{sonum}
Summary: GObject wrapper for libical library Summary: GObject wrapper for libical library
Group: System/Libraries Group: System/Libraries
Provides: %{name} = %{version} Provides: libical-glib = %{version}
Obsoletes: %{name} < %{version} Obsoletes: libical-glib < %{version}
%description -n %{name}%{sonum} %description -n libical-glib%{sonum}
This package provides a GObject wrapper for libical library with support This package provides a GObject wrapper for libical library with support
for GObject Introspection. for GObject Introspection.
%package devel %package -n libical-glib-devel
Summary: Development files for building against %{name} Summary: Development files for building against libical-glib
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name} = %{version} Requires: libical-glib%{sonum} = %{version}
Requires: libical%{sonum} = %{version}
Requires: typelib-1_0-ICal-3_0 = %{version} Requires: typelib-1_0-ICal-3_0 = %{version}
Requires: typelib-1_0-ICalGLib-3_0 = %{version} Requires: typelib-1_0-ICalGLib-3_0 = %{version}
%description devel %description -n libical-glib-devel
Development files for building against %{name}%{sonum} Development files for building against libical-glib%{sonum}
%package doc %package -n libical-glib-doc
Summary: Documentation files for %{name}%{sonum} Summary: Documentation files for libical-glib%{sonum}
Group: Documentation/Other Group: Documentation/Other
BuildArch: noarch BuildArch: noarch
%description doc %description -n libical-glib-doc
Documentation files for %{name}%{sonum} Documentation files for %{name}%{sonum}
%package -n typelib-1_0-ICal-3_0 %package -n typelib-1_0-ICal-3_0
@ -152,7 +149,6 @@ Group: Development/Libraries/C and C++
%description -n typelib-1_0-ICalGLib-3_0 %description -n typelib-1_0-ICalGLib-3_0
This package provides the gobject-introspection bindings for libical-glib. This package provides the gobject-introspection bindings for libical-glib.
%endif
%prep %prep
%autosetup -p1 -n libical-%{version} %autosetup -p1 -n libical-%{version}