rpms/opal/devel opal.spec,1.38,1.39

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/opal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21962

Modified Files:
	opal.spec 
Log Message:
Fix bird brain commit


Index: opal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opal/devel/opal.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- opal.spec	2 Feb 2009 08:10:41 -0000	1.38
+++ opal.spec	2 Feb 2009 08:22:14 -0000	1.39
@@ -1,7 +1,7 @@
 Name:		opal
 Summary:	Open Phone Abstraction Library
 Version:	3.5.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 URL:		http://www.opalvoip.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.4/%{name}-%{version}.tar.bz2
 Patch0:         opal-ilbc-soname.patch
@@ -72,15 +72,12 @@
 %{_libdir}/pkgconfig/opal.pc
 
 %changelog
-<<<<<<< opal.spec
-* Mon Feb 2  2009 Peter Robinson <pbrobinson at gmail.com> - 3.5.2-4
+* Mon Feb 2  2009 Peter Robinson <pbrobinson at gmail.com> - 3.5.2-5
 - Fix blank soname 
 
-=======
 * Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 3.5.2-4
 - rebuild with new openssl
 
->>>>>>> 1.37
 * Tue Jan 13 2009 Peter Robinson <pbrobinson at gmail.com> - 3.5.2-3
 - Yet another dep that configure doesn't check and it just fails on