From da73a2fcaf9e588f4126d9d7938c1479422dcf27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Thu, 20 Mar 2014 21:25:19 +0100 Subject: RPM Packaging: update R14 packages --- .../trinity-desktop/trinity-desktop-14.0.0.spec | 26 ++-------------------- 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec') diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec index 662174c06..22e50b160 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec @@ -27,9 +27,6 @@ Source0: trinity-3.5.13-fedora.repo Source1: trinity-3.5.13-rhel.repo Source2: RPM-GPG-KEY-trinity -Source11: pclinuxos201304-32.jpg -Source12: pclinuxos201304-64.jpg - Requires: trinity-tdeaccessibility >= %{version} Requires: trinity-tdeaddons >= %{version} Requires: trinity-tdeadmin >= %{version} @@ -173,7 +170,9 @@ Requires: trinity-tdeio-umountwrapper Requires: trinity-tdenetworkmanager Requires: trinity-tdepowersave Requires: trinity-tderadio +%if 0%{?pclinuxos} == 0 Requires: trinity-tdesudo +%endif Requires: trinity-tdesvn Requires: trinity-tdmtheme Requires: trinity-tellico @@ -282,22 +281,6 @@ Summary: Yum configuration files for Trinity ########## -%if 0%{?pclinuxos} -%package -n trinity-wallpaper-theme-default -Group: User Interface/Desktops -Summary: Default wallpaper for Trinity - -%description -n trinity-wallpaper-theme-default -%{summary} - -%files -n trinity-wallpaper-theme-default -%defattr(-,root,root,-) -%{tde_datadir}/wallpapers/pclinuxos32.jpg -%{tde_datadir}/wallpapers/pclinuxos64.jpg -%endif - -########## - %prep %build @@ -332,11 +315,6 @@ Summary: Default wallpaper for Trinity %__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-trinity" %endif -# PCLinuxOS wallpaper -%if 0%{?pclinuxos} == 2013 -%__install -D -m 644 "%{SOURCE11}" "%{?buildroot}%{tde_datadir}/wallpapers/pclinuxos32.jpg" -%__install -D -m 644 "%{SOURCE12}" "%{?buildroot}%{tde_datadir}/wallpapers/pclinuxos64.jpg" -%endif %changelog * Mon Jun 03 2013 Francois Andriot - 14.0.0-1 -- cgit v1.2.1