RPM Packaging: update some packages

pull/3/head
François Andriot 10 years ago
parent c64029af7a
commit e6514292ce

@ -87,7 +87,8 @@ great on your desktop.
%build %build
unset QTDIR; . /etc/profile.d/qt3.sh unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
# Warning: --enable-final causes FTBFS # Warning: --enable-final causes FTBFS

@ -114,6 +114,7 @@ done
%doc AUTHORS COPYING README TODO ChangeLog USINGTORK %doc AUTHORS COPYING README TODO ChangeLog USINGTORK
%{tde_bindir}/tork %{tde_bindir}/tork
%{tde_bindir}/torkarkollon %{tde_bindir}/torkarkollon
%{tde_bindir}/usewithtor
%{tde_tdeappdir}/tork.desktop %{tde_tdeappdir}/tork.desktop
%{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithfirefox.desktop %{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithfirefox.desktop
%{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithkonqueror.desktop %{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithkonqueror.desktop

@ -15,11 +15,6 @@
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ # Please submit bugfixes or comments via http:/www.trinitydesktop.org/
# #
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE variables # TDE variables
%define tde_version 14.0.0 %define tde_version 14.0.0
%define tde_prefix /opt/trinity %define tde_prefix /opt/trinity
@ -27,13 +22,17 @@
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
%define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdeincludedir %{tde_includedir}/tde
%define _docdir %{tde_datadir}/doc %define _docdir %{tde_datadir}/doc
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
Name: trinity-arts Name: trinity-arts
Epoch: 1 Epoch: 2
Version: 1.5.10 Version: 1.5.10
Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
Summary: ARTS (analog realtime synthesizer) - the TDE sound system Summary: ARTS (analog realtime synthesizer) - the TDE sound system

@ -47,14 +47,11 @@ AutoReq: no
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# Main patch: lots of updates for TDE R14.0.0 BuildRequires: trinity-arts-devel >= 1:1.5.10
Patch1: tde-i18n-14.0.0-extra_translations.patch BuildRequires: trinity-tdelibs-devel >= %{tde_version}
Patch2: tde-i18n-14.0.0-updates.patch
BuildRequires: findutils BuildRequires: findutils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
%description %description
%{summary}. %{summary}.
@ -684,10 +681,6 @@ Provides: trinity-kde-i18n-Chinese-Big5 = %{version}-%{release}
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
# Patches for French translations
%patch1 -p1
%patch2 -p1
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB

@ -5,10 +5,10 @@
fi fi
+# Default Start Button icon for TDE +# Default Start Button icon for TDE
+if [ ! -e $tdehome/share/config/kickerrc ]; then +if [ ! -e "$tdehome/share/config/kickerrc" ]; then
+ if [ -r "%{tde_starticon}" ]; then + if [ -r "%{tde_starticon}" ]; then
+ [ -d "$tdehome/share/config" ] || mkdir -p "$tdehome/share/config" + [ -d "$tdehome/share/config" ] || mkdir -p "$tdehome/share/config"
+ cat <<EOF >$tdehome/share/config/kickerrc + cat <<EOF >"$tdehome/share/config/kickerrc"
+[KMenu] +[KMenu]
+CustomIcon=%{tde_starticon} +CustomIcon=%{tde_starticon}
+EOF +EOF

@ -1010,7 +1010,6 @@ exit 1
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
unset JAVA_HOME ||: unset JAVA_HOME ||:
%{?java_home:JAVA_HOME=%{java_home}; export JAVA_HOME} %{?java_home:JAVA_HOME=%{java_home}; export JAVA_HOME}

@ -1321,7 +1321,6 @@ Provides: trinity-kdeedu-devel = %{version}-%{release}
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Specific path for RHEL4 # Specific path for RHEL4
if [ -d "/usr/X11R6" ]; then if [ -d "/usr/X11R6" ]; then

@ -1107,7 +1107,7 @@ update-desktop-database 2> /dev/null || :
########## ##########
%if 0%{?suse_version} || 0%{?pclinuxos} %if 0%{?pclinuxos}
%debug_package %debug_package
%endif %endif

@ -968,7 +968,7 @@ Development files for %{name}.
########## ##########
%if 0%{?suse_version} || 0%{?pclinuxos} %if 0%{?pclinuxos}
%debug_package %debug_package
%endif %endif
@ -1025,7 +1025,7 @@ fi
-DWITH_SNMP=ON \ -DWITH_SNMP=ON \
-DWITH_SENSORS=ON \ -DWITH_SENSORS=ON \
-DWITH_XMMS=ON \ -DWITH_XMMS=ON \
-DWITH_KNEWSTUFF=ON \ -DWITH_TDENEWSTUFF=ON \
-DBUILD_ALL=ON \ -DBUILD_ALL=ON \
%{?!build_klaptopdaemon:-DBUILD_KLAPTOPDAEMON=OFF} \ %{?!build_klaptopdaemon:-DBUILD_KLAPTOPDAEMON=OFF} \
.. ..

@ -41,9 +41,6 @@ Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2 Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2
Source5: hi48-app-kxsldbg.png Source5: hi48-app-kxsldbg.png
Patch0: tdewebdev-14.0.0-ftbfs.patch
Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@ -491,9 +488,6 @@ Requires: trinity-kommander-devel = %{version}-%{release}
%prep %prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -a 1 -a 2 -a 3 -a 4 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -a 1 -a 2 -a 3 -a 4
%patch0 -p1 -b .ftbfs
%patch1 -p1 -b .kxsldbg-icons
rm -rf lib/compatibility
%__install -m644 -p %{SOURCE5} kxsldbg/ %__install -m644 -p %{SOURCE5} kxsldbg/
%if 0%{?build_kxsldbg} == 0 %if 0%{?build_kxsldbg} == 0
@ -508,11 +502,10 @@ rm -rf lib/compatibility
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Specific path for RHEL4 # Specific path for RHEL4
if [ -d "/usr/X11R6" ]; then if [ -d "/usr/X11R6" ]; then
export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi fi
# Warning: GCC visibility causes FTBFS [Bug #1285] # Warning: GCC visibility causes FTBFS [Bug #1285]

Loading…
Cancel
Save