Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / libzypp.spec.cmake

diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake
index a190eec..62fddb6 100644 (file)
--- a/libzypp.spec.cmake
+++ b/libzypp.spec.cmake
@@ -35,8 +35,8 @@ Obsoletes:      yast2-packagemanager
 Provides:       libzypp(plugin) = 0
 Provides:       libzypp(plugin:appdata) = 0
 Provides:       libzypp(plugin:commit) = 1
-Provides:       libzypp(plugin:services) = 0
-Provides:       libzypp(plugin:system) = 0
+Provides:       libzypp(plugin:services) = 1
+Provides:       libzypp(plugin:system) = 1
 Provides:       libzypp(plugin:urlresolver) = 0
 Provides:       libzypp(repovarexpand) = 0
 
@@ -76,7 +76,7 @@ BuildRequires:  pkgconfig
 BuildRequires:  pkg-config
 %endif
 
-BuildRequires:  libsolv-devel >= 0.6.7
+BuildRequires:  libsolv-devel >= 0.6.19
 %if 0%{?suse_version} >= 1100
 BuildRequires:  libsolv-tools
 %requires_eq    libsolv-tools
@@ -196,13 +196,17 @@ export CXX=g++-4.6
 %endif
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
-unset EXTRA_CMAKE_OPTIONS
-# We are moving towards a uniform translation set for SLE and openSUSE.
-# While separate SLE translations are still present, overlay them.
 unset TRANSLATION_SET
-if [ -f ../po/sle-zypp-po.tar.bz2 ]; then
+unset EXTRA_CMAKE_OPTIONS
+# Same codebase, but SLES may use it's own translation set.
+#     suse_version
+#      1110            SLES11
+#      1315            SLES12
+%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1315
+if [ -f ../po/sle-zypp-po.tar.bz ]; then
   export TRANSLATION_SET=sle-zypp
 fi
+%endif
 # No libproxy on SLE11
 %if 0%{?suse_version} == 1110
 export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON"
@@ -240,9 +244,9 @@ ln -s %{_sysconfdir}/yum.repos.d $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d
 %endif
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/services.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/systemCheck.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/vendors.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/multiversion.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/credentials.d
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypp/plugins/appdata
@@ -337,9 +341,9 @@ rm -rf "$RPM_BUILD_ROOT"
 %dir               %{_sysconfdir}/zypp/repos.d
 %endif
 %dir               %{_sysconfdir}/zypp/services.d
-%dir               %{_sysconfdir}/zypp/systemCheck.d
 %dir               %{_sysconfdir}/zypp/vendors.d
 %dir               %{_sysconfdir}/zypp/multiversion.d
+%dir               %{_sysconfdir}/zypp/credentials.d
 %config(noreplace) %{_sysconfdir}/zypp/zypp.conf
 %config(noreplace) %{_sysconfdir}/zypp/systemCheck
 %config(noreplace) %{_sysconfdir}/logrotate.d/zypp-history.lr