Merge branch 'master' of github.com:pisilinux/main

This commit is contained in:
ismetsezer
2017-08-21 12:34:51 +03:00
2 changed files with 17 additions and 3 deletions
+8 -3
View File
@@ -15,9 +15,14 @@ def setup():
shelltools.cd("build")
cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_TESTS=OFF \
-DQCA_INSTALL_IN_QT_PREFIX=ON \
-DQCA_MAN_INSTALL_DIR=/usr/share/man \
-DOPENSSL_INCLUDE_DIR=/usr/include/openssl \
-DOPENSSL_SSL_LIBRARY=/usr/lib/libssl.so \
-DQCA_SUFFIX=qt5 \
-DQCA_INSTALL_IN_QT_PREFIX=ON", sourceDir="..")
-DOPENSSL_CRYPTO_LIBRARY=/usr/lib/libcrypto.so", sourceDir="..")
def build():
@@ -31,5 +36,5 @@ def install():
shelltools.cd("..")
pisitools.dodoc("README", "TODO", "COPYING")
pisitools.domove("/usr/share/qt5/man/man1/qcatool-qt5.1", "/usr/share/man/man1/qcatool-qt5.1")
pisitools.removeDir("/usr/share/qt5")
#pisitools.domove("/usr/share/qt5/man/man1/qcatool-qt5.1", "/usr/share/man/man1/qcatool-qt5.1")
#pisitools.removeDir("/usr/share/qt5")
+9
View File
@@ -18,6 +18,7 @@
<Dependency>nss-devel</Dependency>
<Dependency>doxygen</Dependency>
<Dependency>cmake</Dependency>
<Dependency>openssl-devel</Dependency>
</BuildDependencies>
<Patches>
<!--Patch level="3">qca2-sha2-digest-support-kde-svn-992617.diff</Patch>
@@ -31,6 +32,7 @@
<Dependency versionFrom="5.7.1">qt5-base</Dependency>
<Dependency>nss</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>openssl</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
@@ -56,6 +58,13 @@
</Package>
<History>
<Update release="4">
<Date>2017-03-19</Date>
<Version>2.1.3</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="3">
<Date>2017-03-19</Date>
<Version>2.1.3</Version>