summaryrefslogtreecommitdiffstats
path: root/redhat/extras/trinity-desktop
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-10-02 20:22:28 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-10-02 20:22:28 +0200
commitcc3858bd8844988a5c49afb168be806168bea7e0 (patch)
tree12bbf83a9826e9daf9259c0b7d8feada197d8751 /redhat/extras/trinity-desktop
parent8af8d5c2c458ec76eca7074bed52ea49e73b477c (diff)
parent47864a912b26acfd0a5c4c0a8be6bfd8df892dd8 (diff)
downloadtde-packaging-cc3858bd8844988a5c49afb168be806168bea7e0.tar.gz
tde-packaging-cc3858bd8844988a5c49afb168be806168bea7e0.zip
RPM Packaging: updates
Diffstat (limited to 'redhat/extras/trinity-desktop')
-rw-r--r--redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec32
1 files changed, 6 insertions, 26 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 e8e46792e..f45e193a5 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
@@ -93,7 +93,6 @@ Requires: trinity-digikam
Requires: trinity-dolphin
Requires: trinity-filelight
Requires: trinity-gwenview
-Requires: trinity-gwenview-i18n
Requires: trinity-k3b
Requires: trinity-k9copy
Requires: trinity-kaffeine
@@ -205,6 +204,7 @@ Obsoletes: trinity-tde-guidance-powermanager
# Debian/Ubuntu specific ...
#Requires: trinity-adept
+#Requires: trinity-gwenview-i18n
# Beagle does not exist anymore, so Kerry is now useless.
#Requires: trinity-kerry
@@ -310,7 +310,7 @@ Summary: Default wallpaper for Trinity
%__sed %{SOURCE0} \
-e 's/\$releasever/%{fedora}/g' \
-e 's/-fedora/-f%{fedora}/g' \
- >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo"
+ >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity.repo"
%endif
# RHEL configuration for YUM
@@ -318,10 +318,11 @@ Summary: Default wallpaper for Trinity
%if 0%{?rhel}
%__sed %{SOURCE1} \
-e 's/\$releasever/%{rhel}/g' \
- >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo"
+ >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity.repo"
%endif
%if 0%{?fedora} || 0%{?rhel}
+%__sed -i %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo -e "s|3.5.13|r14|g"
%__chmod 644 %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo
%endif
@@ -337,26 +338,5 @@ Summary: Default wallpaper for Trinity
%endif
%changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Update to version 3.5.13.2
-- Add GPG signing key
-
-* Mon Oct 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Update to version 3.5.13.1
-
-* Mon Aug 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
-- Add 'applications' subpackage
-
-* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
-- Updates to reflect new packages names
-- Add Mageia 2 support
-- Removes 'extras' packages
-
-* Wed Jun 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
-- Enable mirrorlist
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
-- Fix repo files name and content
-
-* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
-- Add 'repo' package
+* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial build for TDE R14