diff options
| -rw-r--r-- | redhat/applications/ksensors/ksensors-14.0.0.spec | 1 | ||||
| -rw-r--r-- | redhat/tdeartwork/tdeartwork-14.0.0.spec | 19 | ||||
| -rw-r--r-- | redhat/tdeutils/tdeutils-14.0.0.spec | 2 | ||||
| -rw-r--r-- | redhat/tdevelop/tdevelop-14.0.0.spec | 5 |
4 files changed, 14 insertions, 13 deletions
diff --git a/redhat/applications/ksensors/ksensors-14.0.0.spec b/redhat/applications/ksensors/ksensors-14.0.0.spec index 4c95539eb..bb3f70a4e 100644 --- a/redhat/applications/ksensors/ksensors-14.0.0.spec +++ b/redhat/applications/ksensors/ksensors-14.0.0.spec @@ -86,7 +86,6 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --includedir=%{tde_tdeincludedir} \ --enable-closure -%__make clean %__make %{?_smp_mflags} diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec index ae60e3781..79d1d153e 100644 --- a/redhat/tdeartwork/tdeartwork-14.0.0.spec +++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec @@ -3,6 +3,8 @@ %define _variant .opt %endif +%define tde_version 14.0.0 + # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -35,7 +37,8 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: cmake >= 2.8 -BuildRequires: trinity-tdebase-devel >= %{version} +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: gettext BuildRequires: esound-devel @@ -129,7 +132,7 @@ technological superiority of the Unix operating system. This metapackage includes a collection of artistic extras (themes, widget styles, screen savers, wallpaper, icons, emoticons and so on) provided -with the official release of KDE. +with the official release of TDE. Homepage: http://artist.kde.org @@ -143,9 +146,9 @@ Group: User Interface/Desktops %description emoticons This package contains several collections of emoticons used by official -and unofficial KDE chat clients, such as Kopete and Konversation. +and unofficial TDE chat clients, such as Kopete and Konversation. -This package is part of KDE, and a component of the KDE artwork module. +This package is part of TDE, and a component of the TDE artwork module. %files emoticons %defattr(-,root,root,-) @@ -158,7 +161,7 @@ Summary: various multimedia goodies released with TDE Group: User Interface/Desktops %description misc -This package contains miscellaneous multimedia goodies for KDE. +This package contains miscellaneous multimedia goodies for TDE. Included are additional TDE sounds and kworldclock themes. This package is part of Trinity, and a component of the TDE artwork module. @@ -201,7 +204,7 @@ Provides: trinity-kdeartwork-icons = %{version}-%{release} %description theme-icon This package contains additional icon themes for Trinity. Icon themes can be -used to customise the appearance of standard icons throughout KDE. They +used to customise the appearance of standard icons throughout TDE. They can be applied using the icon manager in the Trinity Control Centre. This package is part of Trinity, and a component of the TDE artwork module. @@ -336,7 +339,7 @@ This package is part of Trinity, and a component of the TDE artwork module. %package -n trinity-tdescreensaver-xsavers Summary: Trinity hooks for standard xscreensavers Group: User Interface/Desktops -Requires: trinity-tdebase-bin >= 3.5.13 +Requires: trinity-tdebase-bin >= %{tde_version} Requires: xscreensaver Obsoletes: trinity-kscreensaver-xsavers < %{version}-%{release} @@ -648,7 +651,7 @@ This package is part of Trinity, and a component of the TDE artwork module. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" +export CMAKE_INCLUDE_PATH="%{tde_includedir}" export LD_LIBRARY_PATH="%{tde_libdir}" # Specific path for RHEL4 diff --git a/redhat/tdeutils/tdeutils-14.0.0.spec b/redhat/tdeutils/tdeutils-14.0.0.spec index dea9bd648..6307ec81a 100644 --- a/redhat/tdeutils/tdeutils-14.0.0.spec +++ b/redhat/tdeutils/tdeutils-14.0.0.spec @@ -980,7 +980,7 @@ Development files for %{name}. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" +export CMAKE_INCLUDE_PATH="%{tde_includedir}" # Do not build against any "/usr" installed KDE export KDEDIR="%{tde_prefix}" diff --git a/redhat/tdevelop/tdevelop-14.0.0.spec b/redhat/tdevelop/tdevelop-14.0.0.spec index d5ee9853b..8ff3f2478 100644 --- a/redhat/tdevelop/tdevelop-14.0.0.spec +++ b/redhat/tdevelop/tdevelop-14.0.0.spec @@ -569,7 +569,7 @@ Provides: trinity-tdevelop-libs = %{version}-%{release} unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" +export CMAKE_INCLUDE_PATH="%{tde_includedir}" export LD_LIBRARY_PATH="%{tde_libdir}" # Specific path for RHEL4 @@ -586,8 +586,6 @@ pushd c_cpp_reference-2.0.2_for_KDE_3.0 --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ - --with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \ - --with-qt-includes=${QTINC:-${QTDIR}/include} \ --with-extra-libs=%{tde_libdir} popd @@ -623,6 +621,7 @@ cd .. %__mv -f %{?buildroot}%{tde_tdedocdir}/HTML/en/kdevelop/reference %{?buildroot}%{tde_tdedocdir}/HTML/en/tdevelop/ %__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/en/kdevelop + %clean %__rm -rf %{buildroot} |