TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RPM Packaging: fix tdeedu on opensuse tumbleweed

Browse Source
pull/3/head
François Andriot 9 years ago
parent a376bc356b
commit ba82d3ca63
2 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File

47
redhat/main/tdeedu/tdeedu-14.0.0.spec
Unescape View File

@ -75,12 +75,12 @@ BuildRequires: update-desktop-files
BuildRequires: brp-check-trinity
%endif
BuildRequires: gcc-c++
BuildRequires: fdupes
# PYTHON support
BuildRequires: python-devel
BuildRequires: python
BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
BuildRequires: fdupes
# BOOST support
BuildRequires: boost-devel
@ -92,6 +92,15 @@ BuildRequires: ocaml(compiler)
BuildRequires: ocaml
%endif
# KIG python scripting support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%if 0%{?suse_version} == 1330
%define with_kig 0
%else
%define with_kig 1
%endif
%endif
Obsoletes: trinity-kdeedu < %{version}-%{release}
Provides: trinity-kdeedu = %{version}-%{release}
Obsoletes: trinity-kdeedu-libs < %{version}-%{release}
@ -161,7 +170,7 @@ Group: System/GUI/Other
%description data
This package contains shared data necessary for running the
educational applications provided with KDE (the K Desktop
educational applications provided with TDE (the Trinity Desktop
Environment).
This package is part of Trinity, as a component of the TDE education module.
@ -275,7 +284,7 @@ Group: System/GUI/Other
%description -n trinity-kalzium-data
This package contains architecture-independent data files for
Kalzium, the KDE periodic table application. This includes pictures
Kalzium, the TDE periodic table application. This includes pictures
of various chemical equipment and of samples of several elements, in
addition to the actual chemical data.
@ -463,7 +472,7 @@ Group: System/GUI/Other
%description -n trinity-kgeography-data
This package contains architecture-independent data files for
KGeography, the geography learning tool for KDE. This includes map
KGeography, the geography learning tool for TDE. This includes map
and flag images.
See the kgeography package for further information.
@ -522,7 +531,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%package -n trinity-kig
Summary: Interactive geometry program for KDE
Summary: Interactive geometry program for TDE
Group: System/GUI/Other
Requires: trinity-tdeedu-data = %{version}-%{release}
@ -559,7 +568,7 @@ This package is part of Trinity, as a component of the TDE education module.
%{tde_tdelibdir}/libkigpart.la
%{tde_tdelibdir}/libkigpart.so
%{tde_tdeappdir}/kig.desktop
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%if 0%{?with_kig}
%{tde_datadir}/apps/katepart/syntax/python-kig.xml
%endif
%{tde_datadir}/apps/kig/
@ -600,7 +609,7 @@ Requires: trinity-tdeedu-data = %{version}-%{release}
#Requires: ttf-kochi-gothic | ttf-kochi-mincho
%description -n trinity-kiten
Kiten is a Japanese reference and study tool for KDE. It is an
Kiten is a Japanese reference and study tool for TDE. It is an
application with multiple functions. Firstly, it is a convenient
English to Japanese and Japanese to English dictionary. Secondly, it
is a Kanji dictionary, with multiple ways to look up specific
@ -730,7 +739,7 @@ Group: System/GUI/Other
%description -n trinity-klettres-data
This package contains architecture-independent data files for
KLettres, the foreign alphabet tutor for KDE. This includes sound
KLettres, the foreign alphabet tutor for TDE. This includes sound
files and graphics.
See the klettres package for further information.
@ -749,7 +758,7 @@ Group: System/GUI/Other
Requires: trinity-tdeedu-data = %{version}-%{release}
%description -n trinity-kmplot
KmPlot is a mathematical function plotter for KDE. It has a powerful
KmPlot is a mathematical function plotter for TDE. It has a powerful
built-in parser. You can plot different functions simultaneously and
combine them to build new functions.
@ -842,7 +851,7 @@ Requires: trinity-kstars-data = %{version}-%{release}
Requires: trinity-indi = %{version}-%{release}
%description -n trinity-kstars
KStars is a graphical desktop planetarium for KDE. It depicts an
KStars is a graphical desktop planetarium for TDE. It depicts an
accurate simulation of the night sky, including stars,
constellations, star clusters, nebulae, galaxies, all planets, the
Sun, the Moon, comets and asteroids. You can see the sky as it
@ -888,7 +897,7 @@ Group: System/GUI/Other
%description -n trinity-kstars-data
This package contains architecture-independent data files for KStars,
the graphical desktop planetarium for KDE. This includes star
the graphical desktop planetarium for TDE. This includes star
catalogues and astronomical images.
See the kstars package for further information.
@ -1106,7 +1115,7 @@ KWordQuiz is a flashcard-based tool that helps you to master new
vocabularies. It may be a language or any other kind of terminology.
KWordQuiz can open several types of vocabulary data. Supported are
kvtml files used by other KDE programs such as KVocTrain, wql files
kvtml files used by other TDE programs such as KVocTrain, wql files
used by WordQuiz for Windows, csv files with comma-separated text,
and xml.gz files created by Pauker (http://pauker.sourceforge.net).
@ -1147,7 +1156,7 @@ Summary: Library for use with Trinity educational apps
Group: System/GUI/Other
%description -n trinity-libtdeedu3
The KDE-based library libtdeedu is used with educational
The TDE-based library libtdeedu is used with educational
applications. It currently provides support for data plotting and
vocabulary items (including a parser for kvtml vocabulary files).
@ -1174,7 +1183,7 @@ Group: Development/Libraries/Other
Requires: trinity-libtdeedu3 = %{version}-%{release}
%description -n trinity-libtdeedu-devel
The KDE-based library libtdeedu is used with educational
The TDE-based library libtdeedu is used with educational
applications. It currently provides support for data plotting and
vocabulary items (including a parser for kvtml vocabulary files).
@ -1209,7 +1218,7 @@ Group: System/GUI/Other
#Requires: kanjidic
%description -n trinity-libkiten1
Kiten is a Japanese reference/study tool for KDE. The library
Kiten is a Japanese reference/study tool for TDE. The library
libkiten contains portions of Kiten that may be useful for other
applications. These portions include dictionary, character lookup
and widget classes.
@ -1255,7 +1264,7 @@ Requires: trinity-libkiten1 = %{version}-%{release}
Requires: trinity-tdelibs-devel >= %{version}
%description -n trinity-libkiten-devel
Kiten is a Japanese reference/study tool for KDE. The library
Kiten is a Japanese reference/study tool for TDE. The library
libkiten contains portions of Kiten that may be useful for other
applications. These portions include dictionary, character lookup
and widget classes.
@ -1395,7 +1404,7 @@ fi
--enable-rpath \
--disable-gcc-hidden-visibility \
\
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%if 0%{?with_kig}
--enable-kig-python-scripting \
%else
--disable-kig-python-scripting \

13
redhat/main/tdeedu/tdeedu-14.0.1-ftbfs.patch
Unescape View File

@ -1,13 +0,0 @@
--- trinity-tdeedu-14.0.1/kstars/configure.in.in.orig 2015-07-31 11:34:32.712141661 -0400
+++ trinity-tdeedu-14.0.1/kstars/configure.in.in 2015-07-31 11:35:49.442314137 -0400
@@ -87,7 +87,9 @@
[have_v4l2=true],
[have_v4l2=false],
[#include <sys/time.h>
- #include <linux/videodev2.h>])
+ extern "C" {
+ #include <linux/videodev2.h>
+ }])
if test x$have_v4l2 = xfalse; then
unset ac_cv_type_struct_v4l2_buffer
AC_CHECK_TYPE([struct v4l2_buffer],
Write Preview
Loading…
Cancel
Save