Commits

arsooy committed 5f73ca9

fix for conflict with pyside-tools man files

Comments (0)

Files changed (2)

python-pyside-tools/PKGBUILD

 md5sums=('14d3a36df06d680357d7bc1960f19a6d'
          '88ca14b1e58ca167564afd215930a84b'
          '9e4d6f040e442713f5e74fc8aae6d8e6'
-         'c6a93ca5a200ec6b2601e8349db08bae')
+         '8daa60a8227b4d924ea88fca78750f19')
 
 
 build() {

python-pyside-tools/py3build.patch

 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bbc8536..90e3626 100644
+index bbc8536..5b2e7be 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -13,13 +13,20 @@ set(pyside_tools_VERSION "${pyside_tools_MAJOR_VERSION}.${pyside_tools_MINOR_VER
  
  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/__init__.py"
          DESTINATION "${SITE_PACKAGE}/pysideuic")
+@@ -45,7 +53,12 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pysideuic
+ # Man pages for pyside-uic
+ if (NOT win32)
+     file(GLOB manpages "${CMAKE_CURRENT_SOURCE_DIR}/pysideuic/*.1")
+-    install(FILES ${manpages} DESTINATION share/man/man1)
++
++    # install man files with suffix
++    foreach(manfile ${manpages})
++        get_filename_component(fname ${manfile} NAME_WE)
++        install(FILES ${manfile} DESTINATION share/man/man1 RENAME ${fname}${tools_SUFFIX}.1)
++    endforeach(manfile)
+ endif()
+ 
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake"
 diff --git a/pylupdate/CMakeLists.txt b/pylupdate/CMakeLists.txt
-index bc1bd88..acc8759 100644
+index bc1bd88..cf7ecbd 100644
 --- a/pylupdate/CMakeLists.txt
 +++ b/pylupdate/CMakeLists.txt
 @@ -15,6 +15,7 @@ set(lupdate_MOC_HEADERS translator.h)
  include_directories(pyside-lupdate
                      ${CMAKE_CURRENT_SOURCE_DIR}
                      ${QT_INCLUDE_DIR}
+@@ -33,6 +34,11 @@ install(TARGETS pyside-lupdate RUNTIME DESTINATION bin)
+ # Man pages
+ if (NOT win32)
+     file(GLOB manpages "${CMAKE_CURRENT_SOURCE_DIR}/*.1")
+-    install(FILES ${manpages} DESTINATION share/man/man1)
++
++    # install man files with suffix
++    foreach(manfile ${manpages})
++        get_filename_component(fname ${manfile} NAME_WE)
++        install(FILES ${manfile} DESTINATION share/man/man1 RENAME ${fname}${tools_SUFFIX}.1)
++    endforeach(manfile)
+ endif()
+ 
 diff --git a/pyrcc/CMakeLists.txt b/pyrcc/CMakeLists.txt
-index c804bd5..aeb5a46 100644
+index c804bd5..cb69b23 100644
 --- a/pyrcc/CMakeLists.txt
 +++ b/pyrcc/CMakeLists.txt
 @@ -1,5 +1,6 @@
  include_directories(pyside-rcc
                      ${QT_INCLUDE_DIR}
                      ${QT_QT_INCLUDE_DIR}
+@@ -15,6 +16,11 @@ install(TARGETS pyside-rcc RUNTIME DESTINATION bin)
+ # Man pages
+ if (NOT win32)
+     file(GLOB manpages "${CMAKE_CURRENT_SOURCE_DIR}/*.1")
+-    install(FILES ${manpages} DESTINATION share/man/man1)
++
++    # install man files with suffix
++    foreach(manfile ${manpages})
++        get_filename_component(fname ${manfile} NAME_WE)
++        install(FILES ${manfile} DESTINATION share/man/man1 RENAME ${fname}${tools_SUFFIX}.1)
++    endforeach(manfile)
+ endif()
+