diff options
| -rw-r--r-- | redhat/components.txt | 6 | ||||
| -rw-r--r-- | redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec | 10 | ||||
| -rwxr-xr-x | redhat/genrpm.sh | 4 | ||||
| -rw-r--r-- | redhat/kdebase/trinity-kdebase-3.5.13.spec | 9 |
4 files changed, 22 insertions, 7 deletions
diff --git a/redhat/components.txt b/redhat/components.txt index 0fd13a935..1cd16cec1 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -5,7 +5,8 @@ dependencies/tqtinterface dependencies/dbus-tqt dependencies/arts trinity-desktop -trinity-settings +#trinity-settings +trinity-live kdelibs kdebase kdebindings @@ -39,7 +40,7 @@ applications/filelight applications/kdiff3 #applications/kuickshow #applications/basket -applications/katapult +#applications/katapult #compizconfig-backend-kconfig applications/kbookreader applications/kdbusnotification @@ -49,3 +50,4 @@ applications/kdesudo applications/digikam applications/konversation applications/ksensors +applications/amarok diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec index 9a2be3b1e..670a6f9d5 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -31,9 +31,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}.tar.gz BuildRequires: gcc-c++ -BuildRequires: dbus-qt-devel +BuildRequires: dbus-devel BuildRequires: tqtinterface-devel +Provides: dbus-qt + %description Dbus TQT Interface @@ -42,6 +44,7 @@ Dbus TQT Interface Requires: %{name} Summary: %{name} - Development files Group: Development/Libraries +Provides: dbus-qt-devel %description devel Development files for %{name} @@ -78,6 +81,9 @@ cd build %{_libdir}/pkgconfig/*.pc %changelog +* Tue Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 +- Updates BuildRequires + * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 - Initial release for RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index 25ea69be1..d54c88c21 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -43,9 +43,11 @@ if [ -z "${VERSION}" ]; then select VERSION in $*; do break; done elif [ -r "${COMP}/$1" ]; then VERSION="$1" + elif [ "${COMP}" = "trinity-live" ]; then + VERSION="3.5.13" else echo "No source tarball found for '${COMP}' !" - continue + exit 0 fi VERSION="${VERSION##${COMP##*/}-}" VERSION="${VERSION%%.tar.gz}" diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index 967f8f3cf..ce45a86c4 100644 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 3 +%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -59,6 +59,8 @@ Patch6: kdebase-3.5.12-halmountoptions.patch Patch7: kdebase-3.5.13-genkdmconf_Xsession_location.patch # [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64 Patch8: kdebase-3.5.13-startkde_ldpreload.patch +# [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes +Patch9: kdebase-3.5.13-mediamanager_ftbfs.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel @@ -180,7 +182,7 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch6 -p1 %patch7 -p1 %patch8 -p1 - +%patch9 -p1 %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -519,6 +521,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/cmake/*.cmake %changelog +* Tue Nov 08 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 +- Fix FTBFS with dbus-tqt + * Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 - Add missing BuildRequires |