Mercurial > pidgin.yaz

changeset 12550:7f0f68ae1f5a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 14868] Fix the beta version mangling, and detect Mandriva properly now that they've changed their vendor tag committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Sun, 18 Dec 2005 19:03:05 +0000
parents 1e0caf8f40dc
children a22381c9072d
files gaim.spec.in
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gaim.spec.in	Sun Dec 18 18:21:27 2005 +0000
+++ b/gaim.spec.in	Sun Dec 18 19:03:05 2005 +0000
@@ -7,7 +7,7 @@
 %define beta 1
 
 %if 0%{beta}
-%define gaimver %(echo "@VERSION@"|sed -e 's/cvs//')
+%define gaimver %(echo "@VERSION@"|sed -e 's/cvs//; s/beta.*//')
 %else
 %define gaimver @VERSION@
 %endif
@@ -38,7 +38,7 @@
 Requires: perl
 
 # Mandrake 10.1 and lower || Mandrake 10.2 (and higher?)
-%if "%{_vendor}" == "MandrakeSoft" || "%{_vendor}" == "Mandrakesoft"
+%if "%{_vendor}" == "MandrakeSoft" || "%{_vendor}" == "Mandrakesoft" || "%{_vendor}" == "Mandriva"
 # Mandrake/Mandriva requirements
 BuildRequires: libgtk+2.0_0-devel, libnss3-devel, perl-devel
 Obsoletes:  libgaim-remote0