summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFran├žois Andriot <albator78@libertysurf.fr>2016-01-02 00:48:06 +0100
committerFran├žois Andriot <albator78@libertysurf.fr>2016-01-02 00:48:06 +0100
commita376bc356bdd19244def31ec55ceaa3ffbde60b8 (patch)
tree4e0e5c66d4c4ef2dc4087a616ba6a0f0847cf6b3
parent01ffadc1e1bc202b642b6af2aab624324985984f (diff)
downloadtde-packaging-a376bc356bdd19244def31ec55ceaa3ffbde60b8.tar.gz
tde-packaging-a376bc356bdd19244def31ec55ceaa3ffbde60b8.zip
RPM Packaging: update koffice
-rw-r--r--redhat/Makefile.r142
-rw-r--r--redhat/applications/kaffeine/kaffeine-14.0.0.spec2
-rw-r--r--redhat/applications/koffice/koffice-14.0.0.spec8
-rw-r--r--redhat/buildenv.sh8
4 files changed, 6 insertions, 14 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 351970855..b179230d0 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -491,7 +491,7 @@ knowit: tdebase
knutclient: tdebase
$(call buildpkg,applications/knutclient)
-koffice: tdebase wv2
+koffice: tdebase tdegraphics wv2
$(call buildpkg,applications/koffice)
konversation: tdebase
diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
index ba24586ee..190ff4914 100644
--- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec
+++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
@@ -158,7 +158,7 @@ BuildRequires: libxine-devel
# LAME support
%if 0%{?opensuse_bs} == 0
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 5
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel}
%define with_lame 1
%if 0%{?mgaversion} || 0%{?mdkversion}
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index b8f5c504d..92044819f 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -1129,12 +1129,6 @@ export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux"
-e "/TDEApplication/ s|\");|\", true, true, true);|"
%endif
-# FTBFS on Fedora 22
-%if 0%{?fedora} >= 22
-%__sed -i "lib/kross/ruby/rubyinterpreter.cpp" \
- -e "s|rb_set_safe_level|//rb_set_safe_level|"
-%endif
-
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -1227,5 +1221,3 @@ rm -f %{buildroot}%{tde_libdir}/libkugar*.so
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.6.3-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
index 1c36bcf6f..2f82a1a40 100644
--- a/redhat/buildenv.sh
+++ b/redhat/buildenv.sh
@@ -19,7 +19,7 @@ export DIST="$( "${TDE_GITBASEPKG}/build/rpmdist.sh" --dist )"
alias cdrpm='cd ~/rpmbuild/RPMS/RPMS${DIST}'
# Build a single tarball (execute from GIT directory)
-alias tdp4='TARGET=14.0.2 SUFFIX=0 TARBALL_DIR=${TDE_TARBALLS}/main COMPRESS=gzip ${TDE_GITBASESRC}/scripts/create_tarball'
+alias tdp4='TARGET=${TDE_VERSION} SUFFIX=0 TARBALL_DIR=${TDE_TARBALLS}/main COMPRESS=gzip ${TDE_GITBASESRC}/scripts/create_tarball'
# Rebuild all tarballs
if [ -x /usr/bin/pigz ]; then
@@ -38,17 +38,17 @@ grp3() {
}
grp4() {
- build_rpm_package.sh "${1}" "14.0.2"
+ build_rpm_package.sh "${1}" "${TDE_VERSION}"
}
# Check if tarballs are more recent than installed packages
checknew() {
- find ~/tde/tde-tarballs/14.0.2 -name "trinity-*.tar.gz" | while read f; do
+ find ~/tde/tde-tarballs/${TDE_VERSION} -name "trinity-*.tar.gz" | while read f; do
TAR="${f##*/}"
NAME="${TAR%-*}"
if rpm -q "${NAME}" &>/dev/null; then
- set $(rpm -q --qf "%{name} 14.0.2 %{release}" ${NAME} )
+ set $(rpm -q --qf "%{name} ${TDE_VERSION} %{release}" ${NAME} )
B="$1-$2~${3#*_}"
A=${TAR%.tar.gz}
B=${B%.opt}