fixed some dependencies (fixes #218)

naxuroqa · Jul 21, 2014 · 7bd10e3 · 7bd10e3
1 parent 7fc0b39
commit 7bd10e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmake/CPackDefines.cmake b/cmake/CPackDefines.cmake
@@ -56,7 +56,7 @@ ENDIF(ARCHITECTURE EQUAL 32)
 # optional features
 IF(${ENABLE_QR_ENCODE})
   SET(DEBIAN_PACKAGE_DEPENDS_OPT "${DEBIAN_PACKAGE_DEPENDS_OPT}, libqrencode3 (>=3.1.1)")
-  SET(RPM_PACKAGE_DEPENDS_OPT "${RPM_PACKAGE_DEPENDS_OPT}, qrencode-libs >= 3.1.1")
+  SET(RPM_PACKAGE_DEPENDS_OPT "${RPM_PACKAGE_DEPENDS_OPT}, qrencode >= 3.1.1")
 ENDIF()
 
 IF(${ENABLE_LIBNOTIFY})
@@ -73,6 +73,7 @@ SET(CPACK_PACKAGE_VERSION_MAJOR       "${VENOM_VERSION_MAJOR}")
 SET(CPACK_PACKAGE_VERSION_MINOR       "${VENOM_VERSION_MINOR}")
 SET(CPACK_PACKAGE_VERSION_PATCH       "${VENOM_VERSION_PATCH}")
 SET(CPACK_SOURCE_IGNORE_FILES /build/;\\\\.gitignore;.*~;\\\\.git;CMakeFiles;Makefile;cmake_install\\\\.cmake)
+SET(CPACK_PACKAGE_RELOCATABLE TRUE)
 SET(CPACK_SOURCE_STRIP_FILES TRUE)
 SET(CPACK_STRIP_FILES TRUE)
 
@@ -124,6 +125,7 @@ SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "${VENOM_WEBSITE}")
 SET(CPACK_RPM_PACKAGE_LICENSE  "GPLv3")
 SET(CPACK_RPM_PACKAGE_GROUP    "Applications/Internet")
 SET(CPACK_RPM_PACKAGE_REQUIRES "gtk3 >= 3.4.1, json-glib >= 0.14.2, sqlite >= 3.7.9, gstreamer >= 0.10.36, gstreamer-plugins-base >= 0.10.36 ${RPM_PACKAGE_DEPENDS_OPT}")
+#SET(CPACK_RPM_EXCLUDE_LIST     /etc /etc/init.d /usr /usr/share /usr/bin /usr/lib /usr/include) 
 # Default: some cpack comment, overwrite if needed
 #SET(CPACK_RPM_CHANGELOG_FILE  "")
 SET(CPACK_RPM_PACKAGE_RELEASE  1)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -31,7 +31,7 @@ FIND_PACKAGE(PkgConfig REQUIRED)
 PKG_CHECK_MODULES_FULLPATH(GTK    REQUIRED gtk+-3.0>=3.4)
 PKG_CHECK_MODULES_FULLPATH(GIO    REQUIRED gio-2.0>=2.32)
 PKG_CHECK_MODULES_FULLPATH(GLIB   REQUIRED glib-2.0>=2.32)
-PKG_CHECK_MODULES_FULLPATH(GSTREAMER REQUIRED gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-app-0.10)
+PKG_CHECK_MODULES_FULLPATH(GSTREAMER REQUIRED gstreamer-0.10>=0.10.14 gstreamer-interfaces-0.10>=0.10.14 gstreamer-app-0.10>=0.10.14)
 PKG_CHECK_MODULES_FULLPATH(GDKX11    REQUIRED gdk-x11-3.0)
 PKG_CHECK_MODULES_FULLPATH(SQLITE REQUIRED sqlite3>=3.7)
 PKG_CHECK_MODULES_FULLPATH(JSON   REQUIRED json-glib-1.0>=0.14)