Fixed building on SLE10-SP1.

diff --git a/package/zypper.changes b/package/zypper.changes
index bc6eea3..6365fb6 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Tue Jan  9 17:13:16 CET 2007 - mvidner@suse.cz
+
+- Fixed building on SLE10-SP1.
+
+-------------------------------------------------------------------
 Mon Dec 18 13:30:10 CET 2006 - jkupec@suse.cz
 
 - fixed uncaught checksum exception (#224216)

diff --git a/zypper.spec.in b/zypper.spec.in
index 11a9a55..21d844c 100644 (file)
--- a/zypper.spec.in
+++ b/zypper.spec.in
@@ -46,7 +46,10 @@ gettextize -f
 autoreconf --force --install --symlink --verbose
 %{?suse_update_config:%{suse_update_config -f}}
 %if %suse_version <= 1010
-ZYPP_LIBS=-lzypp ZYPP_CFLAGS="-D_FILE_OFFSET_BITS=64 -DLIBZYPP_1xx" \
+# compatibility defines unless we have the newer libzypp on SLE SP
+if ! pkg-config --modversion libzypp | grep '^2'; then
+export ZYPP_LIBS=-lzypp ZYPP_CFLAGS="-D_FILE_OFFSET_BITS=64 -DLIBZYPP_1xx"
+fi
 %endif
 CFLAGS="$RPM_OPT_FLAGS" \
 CXXFLAGS="$RPM_OPT_FLAGS" \
@@ -58,6 +61,10 @@ make %{?jobs:-j %jobs}
 make install DESTDIR=$RPM_BUILD_ROOT
 # Create filelist with translatins
 %{find_lang} zypper
+%if %suse_version <= 1010
+rm -f ${RPM_BUILD_ROOT}%{_sbindir}/zypp-checkpatches
+rm -f ${RPM_BUILD_ROOT}%{_sbindir}/zypp-checkpatches-wrapper
+%endif
 
 %post
 %run_ldconfig