summaryrefslogtreecommitdiffstats
path: root/redhat/applications
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2014-01-25 20:03:06 +0100
committerFrançois Andriot <[email protected]>2014-01-25 20:03:06 +0100
commitef403b9174a4521b2a3539d777983b21c8752d02 (patch)
treeecc49d7ec969ad3c2c1dc74d3af7c856fedc1d19 /redhat/applications
parentf1a07f9bc2d63e7760411e23f588c78bf4449aa7 (diff)
downloadtde-packaging-ef403b9174a4521b2a3539d777983b21c8752d02.tar.gz
tde-packaging-ef403b9174a4521b2a3539d777983b21c8752d02.zip
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/applications')
-rw-r--r--redhat/applications/adept/adept-14.0.0.spec13
-rw-r--r--redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec4
2 files changed, 12 insertions, 5 deletions
diff --git a/redhat/applications/adept/adept-14.0.0.spec b/redhat/applications/adept/adept-14.0.0.spec
index ebd0ef00b..b271314ce 100644
--- a/redhat/applications/adept/adept-14.0.0.spec
+++ b/redhat/applications/adept/adept-14.0.0.spec
@@ -44,7 +44,9 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
+BuildRequires: desktop-file-util
+
+BuildRequires: libapt-front-devel
Requires: %{name}-manager = %{version}-%{release}
Requires: %{name}-installer = %{version}-%{release}
@@ -165,10 +167,15 @@ export PATH="%{tde_bindir}:${PATH}"
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
+ \
--disable-rpath \
- --enable-closure
+ --enable-closure \
+ \
+ --with-extra-includes=%{_includedir}/tqt3 \
+ \
+ --enable-adept
-%__make %{?_smp_mflags} -C adept
+%__make %{?_smp_mflags}
%install
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
index 3bd3a64b3..e08ab5f2b 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec
@@ -128,8 +128,8 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
%files
%defattr(-,root,root,-)
%doc README TODO
-%{tde_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu
-%{tde_sysconfdir}/xdg/menus/system-settings.menu
+%{tde_sysconfdir}/xdg/menus/applications-merged/tde-system-settings-merge.menu
+%{tde_sysconfdir}/xdg/menus/tde-system-settings.menu
%{tde_bindir}/systemsettings
%{tde_datadir}/applications/tde/audioencoding.desktop
%{tde_datadir}/applications/tde/defaultapplication.desktop