[jovie] cleanup, source0 snippet

Rex Dieter rdieter at fedoraproject.org
Tue Jan 24 14:35:37 UTC 2012


commit c6c601b488a6a61e30c391a8539c5078c2aba845
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jan 24 08:35:18 2012 -0600

    cleanup, source0 snippet

 .gitignore |    3 ---
 jovie.spec |   34 +++++++++++++++++-----------------
 2 files changed, 17 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2670b15..1ff5bf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-/jovie-4.7.90.tar.bz2
-/jovie-4.7.95.tar.bz2
-/jovie-4.7.97.tar.bz2
 /jovie-4.8.0.tar.bz2
diff --git a/jovie.spec b/jovie.spec
index ec50afc..78849c8 100644
--- a/jovie.spec
+++ b/jovie.spec
@@ -1,38 +1,40 @@
-Name:           jovie
+Name:    jovie
 Version: 4.8.0
 Release: 1%{?dist}
-Summary:        Text to speech support 
-
+Summary: Text to speech support 
 
 # most of the code is GPLv2+ but libkttsd/utils.cpp/h is GPLv2 or at your option GPLv3
-License:        GPLv2 or GPLv3
-URL:            http://accessibility.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/4.7.90/src/jovie-%{version}.tar.bz2
+License: GPLv2 or GPLv3
+URL:     http://accessibility.kde.org/
+%global revision %(echo %{version} | cut -d. -f3)
+%if %{revision} >= 50
+%global stable unstable
+%else
+%global stable stable
+%endif
+Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.bz2
 
-BuildRequires:  desktop-file-utils
-BuildRequires:  kdelibs4-devel >= %{version}
-BuildRequires:  speech-dispatcher-devel
+BuildRequires: desktop-file-utils
+BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: speech-dispatcher-devel
 
 # workaround (hopefully) temporary borkage
 %if 0%{?fedora}
 %ifnarch sparcv9 sparc64
-BuildRequires:  flite-devel
+BuildRequires: flite-devel
 %endif
 %endif
 
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-
-Requires:       festival
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: festival
 
 # when split occured
 Conflicts: kdeaccessibility < 1:4.7.80
 
-
 %description
 Jovie -- KDE Text-to-Speech -- is a subsystem within the KDE desktop
 for conversion of text to audible speech. 
 
-
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
@@ -82,7 +84,6 @@ fi
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
-
 %files
 %doc 
 %{_kde4_bindir}/jovie
@@ -96,7 +97,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 %{_kde4_libdir}/kde4/*.so
 
 %post libs -p /sbin/ldconfig
-
 %postun libs -p /sbin/ldconfig
 
 %files libs


More information about the scm-commits mailing list