Update site-packages-dir.patch for new CmakeLists.txt

3 files changed, 19 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab9455dc59a2..f64f5788ab00 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Mon Feb 15 15:33:29 UTC 2016
 pkgbase = cura-git
 	pkgdesc = A full software solution for 3D printing aimed at RepRaps and the Ultimaker.
-	pkgver = 15.06.03.841.gfa7a434
+	pkgver = 15.06.03.1217.gd088044
 	pkgrel = 1
 	url = https://github.com/daid/Cura
 	arch = any
@@ -21,7 +23,7 @@ pkgbase = cura-git
 	source = git+https://github.com/Ultimaker/Cura.git
 	source = site-packages-dir.patch
 	md5sums = SKIP
-	md5sums = 83c7a13d4819a0814460b1368fb4ada2
+	md5sums = c9ac02af3d23b7c271340458412ea9de
 
 pkgname = cura-git
 
diff --git a/PKGBUILD b/PKGBUILD
index def580806f11..e7976fc5c6a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Adam Goldsmith <contact@adamgoldsmith.name>
- 
+
 pkgname=cura-git
-pkgver=15.06.03.841.gfa7a434
+pkgver=15.06.03.1217.gd088044
 pkgrel=1
 pkgdesc="A full software solution for 3D printing aimed at RepRaps and the Ultimaker."
 arch=('any')
@@ -12,7 +12,7 @@ conflicts=('cura')
 depends=('python' 'python-pyqt5' 'python-pyserial' 'python-numpy' 'python-protobuf3' 'qt5-quickcontrols' 'libarcus-git' 'uranium-git' 'curaengine-git')
 makedepends=('git' 'cmake')
 source=('git+https://github.com/Ultimaker/Cura.git' 'site-packages-dir.patch')
-md5sums=('SKIP' '83c7a13d4819a0814460b1368fb4ada2')
+md5sums=('SKIP' 'c9ac02af3d23b7c271340458412ea9de')
 
 pkgver() {
   cd Cura
diff --git a/site-packages-dir.patch b/site-packages-dir.patch
index 558c10bc590b..01795943ce42 100644
--- a/site-packages-dir.patch
+++ b/site-packages-dir.patch
@@ -1,6 +1,6 @@
---- a/CMakeLists.txt	2015-07-27 17:50:10.000000000 +0100
-+++ b/CMakeLists.txt	2015-08-23 19:03:35.627848083 +0100
-@@ -61,12 +61,7 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,16 +56,12 @@ find_package(PythonInterp 3.4.0 REQUIRED)
  install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
  install(DIRECTORY plugins DESTINATION lib/cura)
  install(FILES cura_app.py DESTINATION ${CMAKE_INSTALL_BINDIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
@@ -8,11 +8,19 @@
 -    install(DIRECTORY cura DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages FILES_MATCHING PATTERN *.py)
 -    install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura)
 -    install(FILES cura.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+-    install(FILES cura.sharedmimeinfo
+-            DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages/
+-            RENAME cura.xml )
 -else()
 -    install(DIRECTORY cura DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages FILES_MATCHING PATTERN *.py)
 -    install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura)
 -endif()
++
 +install(DIRECTORY cura DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages FILES_MATCHING PATTERN *.py)
-+install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}/site-packages/cura)
++install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura)
 +install(FILES cura.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
++install(FILES cura.sharedmimeinfo
++        DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages/
++        RENAME cura.xml )
  
+ include(CPackConfig.cmake)