Hello community, here is the log from the commit of package libsatsolver checked in at Fri Mar 14 18:04:54 CET 2008. -------- --- libsatsolver/libsatsolver.changes 2008-03-12 14:34:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/libsatsolver/libsatsolver.changes 2008-03-14 08:38:47.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 14 08:37:47 CET 2008 - coolo@suse.de + +- fix build on other distris +- fix requires of tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsatsolver.spec ++++++ --- /var/tmp/diff_new_pack.q12522/_old 2008-03-14 18:04:42.000000000 +0100 +++ /var/tmp/diff_new_pack.q12522/_new 2008-03-14 18:04:42.000000000 +0100 @@ -12,7 +12,7 @@ Name: libsatsolver Version: 0.0.22 -Release: 1 +Release: 2 License: BSD 3-Clause Url: http://svn.opensuse.org/svn/zypp/trunk/sat-solver Source: satsolver-%{version}.tar.bz2 @@ -22,6 +22,9 @@ # force this version on mandriva BuildRequires: libneon0.26-devel %endif +%if 0%{?fedora_version} +BuildRequires: perl-devel +%endif %if 0%{?suse_version} BuildRequires: libexpat-devel %else @@ -74,6 +77,7 @@ Group: System/Base Obsoletes: libsatsolver <= 0.0.15 Provides: libsatsolver = 0.0.15 +Requires: gzip bzip2 coreutils %description -n satsolver-tools A new approach to package dependency solving @@ -85,6 +89,20 @@ Michael Schroeder <mls@suse.de> Klaus Kaempf <kkaempf@suse.de> +%package perl +Summary: A new approach to package dependency solving +Group: Development/Libraries/C and C++ + +%description perl +A new approach to package dependency solving + + + +Authors: +-------- + Michael Schroeder <mls@suse.de> + Klaus Kaempf <kkaempf@suse.de> + %prep %setup -n satsolver-%{version} @@ -102,8 +120,6 @@ make DESTDIR=$RPM_BUILD_ROOT install # we want to leave the .a file untouched export NO_BRP_STRIP_DEBUG=true -# remove the perl bindings for now -rm -rf $RPM_BUILD_ROOT/usr/lib/perl5 %clean rm -rf "$RPM_BUILD_ROOT" @@ -128,12 +144,21 @@ %if 0%{?suse_version} %{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/satsolverx.so %{_libdir}/ruby/vendor_ruby/%{rb_ver}/satsolver.rb -%else +%endif +%if 0%{?mandriva_version} %{ruby_sitearchdir}/satsolverx.so %{ruby_sitelibdir}/satsolver.rb %endif +%files perl +%defattr(-,root,root,-) +%{perl_vendorarch}/satsolverx.so +%{perl_vendorlib}/satsolverx.pm + %changelog +* Fri Mar 14 2008 coolo@suse.de +- fix build on other distris +- fix requires of tools * Wed Mar 12 2008 coolo@suse.de - store datadir for susetags - fixing assertion in rules learning ++++++ satsolver-0.0.22.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/satsolver-0.0.22/bindings/CMakeLists.txt new/satsolver-0.0.22/bindings/CMakeLists.txt --- old/satsolver-0.0.22/bindings/CMakeLists.txt 2008-03-12 14:34:06.000000000 +0100 +++ new/satsolver-0.0.22/bindings/CMakeLists.txt 2008-03-14 08:38:46.000000000 +0100 @@ -9,7 +9,7 @@ FIND_PACKAGE(Perl) IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) - ADD_SUBDIRECTORY(ruby) + ADD_SUBDIRECTORY(ruby) ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH) IF (PYTHON_LIBRARY) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/satsolver-0.0.22/CMakeLists.txt new/satsolver-0.0.22/CMakeLists.txt --- old/satsolver-0.0.22/CMakeLists.txt 2008-03-12 14:34:06.000000000 +0100 +++ new/satsolver-0.0.22/CMakeLists.txt 2008-03-14 08:38:46.000000000 +0100 @@ -22,9 +22,6 @@ INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake ) FIND_PACKAGE(EXPAT REQUIRED) -FIND_PACKAGE(Ruby) -MESSAGE(STATUS "ruby destinations: ${RUBY_VENDORLIB_DIR} | ${RUBY_VENDORARCH_DIR}") - FIND_LIBRARY(RPMDB_LIBRARY NAMES rpmdb) FIND_LIBRARY(ZLIB_LIBRARY NAMES z) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/satsolver-0.0.22/package/libsatsolver.changes new/satsolver-0.0.22/package/libsatsolver.changes --- old/satsolver-0.0.22/package/libsatsolver.changes 2008-03-12 14:34:06.000000000 +0100 +++ new/satsolver-0.0.22/package/libsatsolver.changes 2008-03-14 08:38:46.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 14 08:37:47 CET 2008 - coolo@suse.de + +- fix build on other distris +- fix requires of tools + +------------------------------------------------------------------- Wed Mar 12 11:45:21 CET 2008 - coolo@suse.de - store datadir for susetags diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/satsolver-0.0.22/package/libsatsolver.spec.in new/satsolver-0.0.22/package/libsatsolver.spec.in --- old/satsolver-0.0.22/package/libsatsolver.spec.in 2008-03-12 14:34:06.000000000 +0100 +++ new/satsolver-0.0.22/package/libsatsolver.spec.in 2008-03-14 08:38:46.000000000 +0100 @@ -12,7 +12,9 @@ # force this version on mandriva BuildRequires: libneon0.26-devel %endif - +%if 0%{?fedora_version} +BuildRequires: perl-devel +%endif %if 0%{?suse_version} BuildRequires: libexpat-devel %else @@ -54,10 +56,18 @@ Group: Development/Libraries/C and C++ Obsoletes: libsatsolver <= 0.0.15 Provides: libsatsolver = 0.0.15 +Requires: gzip bzip2 coreutils %description -n satsolver-tools . +%package perl +Summary: Perl bindings for sat solver +Group: Development/Languages/Perl + +%description perl +. + %prep %setup -n satsolver-%{version} @@ -76,9 +86,6 @@ # we want to leave the .a file untouched export NO_BRP_STRIP_DEBUG=true -# remove the perl bindings for now -rm -rf $RPM_BUILD_ROOT/usr/lib/perl5 - %clean rm -rf "$RPM_BUILD_ROOT" @@ -103,10 +110,14 @@ %if 0%{?suse_version} %{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/satsolverx.so %{_libdir}/ruby/vendor_ruby/%{rb_ver}/satsolver.rb -%else +%endif +%if 0%{?mandriva_version} %{ruby_sitearchdir}/satsolverx.so %{ruby_sitelibdir}/satsolver.rb %endif - +%files perl +%defattr(-,root,root,-) +%{perl_vendorarch}/satsolverx.so +%{perl_vendorlib}/satsolverx.pm %changelog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/satsolver-0.0.22/tools/susetags2solv.c new/satsolver-0.0.22/tools/susetags2solv.c --- old/satsolver-0.0.22/tools/susetags2solv.c 2008-03-12 14:34:06.000000000 +0100 +++ new/satsolver-0.0.22/tools/susetags2solv.c 2008-03-14 08:38:46.000000000 +0100 @@ -15,6 +15,7 @@ #include <string.h> #include <dirent.h> #include <zlib.h> +#include <getopt.h> #include "pool.h" #include "repo.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org