From: Duncan Mac-Vicar P Date: Fri, 26 Oct 2007 13:57:22 +0000 (+0000) Subject: - fix packaging X-Git-Tag: BASE-SuSE-Code-12_1-Branch~1193 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=42bd996fe3a2d761a59be226d328f1f0567f2cde;p=platform%2Fupstream%2Flibsolv.git - fix packaging --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e9beea..7fd3003 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,11 +18,13 @@ MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" ) # 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 @@ ADD_DEFINITIONS( -DVERSION=\\\"${VERSION}\\\" ) 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 @@ SET (CPACK_SOURCE_IGNORE_FILES "\\\\.lo$" "\\\\.la$" "Makefile\\\\.in$" +"testsuite/data.libzypp/kernel-tests/kernel-hardware" +"testsuite/data.libzypp/yast-tests/kernel3-hardware" ) INCLUDE(CPack) @@ -113,7 +117,7 @@ MESSAGE(STATUS "version: ${VERSION}") 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 @@ SET( AUTOBUILD_COMMAND 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 diff --git a/README b/README index 65f8e28..3e15207 100644 --- a/README +++ b/README @@ -24,3 +24,19 @@ Some research papers are in doc/pdf. 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/ diff --git a/libsatsolver.changes b/package/libsatsolver.changes similarity index 100% rename from libsatsolver.changes rename to package/libsatsolver.changes diff --git a/libsatsolver.spec.in b/package/libsatsolver.spec.in similarity index 52% rename from libsatsolver.spec.in rename to package/libsatsolver.spec.in index 38ee5a3..7f14ec5 100644 --- a/libsatsolver.spec.in +++ b/package/libsatsolver.spec.in @@ -7,6 +7,7 @@ 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 @@ -21,16 +22,33 @@ 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 -%configure --prefix=/usr --libdir=%{_libdir} --sysconfdir=/etc -make +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 -make DESTDIR=%{buildroot} install -rm -f %{buildroot}%{_libdir}/libsatsolver.la +cd build +make install DESTDIR=$RPM_BUILD_ROOT +#rm -f %{buildroot}%{_libdir}/libsatsolver.la %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -47,7 +65,12 @@ rm -rf "$RPM_BUILD_ROOT" %doc doc/README* %doc doc/THEORY %doc doc/PLANNING -%dir /usr/include/satsolver -/usr/include/satsolver/* +%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 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 10e542b..2605bdd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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" )