X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libzypp.spec.cmake;h=ebd430d761f47cb5ccae08205698a06be2f4299e;hb=42b5d038414cf4a4a050e816b471f890b24e8032;hp=1fee7d122d73b71c8947bf32f79b41c544336499;hpb=b61a0ff7e76a542a874714e4ee7753db48f9f8aa;p=platform%2Fupstream%2Flibzypp.git

diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake
index 1fee7d1..ebd430d 100644
--- a/libzypp.spec.cmake
+++ b/libzypp.spec.cmake
@@ -32,7 +32,7 @@ Provides:       yast2-packagemanager
 Obsoletes:      yast2-packagemanager
 
 # Features we provide (update doc/autoinclude/FeatureTest.doc):
-Provides:       libzypp(plugin) = 0.1
+Provides:       libzypp(plugin) = 0
 Provides:       libzypp(plugin:appdata) = 0
 Provides:       libzypp(plugin:commit) = 1
 Provides:       libzypp(plugin:services) = 1
@@ -48,7 +48,7 @@ Recommends:     lsof
 BuildRequires:  cmake
 BuildRequires:  openssl-devel
 %if 0%{?suse_version} >= 1130 || 0%{?fedora_version} >= 16
-BuildRequires:  libudev-devel
+BuildRequires:  pkgconfig(libudev)
 %else
 BuildRequires:  hal-devel
 %endif
@@ -63,7 +63,6 @@ BuildRequires:  gcc-c++ >= 4.6
 %endif
 BuildRequires:  gettext-devel
 BuildRequires:  graphviz
-BuildRequires:  graphviz-gnome
 BuildRequires:  libxml2-devel
 %if 0%{?suse_version} != 1110
 # No libproxy on SLES
@@ -76,8 +75,7 @@ BuildRequires:  pkgconfig
 BuildRequires:  pkg-config
 %endif
 
-BuildRequires:  libsolv-devel >= 0.6.19
-BuildRequires:  libsolv-devel < 0.7
+BuildRequires:  libsolv-devel >= 0.6.23
 %if 0%{?suse_version} >= 1100
 BuildRequires:  libsolv-tools
 %requires_eq    libsolv-tools
@@ -156,6 +154,7 @@ Requires:       libudev-devel
 %else
 Requires:       hal-devel
 %endif
+Requires:       cmake
 %if 0%{?suse_version}
 %if 0%{?suse_version} >= 1100
 # Code11+
@@ -196,17 +195,7 @@ export CXX=g++-4.6
 %endif
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
-unset TRANSLATION_SET
 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"
@@ -217,7 +206,6 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
       -DLIB=%{_lib} \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_SKIP_RPATH=1 \
-      -DUSE_TRANSLATION_SET=${TRANSLATION_SET:-zypp} \
       ${EXTRA_CMAKE_OPTIONS} \
       ..
 make %{?_smp_mflags} VERBOSE=1
@@ -244,6 +232,7 @@ 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
@@ -341,6 +330,7 @@ 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