diff --git a/SOURCES/purple-fedora-prefs.xml b/SOURCES/purple-fedora-prefs.xml deleted file mode 100644 index 997b2c9..0000000 --- a/SOURCES/purple-fedora-prefs.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SPECS/pidgin.spec b/SPECS/pidgin.spec index b46ae61..099802e 100644 --- a/SPECS/pidgin.spec +++ b/SPECS/pidgin.spec @@ -6,21 +6,11 @@ %{?!fedora:%global fedora 0} # Map RHEL to Fedora version -%if 0%{?rhel} == 4 -%global fedora 3 -%global dist .el4 -%endif -%if 0%{?rhel} == 5 -%global fedora 6 -%global dist .el5 -%endif %if 0%{?rhel} == 6 %global fedora 12 -%global dist .el6 %endif %if 0%{?rhel} == 7 %global fedora 19 -%global dist .el7 %endif # Define variables to use in conditionals @@ -123,7 +113,7 @@ Name: pidgin Version: 2.10.7 -Release: 22%{?dist} +Release: 23%{?dist} License: GPLv2+ and GPLv2 and MIT # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls # GPLv2 - silc & novell prpls @@ -807,6 +797,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Aug 19 2014 Ray Strode 2.10.7-23 +- Stop mucking with dist +- Drop support for really old rhel + Resolves: #1028568 + * Mon Feb 03 2014 Matthew Barnes - 2.10.7-22.el7 - Fix regression in CVE-2013-6483.