Author: dmacvicar Date: Fri Oct 26 15:57:22 2007 New Revision: 7657 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7657&view=rev Log: - fix packaging Added: trunk/sat-solver/package/ trunk/sat-solver/package/libsatsolver.changes - copied, changed from r7656, trunk/sat-solver/libsatsolver.changes trunk/sat-solver/package/libsatsolver.spec.in Removed: trunk/sat-solver/libsatsolver.changes trunk/sat-solver/libsatsolver.spec.in Modified: trunk/sat-solver/CMakeLists.txt trunk/sat-solver/README trunk/sat-solver/src/CMakeLists.txt Modified: trunk/sat-solver/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/CMakeLists.txt?rev=7657&r1=7656&r2=7657&view=diff ============================================================================== --- trunk/sat-solver/CMakeLists.txt (original) +++ trunk/sat-solver/CMakeLists.txt Fri Oct 26 15:57:22 2007 @@ -18,11 +18,13 @@ # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ) +INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake ) + FIND_PACKAGE(Db43 REQUIRED) FIND_PACKAGE(EXPAT REQUIRED) SET( PACKAGE "satsolver" ) -SET( VERSION "${LIBZYPP_MAJOR}.${LIBZYPP_MINOR}.${LIBZYPP_PATCH}" ) +SET( VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}.${LIBSATSOLVER_PATCH}" ) SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -Wall" ) ADD_DEFINITIONS( -D_FILE_OFFSET_BITS=64 ) @@ -30,9 +32,9 @@ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "mls solver") SET(CPACK_PACKAGE_VENDOR "Novell Inc.") -SET(CPACK_PACKAGE_VERSION_MAJOR ${LIBZYPP_MAJOR}) -SET(CPACK_PACKAGE_VERSION_MINOR ${LIBZYPP_MINOR}) -SET(CPACK_PACKAGE_VERSION_PATCH ${LIBZYPP_PATCH}) +SET(CPACK_PACKAGE_VERSION_MAJOR ${LIBSATSOLVER_MAJOR}) +SET(CPACK_PACKAGE_VERSION_MINOR ${LIBSATSOLVER_MINOR}) +SET(CPACK_PACKAGE_VERSION_PATCH ${LIBSATSOLVER_PATCH}) SET( CPACK_GENERATOR "TBZ2") SET( CPACK_SOURCE_GENERATOR "TBZ2") SET( CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}" ) @@ -67,6 +69,8 @@ "\\\\.lo$" "\\\\.la$" "Makefile\\\\.in$" +"testsuite/data.libzypp/kernel-tests/kernel-hardware" +"testsuite/data.libzypp/yast-tests/kernel3-hardware" ) INCLUDE(CPack) @@ -113,7 +117,7 @@ MACRO(SPECFILE) MESSAGE(STATUS "Writing spec file...") - CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/libsatsolver.spec.in ${CMAKE_BINARY_DIR}/package/libsatsolver.spec.in @ONLY) + CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/package/libsatsolver.spec.in ${CMAKE_BINARY_DIR}/package/libsatsolver.spec @ONLY) #MESSAGE(STATUS "I hate you rpm-lint...!!!") #CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/package/libsatsolver-rpmlint.cmake ${CMAKE_BINARY_DIR}/package/libsatsolver-rpmlintrc @ONLY) ENDMACRO(SPECFILE) @@ -129,7 +133,7 @@ COMMAND ${CMAKE_MAKE_PROGRAM} package_source COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 ${CMAKE_BINARY_DIR}/package COMMAND ${CMAKE_COMMAND} -E remove ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.bz2 - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/package/${PACKAGE}.changes" "${CMAKE_BINARY_DIR}/package/${PACKAGE}.changes" + COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/package/libsatsolver.changes" "${CMAKE_BINARY_DIR}/package/libsatsolver.changes" ) ADD_CUSTOM_TARGET( srcpackage_local Modified: trunk/sat-solver/README URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/README?rev=7657&r1=7656&r2=7657&view=diff ============================================================================== --- trunk/sat-solver/README (original) +++ trunk/sat-solver/README Fri Oct 26 15:57:22 2007 @@ -24,3 +24,19 @@ Everything else is below doc. Please subscribe to zypp-devel@opensuse.org for any questions. + +* How to build + +Requires: cmake 2.4.x + +mkdir build +cd build +cmake .. +make + +To install ruby bindings: +make install + +To createe a package +make srcpackage +see package/ Copied: trunk/sat-solver/package/libsatsolver.changes (from r7656, trunk/sat-solver/libsatsolver.changes) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.changes?p2=trunk/sat-solver/package/libsatsolver.changes&p1=trunk/sat-solver/libsatsolver.changes&r1=7656&r2=7657&rev=7657&view=diff ============================================================================== (empty) Added: trunk/sat-solver/package/libsatsolver.spec.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.spec.in?rev=7657&view=auto ============================================================================== --- trunk/sat-solver/package/libsatsolver.spec.in (added) +++ trunk/sat-solver/package/libsatsolver.spec.in Fri Oct 26 15:57:22 2007 @@ -0,0 +1,76 @@ +Name: libsatsolver +Version: @VERSION@ +Release: 1 +License: BSD +Url: http://svn.opensuse.org/svn/zypp/trunk/sat-solver +Source: satsolver-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Group: System/Libraries +BuildRequires: libexpat-devel db43-devel +BuildRequires: ruby-devel swig +Requires: expat db43 +Summary: A new approach to package dependency solving + + +%description +- + +%package devel +Summary: A new approach to package dependency solving +Group: Development/Libraries + +%description devel +- + +%package ruby +Summary: Ruby bindings for sat solver +Group: Development/Languages/Ruby + +%description ruby +- + +%prep +%setup -n satsolver-%{version} + +%build +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ + -DLIB=%{_lib} \ + -DCMAKE_VERBOSE_MAKEFILE=TRUE \ + -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=1 \ + .. +make %{?jobs:-j %jobs} + +%install +cd build +make install DESTDIR=$RPM_BUILD_ROOT +#rm -f %{buildroot}%{_libdir}/libsatsolver.la + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%clean +rm -rf "$RPM_BUILD_ROOT" + +%files +%defattr(-,root,root) + +%files devel +%defattr(-,root,root) +%{_libdir}/libsatsolver.a +%doc doc/README* +%doc doc/THEORY +%doc doc/PLANNING +%dir %{_includedir}/satsolver +#%{_includedir}/satsolver/* + +%files ruby +%defattr(-,root,root,-) +%{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/satsolverx.so +%{_libdir}/ruby/vendor_ruby/%{rb_ver}/satsolver.rb + +%changelog Modified: trunk/sat-solver/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/CMakeLists.txt?rev=7657&r1=7656&r2=7657&view=diff ============================================================================== --- trunk/sat-solver/src/CMakeLists.txt (original) +++ trunk/sat-solver/src/CMakeLists.txt Fri Oct 26 15:57:22 2007 @@ -2,4 +2,7 @@ SET(libsatsolver_SRCS bitmap.c poolarch.c poolid.c solver.c source_solv.c evr.c pool.c queue.c source.c util.c) -ADD_LIBRARY(satsolver STATIC ${libsatsolver_SRCS}) \ No newline at end of file +ADD_LIBRARY(satsolver STATIC ${libsatsolver_SRCS}) + +SET(libsatsolver_HEADERS bitmap.h evr.h hash.h poolarch.h pool.h poolid.h pooltypes.h queue.h solvable.h solver.h source.h source_solv.h util.h ) +INSTALL( FILES ${libsatsolver_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/satsolver" ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org