summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-10-10 23:52:52 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-10-10 23:52:52 +0200
commitecddfc255d095adf16583b520eb5b9faf0fcf804 (patch)
treef202ee8a32aac8e9acc949e47f44e3f57f4c517c
parent92ba212f91f6654fd182a7429408be35679020ef (diff)
downloadtde-packaging-ecddfc255d095adf16583b520eb5b9faf0fcf804.tar.gz
tde-packaging-ecddfc255d095adf16583b520eb5b9faf0fcf804.zip
RPM Packaging: update tqt3
-rw-r--r--redhat/Makefile.r145
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec2
-rw-r--r--redhat/extras/htdig/htdig.spec (renamed from redhat/3rdparty/htdig/htdig.spec)0
3 files changed, 2 insertions, 5 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 1ce207a10..cc299d719 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -161,7 +161,7 @@ endif
htdig:
# build on Mageia, and CentOS >= 7
ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
- $(call buildpkg,3rdparty/htdig)
+ $(call buildpkg,extras/htdig)
endif
imlib1:
@@ -280,9 +280,6 @@ libtqt-perl: tqtinterface
mlt: tqtinterface
$(call buildpkg,libraries/mlt)
-mlt++: tqtinterface
- $(call buildpkg,libraries/mlt++)
-
pytdeextensions: tqtinterface python-trinity
$(call buildpkg,libraries/pytdeextensions)
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 05392e61b..b8efae18a 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -221,7 +221,7 @@ BuildRequires: libxmu-devel
%if 0%{?suse_version} == 1140
%define xi_devel libXi6-devel
%endif
-%{?%define xi_devel:BuildRequires: %{xi_devel}}
+%{?xi_devel:BuildRequires: %{xi_devel}}
# Xorg support
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
diff --git a/redhat/3rdparty/htdig/htdig.spec b/redhat/extras/htdig/htdig.spec
index 3dcfe7274..3dcfe7274 100644
--- a/redhat/3rdparty/htdig/htdig.spec
+++ b/redhat/extras/htdig/htdig.spec