Author: dmacvicar Date: Mon Feb 25 18:46:37 2008 New Revision: 8907 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8907&view=rev Log: - some fixes to get the stack built in other distributions Modified: trunk/libzypp/libzypp.spec.cmake trunk/sat-solver/CMakeLists.txt trunk/sat-solver/package/libsatsolver.spec.in Modified: trunk/libzypp/libzypp.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=8907&r1=8906&r2=8907&view=diff ============================================================================== --- trunk/libzypp/libzypp.spec.cmake (original) +++ trunk/libzypp/libzypp.spec.cmake Mon Feb 25 18:46:37 2008 @@ -24,10 +24,27 @@ Provides: yast2-packagemanager Obsoletes: yast2-packagemanager BuildRequires: cmake -BuildRequires: libsatsolver-devel openssl-devel sqlite-devel +BuildRequires: libsatsolver-devel openssl-devel BuildRequires: boost-devel curl-devel dejagnu doxygen gcc-c++ gettext-devel graphviz hal-devel libxml2-devel rpm-devel + +%if 0%{?suse_version} BuildRequires: hicolor-icon-theme update-desktop-files +%endif + +%if 0%{?mandriva_version} +BuildRequires: sqlite3-devel +%else +BuildRequires: sqlite-devel +%endif + + + +%if 0%{?suse_version} Requires: gpg2 +%else +Requires: gnupg +%endif + Requires: satsolver-tools == %( echo `rpm -q --queryformat '%{VERSION}' satsolver-tools`) %description Modified: trunk/sat-solver/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/CMakeLists.txt?rev=8907&r1=8906&r2=8907&view=diff ============================================================================== --- trunk/sat-solver/CMakeLists.txt (original) +++ trunk/sat-solver/CMakeLists.txt Mon Feb 25 18:46:37 2008 @@ -22,7 +22,7 @@ INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake ) FIND_PACKAGE(EXPAT REQUIRED) -#FIND_PACKAGE(Ruby REQUIRED) +FIND_PACKAGE(Ruby) FIND_LIBRARY(RPMDB_LIBRARY NAMES rpmdb) SET( PACKAGE "satsolver" ) Modified: trunk/sat-solver/package/libsatsolver.spec.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.spec.in?rev=8907&r1=8906&r2=8907&view=diff ============================================================================== --- trunk/sat-solver/package/libsatsolver.spec.in (original) +++ trunk/sat-solver/package/libsatsolver.spec.in Mon Feb 25 18:46:37 2008 @@ -7,7 +7,18 @@ Source: satsolver-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/C and C++ -BuildRequires: cmake rpm-devel gcc-c++ libexpat-devel ruby-devel swig + +%if 0%{?mandriva_version} +# force this version on mandriva +BuildRequires: libneon0.26-devel +%endif + +%if 0%{?suse_version} +BuildRequires: libexpat-devel +%else +BuildRequires: expat-devel +%endif +BuildRequires: cmake rpm-devel gcc-c++ ruby-devel swig Summary: A new approach to package dependency solving %description @@ -88,7 +99,16 @@ %files ruby %defattr(-,root,root,-) + +%if 0%{?suse_version} %{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/satsolverx.so %{_libdir}/ruby/vendor_ruby/%{rb_ver}/satsolver.rb +%else +%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')} +%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')} +%{ruby_sitearch}/satsolverx.so +%{ruby_sitelib}/satsolver.rb +%endif + %changelog -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org