qtermwidget5:fixed conflict
This commit is contained in:
@@ -34,6 +34,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="8">
|
||||
<Date>2017-02-27</Date>
|
||||
<Version>5.29.0</Version>
|
||||
<Comment>Rebuild for new Toolchain.</Comment>
|
||||
<Name>Stefan Gronewold(groni)</Name>
|
||||
<Email>groni@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="7">
|
||||
<Date>2016-12-20</Date>
|
||||
<Version>5.29.0</Version>
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Licensed under the GNU General Public License, version 3.
|
||||
# See the file http://www.gnu.org/licenses/gpl.txt
|
||||
|
||||
from pisi.actionsapi import cmaketools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import get
|
||||
from pisi.actionsapi import shelltools
|
||||
|
||||
def setup():
|
||||
shelltools.makedirs("build")
|
||||
shelltools.cd("build")
|
||||
cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DBUILD_DESIGNER_PLUGIN=0 \
|
||||
-DUSE_QT5=true", sourceDir="..")
|
||||
|
||||
def build():
|
||||
shelltools.cd("build")
|
||||
cmaketools.make()
|
||||
|
||||
def install():
|
||||
shelltools.cd("build")
|
||||
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||
pisitools.domove("/usr/lib64/*", "usr/lib/")
|
||||
pisitools.removeDir("/usr/lib64")
|
||||
|
||||
shelltools.cd("..")
|
||||
pisitools.dodoc("AUTHORS", "README")
|
||||
@@ -221,7 +221,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="8">
|
||||
<Date>2017-02-05</Date>
|
||||
<Date>2017-02-27</Date>
|
||||
<Version>10.0</Version>
|
||||
<Comment>Release bump.</Comment>
|
||||
<Name>Stefan Gronewold(groni)</Name>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>HTTP and WebDAV client library</Summary>
|
||||
<Description>neon is an HTTP and WebDAV client library with a C interface; providing a high-level interface to HTTP and WebDAV methods along with a low-level interface for HTTP request handling.</Description>
|
||||
<Archive sha1sum="9e6297945226f90d66258b7ee05f757ff5cea10a" type="targz">http://www.webdav.org/neon/neon-0.30.0.tar.gz</Archive>
|
||||
<Archive sha1sum="d1c020f96731135263476ebaa72b2da07c4727cd" type="targz">http://www.webdav.org/neon/neon-0.30.2.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>openssl-devel</Dependency>
|
||||
<Dependency>expat-devel</Dependency>
|
||||
@@ -54,6 +54,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2017-02-24</Date>
|
||||
<Version>0.30.2</Version>
|
||||
<Comment>Version Bump</Comment>
|
||||
<Name>Ayhan Yalçınsoy</Name>
|
||||
<Email>ayhanyalcinsoy@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-06-09</Date>
|
||||
<Version>0.30.0</Version>
|
||||
|
||||
Reference in New Issue
Block a user