Install libsatsolvertools.a, providing tool_write()

This is used by satsolver-bindings to allow writing of a Repo
to a .solv file.

VERSION.cmake

@@ -46,6 +46,6 @@
 
 SET(LIBSATSOLVER_MAJOR "0")
 SET(LIBSATSOLVER_MINOR "17")
-SET(LIBSATSOLVER_PATCH "1")
+SET(LIBSATSOLVER_PATCH "2")
 
 # last released 0.17.1

package/libsatsolver.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug  4 07:57:15 UTC 2011 - kkaempf@novell.com
+
+- make satsolvertools.a available to provide the ability to
+  write a .solv file (used by satsolver-bindings)
+- 0.17.2
+
 -------------------------------------------------------------------
 Wed Jul 27 11:34:20 CEST 2011 - mls@suse.de
 

package/libsatsolver.spec.in

@@ -155,6 +155,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %defattr(-,root,root)
 %_libdir/libsatsolver.a
 %_libdir/libsatsolverext.a
+%_libdir/libsatsolvertools.a
 %dir /usr/include/satsolver
 /usr/include/satsolver/*
 /usr/bin/deptestomatic

tools/CMakeLists.txt

@@ -2,37 +2,39 @@
 # CMakeLists.txt for sat-solver/tools
 #
 
-ADD_LIBRARY(toolstuff STATIC common_write.c)
+ADD_LIBRARY(satsolvertools STATIC common_write.c)
+
+SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )
 
 IF ( NOT DEBIAN )
 ADD_EXECUTABLE(rpmdb2solv rpmdb2solv.c)
-TARGET_LINK_LIBRARIES(rpmdb2solv toolstuff satsolverext satsolver ${RPMDB_LIBRARY} ${EXPAT_LIBRARY})
+TARGET_LINK_LIBRARIES(rpmdb2solv satsolvertools satsolverext satsolver ${RPMDB_LIBRARY} ${EXPAT_LIBRARY})
 
 ADD_EXECUTABLE(rpms2solv rpms2solv.c)
-TARGET_LINK_LIBRARIES(rpms2solv toolstuff satsolverext satsolver ${RPMDB_LIBRARY})
+TARGET_LINK_LIBRARIES(rpms2solv satsolvertools satsolverext satsolver ${RPMDB_LIBRARY})
 
 ADD_EXECUTABLE(findfileconflicts findfileconflicts.c)
 TARGET_LINK_LIBRARIES(findfileconflicts satsolverext satsolver ${RPMDB_LIBRARY})
 
 ENDIF ( NOT DEBIAN )
 
 ADD_EXECUTABLE(rpmmd2solv rpmmd2solv.c)
-TARGET_LINK_LIBRARIES(rpmmd2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY})
+TARGET_LINK_LIBRARIES(rpmmd2solv satsolvertools satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY})
 
 ADD_EXECUTABLE(helix2solv helix2solv.c)
-TARGET_LINK_LIBRARIES(helix2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY})
+TARGET_LINK_LIBRARIES(helix2solv satsolvertools satsolverext satsolver ${EXPAT_LIBRARY})
 
 ADD_EXECUTABLE(susetags2solv susetags2solv.c)
-TARGET_LINK_LIBRARIES(susetags2solv toolstuff satsolverext satsolver ${ZLIB_LIBRARY})
+TARGET_LINK_LIBRARIES(susetags2solv satsolvertools satsolverext satsolver ${ZLIB_LIBRARY})
 
 ADD_EXECUTABLE(updateinfoxml2solv updateinfoxml2solv.c)
-TARGET_LINK_LIBRARIES(updateinfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY})
+TARGET_LINK_LIBRARIES(updateinfoxml2solv satsolvertools satsolverext satsolver ${EXPAT_LIBRARY})
 
 ADD_EXECUTABLE(deltainfoxml2solv deltainfoxml2solv.c)
-TARGET_LINK_LIBRARIES(deltainfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY})
+TARGET_LINK_LIBRARIES(deltainfoxml2solv satsolvertools satsolverext satsolver ${EXPAT_LIBRARY})
 
 ADD_EXECUTABLE(repomdxml2solv repomdxml2solv.c)
-TARGET_LINK_LIBRARIES(repomdxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY})
+TARGET_LINK_LIBRARIES(repomdxml2solv satsolvertools satsolverext satsolver ${EXPAT_LIBRARY})
 
 ADD_EXECUTABLE(installcheck installcheck.c)
 TARGET_LINK_LIBRARIES(installcheck satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY})
@@ -44,7 +46,7 @@ ADD_EXECUTABLE(dumpsolv dumpsolv.c )
 TARGET_LINK_LIBRARIES(dumpsolv satsolver)
 
 ADD_EXECUTABLE(mergesolv mergesolv.c )
-TARGET_LINK_LIBRARIES(mergesolv toolstuff satsolverext satsolver)
+TARGET_LINK_LIBRARIES(mergesolv satsolvertools satsolverext satsolver)
 
 install(TARGETS
     mergesolv
@@ -68,3 +70,8 @@ ENDIF ( NOT DEBIAN )
 install(PROGRAMS
    repo2solv.sh
    DESTINATION ${BIN_INSTALL_DIR})
+
+SET(satsolvertools_HEADERS common_write.h)
+
+INSTALL(FILES ${satsolvertools_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/satsolver")
+INSTALL(TARGETS satsolvertools LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR})