[libmsn/f14] - Rebase to new upstream version - Drop patches (they were already both upstream waiting for this ne

[john5342]

commit 4cae723586023f9073fda383cd5f8b0b92e87c04
Author: John5342 <john5342 at fedorproject.org>
Date:   Wed Nov 9 14:59:12 2011 +0000

    - Rebase to new upstream version
    - Drop patches (they were already both upstream waiting for this new release)
    - No real changes in this version since we already carried all patches except the version change

 .gitignore                     |    2 +-
 libmsn-4.0-beta7-openssl.patch |   15 -
 libmsn-4.1-redirects.patch     |  572 ----------------------------------------
 libmsn.spec                    |   24 +-
 sources                        |    2 +-
 5 files changed, 11 insertions(+), 604 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5287dd6..7b0a6a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-libmsn-4.1.tar.bz2
+/libmsn-4.2.tar.bz2
diff --git a/libmsn.spec b/libmsn.spec
index dd94341..5c14c18 100644
--- a/libmsn.spec
+++ b/libmsn.spec
@@ -1,8 +1,8 @@
 
 Name:		libmsn
 Summary:	Library for connecting to the MSN Messenger service
-Version:	4.1
-Release:	4%{?dist}
+Version:	4.2
+Release:	1%{?dist}
 
 Group:		System Environment/Libraries
 License:	GPLv2
@@ -10,16 +10,6 @@ URL:		http://sourceforge.net/projects/libmsn/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamable patches
-# Patch is already in upstream but not in an official tarball
-Patch50:	libmsn-4.0-beta7-openssl.patch
-
-# Patch is commit 121 from upstream. Fixes an issue where redirects are not dealt with correctly
-# svn co https://libmsn.svn.sourceforge.net/svnroot/libmsn libmsn
-# cd libmsn
-# svn diff -r 120:121 > libmsn-4.1-redirects.patch
-Patch51:	libmsn-4.1-redirects.patch
-
 BuildRequires:	cmake
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
@@ -34,15 +24,14 @@ Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 # should probably try to get this into libmsn.pc pkgconfig deps somehow, but meh -- rex
 Requires:	openssl-devel
+
 %description	devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-
 %prep
 %setup -q -n %{name}-%{version}
-%patch50 -p1 -b .openssl
-%patch51 -b .redirects
+
 
 %build
 
@@ -82,6 +71,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Nov 09 2011 John5342 <john5342 at, fedoraproject.org> 4.2-1
+- Rebase to new upstream version
+- Drop patches (they were already both upstream waiting for this new release)
+- No real changes in this version since we already carried all patches except the version change
+
 * Wed Nov 09 2011 John5342 <john5342 at, fedoraproject.org> 4.1-4
 - Back port a patch to fix redirects
 
diff --git a/sources b/sources
index f1ec909..6badf14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-769d3cf0e5625263fbc23321c1ddfcb0  libmsn-4.1.tar.bz2
+8887196051d2960a9279a5e00c8416a4  libmsn-4.2.tar.bz2