LOG New version 0.0.12, drop no longer needed patches

.abf.yml

@@ -1,2 +1,2 @@
 sources:
-  "0ad-0.0.11-alpha-unix-build.tar.xz": b7696e0f6e6b0c3e222aa46b532943af1fe64435
+  0ad-0.0.12-alpha-unix-build.tar.xz: 0a1b58eb3eeaff80dfded165b0c1ad0f00b6c0d1

0ad-gamin.patch

@@ -1,23 +0,0 @@
---- 0ad-r10803-alpha/source/lib/sysdep/os/linux/dir_watch_fam.cpp.orig	2012-01-12 03:19:47.575647830 -0200
-+++ 0ad-r10803-alpha/source/lib/sysdep/os/linux/dir_watch_fam.cpp	2012-01-12 03:48:38.893574156 -0200
-@@ -156,6 +156,8 @@ static void* fam_event_loop(void*)
- 
- Status dir_watch_Add(const OsPath& path, PDirWatch& dirWatch)
- {
-+	char	resolved[PATH_MAX + 1];
-+
- 	// init already failed; don't try again or complain
- 	if(initialized == -1)
- 		return ERR::FAIL;	// NOWARN
-@@ -188,7 +190,10 @@ Status dir_watch_Add(const OsPath& path,
- 	// not worthwhile
- 
- 	FAMRequest req;
--	if(FAMMonitorDirectory(&fc, OsString(path).c_str(), &req, tmpDirWatch.get()) < 0)
-+
-+	FAMNoExists(&fc);
-+
-+	if(FAMMonitorDirectory(&fc, realpath(OsString(path).c_str(), resolved), &req, tmpDirWatch.get()) < 0)
- 	{
- 		debug_warn(L"res_watch_dir failed!");
- 		WARN_RETURN(ERR::FAIL);	// no way of getting error code?

0ad-libxml2.patch

@@ -1,19 +0,0 @@
-diff -up 0ad-0.0.11-alpha/libraries/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.cpp.orig 0ad-0.0.11-alpha/libraries/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.cpp
---- 0ad-0.0.11-alpha/libraries/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.cpp.orig	2012-09-08 09:56:56.532955316 -0300
-+++ 0ad-0.0.11-alpha/libraries/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.cpp	2012-09-08 09:57:27.200987159 -0300
-@@ -523,8 +523,13 @@ bool FArchiveXML::EndExport(fm::vector<u
- 	xmlOutputBufferPtr buf = xmlAllocOutputBuffer(NULL);
- 	xmlNodeDumpOutput(buf, rootNode->doc, rootNode, 0, 0, NULL);
- 
--	outData.resize(buf->buffer->use * sizeof(xmlChar));
--	memcpy(outData.begin(), buf->buffer->content, outData.size());
-+#ifdef  LIBXML2_NEW_BUFFER
-+	outData.resize(xmlOutputBufferGetSize(buf) * sizeof(xmlChar));
-+	memcpy(outData.begin(), xmlOutputBufferGetContent(buf), outData.size());
-+#else
-+	outData.resize(buf->buffer->use * sizeof(xmlChar));
-+	memcpy(outData.begin(), buf->buffer->content, outData.size());
-+#endif
- 
- 	xmlOutputBufferClose(buf);
- 	daeDocument.ReleaseXmlData();

0ad.spec

@@ -22,8 +22,8 @@
 
 Name:		0ad
 Epoch:		1
-Version:	0.0.11
+Version:	0.0.12
-Release:	3
+Release:	1
 # BSD License:
 #	build/premake/*
 #	libraries/valgrind/*		(not built/used)
@@ -65,7 +65,7 @@ BuildRequires:	boost-devel
 BuildRequires:	cmake
 BuildRequires:	desktop-file-utils
 BuildRequires:	devil-devel
-BuildRequires:	gamin-devel
+#BuildRequires:	gamin-devel
 BuildRequires:	gcc-c++
 BuildRequires:	jpeg-devel
 BuildRequires:	libdnet-devel
@@ -91,13 +91,13 @@ BuildRequires:	wxgtku-devel
 # FAMMonitorDirectory fails if passing a relative directory
 # Use FAMNoExists (gamin specific to speed up a little bit initialization
 # as commented in the source)
-Patch0:		%{name}-gamin.patch
+#Patch0:		%{name}-gamin.patch
 
 # http://trac.wildfiregames.com/ticket/1421
 Patch1:		%{name}-rpath.patch
 
 # Build with newer libxml2
-Patch2:		%{name}-libxml2.patch
+#Patch2:		%{name}-libxml2.patch
 
 %description
 0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform
@@ -114,9 +114,9 @@ hobbyist game developers, since 2001.
 #-----------------------------------------------------------------------
 %prep
 %setup -q -n %{name}-%{version}-alpha
-%patch0 -p1
+#patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#patch2 -p1
 
 #-----------------------------------------------------------------------
 %build
@@ -206,67 +206,3 @@ export EXCLUDE_FROM_FULL_STRIP="libAtlasUI_dbg.so libCollada_dbg.so pyrogenesis_
 %{_mandir}/man6/*.6*
 
 
-%changelog
-* Fri Sep 28 2012 Paulo Andrade <pcpa@mandriva.com.br> 1:0.0.11-2
-+ Revision: 817861
-- Do not build s3tc patent infringing code.
-- Remove s3tc from implementation from main tarball.
-- Sync with fedora package.
-- Add patch to allow rebuilding when updating to newer libxml2.
-
-  + Sergey Zhemoitel <serg@mandriva.org>
-    - update to 0.0.11 Alpha
-
-* Fri Jun 29 2012 Bernhard Rosenkraenzer <bero@bero.eu> 1:r11863-0.4
-+ Revision: 807484
-- Update to alpha 10 (aka 11863)
-
-* Sat Mar 31 2012 Bernhard Rosenkraenzer <bero@bero.eu> 1:r11339-0.3
-+ Revision: 788441
-- Rebuild for boost 1.49
-
-* Sat Mar 17 2012 Bernhard Rosenkraenzer <bero@bero.eu> 1:r11339-0.2
-+ Revision: 785456
-- Update to alpha9
-
-  + Paulo Andrade <pcpa@mandriva.com.br>
-    - Correct 0ad.desktop binary path.
-    - Install desktop files in proper directory.
-
-* Sat Jan 14 2012 Paulo Andrade <pcpa@mandriva.com.br> 1:r10803-0.2
-+ Revision: 760793
-- Assume latest 0ad-data is installed in _gamesdatadir.
-- Do not add 0ad libraries to ld library path.
-
-* Thu Jan 12 2012 Paulo Andrade <pcpa@mandriva.com.br> 1:r10803-0.1
-+ Revision: 760257
-- Install binaries in gamesbindir.
-- Install data files in gamesdatadir.
-- Use upstream suggested versioning schema.
-- Use system libraries (but nvtt).
-- Add build mode to make it easier to debug failures.
-
-  + Sergey Zhemoitel <serg@mandriva.org>
-    - add new revision 10803
-    - new revision 10288
-    - fix x86_64 requires lib
-    - fix x86_64 requires lib
-    - add new requires
-    - fix enet
-    - fix requires
-    - imported package 0ad
-    - update revesion to 09786
-
-* Mon Mar 14 2011 Funda Wang <fwang@mandriva.org> 1.0-0.8899.2
-+ Revision: 644467
-- rebuild for new boost
-
-* Mon Feb 14 2011 Guillaume Rousse <guillomovitch@mandriva.org> 1.0-0.8899.1
-+ Revision: 637689
-- new snapshot
-- produce data package from the same snapshot
-
-* Wed Oct 20 2010 Guillaume Rousse <guillomovitch@mandriva.org> 1.0-0.08413.1mdv2011.0
-+ Revision: 587053
-- import 0ad
-