Use lib64 install path

solus-packages · Jun 15, 2017 · 5671fff · 5671fff
1 parent 3551b29
commit 5671fff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/package.yml b/package.yml
@@ -1,6 +1,6 @@
 name       : openjpeg
 version    : 2.1.2
-release    : 7
+release    : 8
 source     :
     - https://github.com/uclouvain/openjpeg/archive/v2.1.2.tar.gz : 4ce77b6ef538ef090d9bde1d5eeff8b3069ab56c4906f083475517c2c023dfa7
 license    : BSD-2-Clause
@@ -14,7 +14,7 @@ builddeps  :
     - pkgconfig(libtiff-4)
 setup      : |
     %apply_patches
-    %cmake .
+    %cmake -DOPENJPEG_INSTALL_LIB_DIR=%libdir% .
 build      : |
     %make
 install    : |

diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
@@ -20,10 +20,10 @@
         <PartOf>multimedia.library</PartOf>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="library">/usr/lib/lib*.so.*</Path>
-            <Path fileType="library">/usr/lib/openjpeg-2.1/OpenJPEGConfig.cmake</Path>
-            <Path fileType="library">/usr/lib/openjpeg-2.1/OpenJPEGTargets-relwithdebinfo.cmake</Path>
-            <Path fileType="library">/usr/lib/openjpeg-2.1/OpenJPEGTargets.cmake</Path>
+            <Path fileType="library">/usr/lib64/lib*.so.*</Path>
+            <Path fileType="library">/usr/lib64/openjpeg-2.1/OpenJPEGConfig.cmake</Path>
+            <Path fileType="library">/usr/lib64/openjpeg-2.1/OpenJPEGTargets-relwithdebinfo.cmake</Path>
+            <Path fileType="library">/usr/lib64/openjpeg-2.1/OpenJPEGTargets.cmake</Path>
         </Files>
     </Package>
     <Package>
@@ -33,16 +33,16 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="7">openjpeg</Dependency>
+            <Dependency release="8">openjpeg</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/</Path>
-            <Path fileType="library">/usr/lib/lib*.so</Path>
-            <Path fileType="data">/usr/lib/pkgconfig/*.pc</Path>
+            <Path fileType="library">/usr/lib64/lib*.so</Path>
+            <Path fileType="data">/usr/lib64/pkgconfig/*.pc</Path>
         </Files>
     </Package>
     <History>
-        <Update release="7">
+        <Update release="8">
             <Date>2017-06-15</Date>
             <Version>2.1.2</Version>
             <Comment>Packaging update</Comment>