summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCebtenzzre2019-03-01 17:01:41 -0500
committerCebtenzzre2019-03-01 17:01:41 -0500
commit962c27248b1c454e8a46c62c9b42a8492a793282 (patch)
treee2794a7b6ba26da1757f754fd83a153041f7c914
parent229b7b83262859d283b09592fa76e216d21ac99b (diff)
downloadaur-962c27248b1c454e8a46c62c9b42a8492a793282.tar.gz
Fix conflicts
-rw-r--r--PKGBUILD4
1 files changed, 4 insertions, 0 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 41663fa0b6a..af3488f38f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -75,6 +75,8 @@ package_python2-shiboken2-git() {
rm -rf "$pkgdir"/usr/{include,bin,share}
rm "$pkgdir/usr/lib/cmake/Shiboken2-${_upver}/Shiboken2ConfigVersion.cmake"
rm "$pkgdir/usr/lib/cmake/Shiboken2-${_upver}/Shiboken2Config.cmake"
+ rm "$pkgdir/usr/lib/cmake/Shiboken2-${_upver}"/Shiboken2Targets{,-release}.cmake
+ rm "$pkgdir/usr/lib/cmake/Shiboken2-${_upver}/shiboken_helpers.cmake"
}
package_python-shiboken2-git() {
@@ -91,4 +93,6 @@ package_python-shiboken2-git() {
rm -rf "$pkgdir"/usr/{include,bin,share}
rm "$pkgdir/usr/lib/cmake/Shiboken2-${_upver}/Shiboken2ConfigVersion.cmake"
rm "$pkgdir/usr/lib/cmake/Shiboken2-${_upver}/Shiboken2Config.cmake"
+ rm "$pkgdir/usr/lib/cmake/Shiboken2-${_upver}"/Shiboken2Targets{,-release}.cmake
+ rm "$pkgdir/usr/lib/cmake/Shiboken2-${_upver}/shiboken_helpers.cmake"
}