diff options
Diffstat (limited to 'redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec')
| -rw-r--r-- | redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec | 63 |
1 files changed, 38 insertions, 25 deletions
diff --git a/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec index 83aa3617a..597505ee4 100644 --- a/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec +++ b/redhat/applications/kdbusnotification/trinity-kdbusnotification-3.5.13.spec @@ -1,26 +1,33 @@ # Default version for this component %define kdecomp kdbusnotification -%define version 0.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" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: a DBUS notification service [Trinity] -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 0.1 +Release: 2%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -29,18 +36,18 @@ Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} +Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz # [kdbusnotification/src/daemon] Missing QT LDFLAGS -Patch0: kdbusnotification-3.5.13-ftbfs_qt_ldlflags.patch +Patch1: kdbusnotification-3.5.13-missing_ldlflags.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils BuildRequires: dbus-glib-devel BuildRequires: gtk2-devel @@ -52,13 +59,13 @@ DBUS notifications via unobtrusive, easily dismissed passive popups. %prep %setup -q -n applications/%{kdecomp} -%patch0 -p1 +%patch1 -p1 -b .ldflags # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -66,19 +73,25 @@ DBUS notifications via unobtrusive, easily dismissed passive popups. %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt \ - --enable-closure + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt \ + --enable-closure %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} @@ -91,8 +104,8 @@ export PATH="%{_bindir}:${PATH}" %files %defattr(-,root,root,-) -%{_bindir}/notification-daemon-tde -%{_datadir}/autostart/kdbusnotification-autostart.desktop +%{tde_bindir}/notification-daemon-tde +%{tde_datadir}/autostart/kdbusnotification-autostart.desktop |