Kolab Groupware OBS

Changes of Revision 14

_service:set_version:libkolab.spec Changed

@@ -41,13 +41,7 @@
 Source0:        http://git.kolab.org/%{name}/snapshot/libkolab-%{version}.tar.gz
 
 BuildRequires:  cmake
-%if 0%{?rhel} > 7 || 0%{?fedora} > 21
 BuildRequires:  kdepimlibs-devel >= 4.11
-%else
-# Note: available within kolabsys.com infrastructure only, as being (essentially) a
-# fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6.
-BuildRequires:  libcalendaring-devel >= 4.9.1
-%endif
 BuildRequires:  libcurl-devel
 BuildRequires:  libkolabxml-devel >= 1.0
 BuildRequires:  php >= 5.3
@@ -70,12 +64,9 @@
 %endif
 Summary:        Kolab library development headers
 Requires:       libkolab%{?_isa} = %{version}
-%if 0%{?rhel} > 7 || 0%{?fedora} > 21
-BuildRequires:  kdepimlibs-devel >= 4.11
-%else
-# Note: available within kolabsys.com infrastructure only, as being (essentially) a
-# fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6.
-BuildRequires:  libcalendaring-devel >= 4.9.1
+%if 0%{?fedora} >= 21
+# Fedora 21 has qca2 and qca, qca2 has been renamed to qca
+BuildRequires: qca
 %endif
 Requires:       libkolabxml-devel >= 1.0
 Requires:       php-devel
@@ -153,7 +144,7 @@
     -DBoost_NO_BOOST_CMAKE=TRUE \
     -Wno-fatal-errors -Wno-errors \
     -DINCLUDE_INSTALL_DIR=%{_includedir} \
-%if 0%{?rhel} < 8 && 0%{?fedora} < 22
+%if 0%{?rhel} < 8 && 0%{?fedora} < 20
     -DUSE_LIBCALENDARING=ON \
 %endif
     -DPHP_BINDINGS=ON \

libkolab.spec Changed

@@ -41,13 +41,7 @@
 Source0:        http://git.kolab.org/%{name}/snapshot/libkolab-%{version}.tar.gz
 
 BuildRequires:  cmake
-%if 0%{?rhel} > 7 || 0%{?fedora} >= 20
 BuildRequires:  kdepimlibs-devel >= 4.11
-%else
-# Note: available within kolabsys.com infrastructure only, as being (essentially) a
-# fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6.
-BuildRequires:  libcalendaring-devel >= 4.9.1
-%endif
 BuildRequires:  libcurl-devel
 BuildRequires:  libkolabxml-devel >= 1.0
 BuildRequires:  php >= 5.3
@@ -70,17 +64,10 @@
 %endif
 Summary:        Kolab library development headers
 Requires:       libkolab%{?_isa} = %{version}
-%if 0%{?rhel} > 7 || 0%{?fedora} >= 20
-BuildRequires:  kdepimlibs-devel >= 4.11
 %if 0%{?fedora} >= 21
 # Fedora 21 has qca2 and qca, qca2 has been renamed to qca
 BuildRequires: qca
 %endif
-%else
-# Note: available within kolabsys.com infrastructure only, as being (essentially) a
-# fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6.
-BuildRequires:  libcalendaring-devel >= 4.9.1
-%endif
 Requires:       libkolabxml-devel >= 1.0
 Requires:       php-devel
 Requires:       pkgconfig