From: Martin Vidner <mvidner@suse.cz>
Date: Mon, 6 Nov 2006 10:26:10 +0000 (+0000)
Subject: Made it build on SL10.1
X-Git-Tag: BASE-SuSE-SLE-10-SP2-Branch~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e1ce592b200f9754548973406c4977d608ec939;p=platform%2Fupstream%2Fzypper.git

Made it build on SL10.1
---

diff --git a/VERSION b/VERSION
index 81d6b22..a402bcc 100644
--- a/VERSION
+++ b/VERSION
@@ -6,5 +6,5 @@ dnl
 dnl ==================================================
 m4_define([ZYPPER_MAJOR], 	 [0])
 m4_define([ZYPPER_MINOR],	 [6])
-m4_define([ZYPPER_PATCH],	 [1])
+m4_define([ZYPPER_PATCH],	 [2])
 dnl ==================================================
diff --git a/configure.ac b/configure.ac
index b0d99f2..6691cb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,7 +56,13 @@ dnl ==================================================
 dnl checks for libraries
 
 AC_ARG_VAR([PKG_CONFIG_PATH], [where to search for pkg-config files])
-PKG_CHECK_MODULES(ZYPP, [libzypp >= 2.0.0])
+PKG_CHECK_MODULES(ZYPP, [libzypp >= 1.0.0])
+
+case "$ZYPP_CFLAGS" in
+  *LIBZYPP_1xx*) checkpatches=false ;;
+  *) checkpatches=true ;;
+esac
+AM_CONDITIONAL([BUILD_CHECKPATCHES], [$checkpatches])
 
 dnl ==================================================
 dnl checks for header files
diff --git a/package/zypper.changes b/package/zypper.changes
index 72896d1..21d72fd 100644
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Nov  6 11:25:46 CET 2006 - mvidner@suse.cz
+
+- Made it build on SL10.1
+- 0.6.2
+
+-------------------------------------------------------------------
 Mon Nov  6 09:48:06 CET 2006 - mvidner@suse.cz
 
 - Warn that we do not sync with ZMD (#217028).
diff --git a/src/Makefile.am b/src/Makefile.am
index cce0fd4..62d741f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,9 @@
 ## ##################################################
 
 bin_PROGRAMS = zypper
+if BUILD_CHECKPATCHES
 sbin_PROGRAMS = zypp-checkpatches zypp-checkpatches-wrapper
+endif
 noinst_PROGRAMS = zmart
 
 logrotatedir = $(sysconfdir)/logrotate.d
@@ -59,6 +61,7 @@ zypper_SOURCES = 	zypper.cc zmart-sources.cc zmart-misc.cc \
 	zmart.h
 zypper_LDADD = $(ZYPP_LIBS) -lboost_regex
 
+if BUILD_CHECKPATCHES
 zypp_checkpatches_SOURCES = 	zypp-checkpatches.cc zmart-sources.cc \
 	zypper-tabulator.h \
 	zypper-tabulator.cc \
@@ -72,6 +75,7 @@ zypp_checkpatches_LDADD = $(ZYPP_LIBS) -lboost_regex -lboost_program_options
 zypp_checkpatches_wrapper_SOURCES = zypp-checkpatches-wrapper.c
 # empty:
 zypp_checkpatches_wrapper_LDADD =
+endif
 
 #zmart_LDFLAGS =	-static
 
diff --git a/zypper.spec.in b/zypper.spec.in
index 30435cb..158f219 100644
--- a/zypper.spec.in
+++ b/zypper.spec.in
@@ -44,6 +44,9 @@ Authors:
 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" \
+%endif
 CFLAGS="$RPM_OPT_FLAGS" \
 CXXFLAGS="$RPM_OPT_FLAGS" \
 ./configure --prefix=%{prefix} --libdir=%{_libdir} --mandir=%{_mandir} --sysconfdir=%{_sysconfdir} --disable-static
@@ -57,10 +60,14 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %post
 %run_ldconfig
+%if %suse_version > 1010
 %run_permissions
+%endif
 
+%if %suse_version > 1010
 %verifyscript
 %verify_permissions -e %{_sbindir}/zypp-checkpatches-wrapper
+%endif
 
 %postun
 %run_ldconfig
@@ -71,8 +78,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_sysconfdir}/logrotate.d/zypper.lr
 %{_bindir}/zypper
+%if %suse_version > 1010
 %{_sbindir}/zypp-checkpatches
 %verify(not mode) %attr (755,root,root) %{_sbindir}/zypp-checkpatches-wrapper
+%endif
 %doc %{_mandir}/*/*
 %doc %dir %{_datadir}/doc/packages/zypper
 %doc %{_datadir}/doc/packages/zypper/TODO