summaryrefslogtreecommitdiffstats
path: root/redhat/extras
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-03-20 21:25:19 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2014-03-20 21:25:19 +0100
commitda73a2fcaf9e588f4126d9d7938c1479422dcf27 (patch)
tree0ed081587a87c528e947658fd78380309f8f5039 /redhat/extras
parent4ce928ecce29cc2891fa6b7fdbd36385b1cead00 (diff)
downloadtde-packaging-da73a2fcaf9e588f4126d9d7938c1479422dcf27.tar.gz
tde-packaging-da73a2fcaf9e588f4126d9d7938c1479422dcf27.zip
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/extras')
-rw-r--r--redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec26
1 files changed, 2 insertions, 24 deletions
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 <francois.andriot@free.fr> - 14.0.0-1