rpms/sim/devel .cvsignore, 1.2, 1.3 sim.spec, 1.12, 1.13 sources, 1.2, 1.3

[Pavel Alexeev]

Author: hubbitus

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

Modified Files:
	.cvsignore sim.spec sources 
Log Message:
Fix FBFS on Fedora12 mass rebuild http://article.gmane.org/gmane.linux.redhat.fedora.devel/114737
https://developer.berlios.de/bugs/?func=detailbug&group_id=4482&bug_id=15875




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	30 Sep 2008 09:32:52 -0000	1.2
+++ .cvsignore	18 Jun 2009 11:54:41 -0000	1.3
@@ -1 +1,2 @@
-sim-0.9.5-SVN20080923rev2261.tar.bz2
+sim-0.9.5-SVN20090616rev2730.tar.bz2
+sim-0.9.5svn-fix-automake-versioncompare.patch


Index: sim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/sim.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sim.spec	26 Feb 2009 01:06:27 -0000	1.12
+++ sim.spec	18 Jun 2009 11:54:42 -0000	1.13
@@ -1,11 +1,11 @@
 %bcond_without kde
-%define SVNdate 20080923
-%define SVNrev 2261
+%define SVNdate 20090616
+%define SVNrev 2730
 
 Name: 		sim
 Version: 		0.9.5
-Release:		0.16.%{SVNdate}svn%{SVNrev}rev%{?dist}
-#svn checkout -r %{SVNrev} svn://svn.berlios.de/sim-im/trunk; tar -cjf '%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.bz2' trunk
+Release:		0.17.%{SVNdate}svn%{SVNrev}rev%{?dist}
+#svn export -r %{SVNrev} svn://svn.berlios.de/sim-im/trunk; find -iname '*win32*' -exec rm -r {} \; ; tar -cjf '%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.bz2' trunk
 Source0:		%{name}-%{version}-SVN%{SVNdate}rev%{SVNrev}.tar.bz2
 Summary:		Multiprotocol Instant Messenger
 Summary(de):	Multiprotokoll Instant Messenger
@@ -15,6 +15,9 @@ Group:		Applications/Internet
 URL:			http://sim-im.berlios.de/
 BuildRequires:	autoconf >= 2.52, automake >= 1.5
 BuildRequires:	zlib-devel, libjpeg-devel, expat-devel, flex, libart_lgpl-devel, libpng-devel, gettext, libXScrnSaver-devel
+BuildRequires:	openssl-devel, pcre-devel >= 3.9, arts-devel >= 1.0, libxml2-devel, libxslt-devel, boost-devel
+BuildRequires:	zip desktop-file-utils
+Requires:		openssl, arts >= 1.0
 %if %{with kde}
 %if %{fedora} == 8
 BuildRequires:	kdebase-devel >= 3.0.0, kdelibs-devel >= 3.0.0
@@ -23,14 +26,22 @@ Requires:		kdenetwork >= 3.0.0
 BuildRequires:	kdebase3-devel >= 3.0.0, kdelibs3-devel >= 3.0.0
 %endif
 %endif
-BuildRequires:	qt-devel >= 3.0.0, openssl-devel, pcre-devel >= 3.9, arts-devel >= 1.0, libxml2-devel, libxslt-devel, boost-devel
-BuildRequires:	zip desktop-file-utils
-Requires:		qt >= 3.0.0, openssl, arts >= 1.0
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if %{fedora} > 9
+Requires:		qt3 >= 3.0.0
+BuildRequires:	qt3-devel >= 3.0.0
+%else
+Requires:		qt >= 3.0.0
+BuildRequires:	qt-devel >= 3.0.0
+%endif
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(postun):	/sbin/ldconfig
 Requires(post):	/sbin/ldconfig
 
+#https://developer.berlios.de/bugs/?func=detailbug&group_id=4482&bug_id=15875
+Patch0:		sim-0.9.5svn-fix-automake-versioncompare.patch
+
 %description
 SIM (Simple Instant Messenger) is a plugins-based open-
 source instant messenger that supports various protocols
@@ -63,6 +74,8 @@ http://sim-im.org/
 
 %prep
 %setup -q -n trunk
+%patch0 -p0 -b .vercmp
+
 make -f admin/Makefile.common
 
 %build
@@ -127,6 +140,12 @@ fi
 %{_datadir}/services/
 
 %changelog
+* Wed Jun 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.5-0.17.20090616svn2730rev
+- Fix FBFS on mass-rebuild in Fedora 12 ( http://article.gmane.org/gmane.linux.redhat.fedora.devel/114737 )
+- Update to fresh svn.
+- In tarball creation use "svn export" instead of "svn checkout". Delete win32 stuff.
+- Add patch0 - sim-0.9.5svn-fix-automake-versioncompare.patch ( https://developer.berlios.de/bugs/?func=detailbug&group_id=4482&bug_id=15875 )
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-0.16.20080923svn2261rev
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sim/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	30 Sep 2008 09:32:52 -0000	1.2
+++ sources	18 Jun 2009 11:54:42 -0000	1.3
@@ -1 +1,2 @@
-10108228cc561672f21acfe315468264  sim-0.9.5-SVN20080923rev2261.tar.bz2
+82b2f7d26fa5727ce3e6aba3af7a27d9  sim-0.9.5-SVN20090616rev2730.tar.bz2
+ddc71a5bba18325a00dd515ad58815a4  sim-0.9.5svn-fix-automake-versioncompare.patch