# HG changeset patch # User Stu Tomlinson # Date 1134932585 0 # Node ID 7f0f68ae1f5afc48ee42bad54d311d1b9013d75a # Parent 1e0caf8f40dc472d4c0c2982ffa6acf35ab5a88b [gaim-migrate @ 14868] Fix the beta version mangling, and detect Mandriva properly now that they've changed their vendor tag committer: Tailor Script diff -r 1e0caf8f40dc -r 7f0f68ae1f5a gaim.spec.in --- 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