summaryrefslogtreecommitdiffstats
path: root/redhat/applications
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2018-05-13 13:35:09 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2018-05-13 13:35:09 +0200
commit5475bd3f14d1ea60a04ed2694989f2c1f9339010 (patch)
tree3b8b0ea997a335ca92093b98b3edea2e479175ee /redhat/applications
parent35859abe41040ab12ea19636471ec6fc0e7686e2 (diff)
downloadtde-packaging-5475bd3f14d1ea60a04ed2694989f2c1f9339010.tar.gz
tde-packaging-5475bd3f14d1ea60a04ed2694989f2c1f9339010.zip
RPM packaging: cleanup old koffice patches
Diffstat (limited to 'redhat/applications')
-rw-r--r--redhat/applications/koffice/admin-fix-parallel-test.diff11
-rw-r--r--redhat/applications/koffice/koffice-3.5.13.2-fix_kformula_ftbfs.patch11
-rw-r--r--redhat/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch15
-rw-r--r--redhat/applications/koffice/koffice-3.5.13.2.spec7
4 files changed, 0 insertions, 44 deletions
diff --git a/redhat/applications/koffice/admin-fix-parallel-test.diff b/redhat/applications/koffice/admin-fix-parallel-test.diff
deleted file mode 100644
index 9f6f46ba8..000000000
--- a/redhat/applications/koffice/admin-fix-parallel-test.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh.automake113 2013-06-26 22:35:42.000000000 +0200
-+++ trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh 2013-08-29 22:27:18.546349736 +0200
-@@ -123,7 +123,7 @@
- fi
-
- echo "*** Creating Makefile templates"
--$AUTOMAKE || exit 1
-+$AUTOMAKE --add-missing || exit 1
-
- if test "$UNSERMAKE" = no; then
- echo "*** Postprocessing Makefile templates"
diff --git a/redhat/applications/koffice/koffice-3.5.13.2-fix_kformula_ftbfs.patch b/redhat/applications/koffice/koffice-3.5.13.2-fix_kformula_ftbfs.patch
deleted file mode 100644
index 14e65f1cc..000000000
--- a/redhat/applications/koffice/koffice-3.5.13.2-fix_kformula_ftbfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-koffice-3.5.13.2/lib/kformula/creationstrategy.h.ORI 2013-08-17 16:45:10.505854525 +0200
-+++ trinity-koffice-3.5.13.2/lib/kformula/creationstrategy.h 2013-08-17 16:45:15.120749288 +0200
-@@ -86,7 +86,7 @@
- */
- class OrdinaryCreationStrategy : public ElementCreationStrategy {
- public:
-- virtual BasicElement* createElement( TQString type, const TQDomElement& element = 0 );
-+ virtual BasicElement* createElement( TQString type, const TQDomElement& element );
-
- virtual TextElement* createTextElement( const TQChar& ch, bool symbol=false );
- virtual EmptyElement* createEmptyElement();
diff --git a/redhat/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch b/redhat/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch
deleted file mode 100644
index f375078cf..000000000
--- a/redhat/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- trinity-koffice-3.5.13.2/lib/kross/configure.in.in.ori 2013-08-24 20:57:39.878623151 +0200
-+++ trinity-koffice-3.5.13.2/lib/kross/configure.in.in 2013-08-24 20:58:50.132123615 +0200
-@@ -42,6 +42,12 @@
- fi
- fi
- if test -z "$RUBY_VERSION"; then
-+ RUBY_VERSION=`$PKGCONFIG ruby-2.0 --modversion 2>/dev/null`
-+ if test -n "$RUBY_VERSION"; then
-+ RUBY_CFLAGS=`$PKGCONFIG ruby-2.0 --cflags`
-+ fi
-+ fi
-+ if test -z "$RUBY_VERSION"; then
- # pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h
- if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
- # rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1
diff --git a/redhat/applications/koffice/koffice-3.5.13.2.spec b/redhat/applications/koffice/koffice-3.5.13.2.spec
index 9d9ef3319..b620d022d 100644
--- a/redhat/applications/koffice/koffice-3.5.13.2.spec
+++ b/redhat/applications/koffice/koffice-3.5.13.2.spec
@@ -50,10 +50,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch1: koffice-3.5.13.2-fix_kformula_ftbfs.patch
-Patch2: koffice-3.5.13.2-fix_ruby2_detection.patch
-Patch3: admin-fix-parallel-test.diff
-
# BuildRequires: world-devel ;)
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
@@ -1057,9 +1053,6 @@ This package is part of the TDE Office Suite.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .ftbfs
-%patch2 -p1 -b .ruby2
-%patch3 -p1 -b .automake113
# use LGC variant instead
%__sed -i.dejavu-lgc \