From 57adfa2208585fa404c7d4d7a1f23da6b9959a3a Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Fri, 29 Aug 2014 23:16:38 +0100
Subject: [PATCH] Update to 0.4.22

---
 .gitignore | 14 ++------------
 orc.spec   | 40 ++++++++++++++--------------------------
 sources    |  2 +-
 3 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index ee3bad6..ce0b998 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,2 @@
-orc-0.4.6.tar.gz
-orc-0.4.7.tar.gz
-/orc-0.4.9.tar.gz
-/orc-0.4.10.tar.gz
-/orc-0.4.11.tar.gz
-/orc-0.4.12.tar.gz
-/orc-0.4.13.tar.gz
-/orc-0.4.14.tar.gz
-/orc-0.4.15.tar.gz
-/orc-0.4.16.tar.gz
-/orc-0.4.17.tar.gz
-/orc-0.4.18.tar.gz
+/orc-0.*.tar.gz
+/orc-0.*.tar.bz2
diff --git a/orc.spec b/orc.spec
index d9baefa..3a3bb8f 100644
--- a/orc.spec
+++ b/orc.spec
@@ -1,20 +1,20 @@
 Name:		orc
-Version:	0.4.18
-Release:	3%{?dist}
+Version:	0.4.22
+Release:	1%{?dist}
 Summary:	The Oil Run-time Compiler
 
 Group:		System Environment/Libraries
 License:	BSD
 URL:		http://cgit.freedesktop.org/gstreamer/orc/
-Source0:	http://code.entropywave.com/download/orc/orc-%{version}.tar.gz
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+# Source0:	http://code.entropywave.com/download/orc/orc-%{version}.tar.gz
+# Tarfile created using git
+# git clone git://anongit.freedesktop.org/gstreamer/orc
+# git archive --format=tar --prefix=%{name}-%{version}/ %{name}-%{version} | bzip2 > %{name}-%{version}.tar.bz2
+Source0:	%{name}-%{version}.tar.bz2
 
 BuildRequires:	gtk-doc, libtool
 
-# Upstream bugs: https://bugs.freedesktop.org/show_bug.cgi?id=41446
-Patch1:		0001-Use-a-subdirectory-for-temporary-files.patch
-Patch2:		0002-Add-compiler-option-for-ENABLE_USER_CODEMEM.patch
-
 %description
 Orc is a library and set of tools for compiling and executing
 very simple programs that operate on arrays of data.  The "language"
@@ -52,23 +52,18 @@ Requires:	pkgconfig
 The Orc compiler, to produce optimized code.
 
 
-
 %prep
 %setup -q
-%patch1 -p1 -b .subdir
-%patch2 -p1 -b .condtmp
-
-autoreconf -vif
+NOCONFIGURE=1 autoreconf -vif
 
 
 %build
 %configure --disable-static --enable-gtk-doc --enable-user-codemem
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 
 %install
-rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
 
 # Remove unneeded files.
@@ -78,12 +73,8 @@ rm -rf %{buildroot}/%{_libdir}/orc
 touch -r stamp-h1 %{buildroot}%{_includedir}/%{name}-0.4/orc/orc-stdint.h   
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %check
-%ifnarch s390 s390x ppc ppc64 %{arm} i686
+%ifnarch s390 s390x ppc %{power64} %{arm} i686
 make check
 %endif
 
@@ -94,19 +85,15 @@ make check
 %postun -p /sbin/ldconfig
 
 
-
 %files
-%defattr(-,root,root,-)
 %doc COPYING README
 %{_libdir}/liborc-*.so.*
 %{_bindir}/orc-bugreport
 
 %files doc
-%defattr(-,root,root,-)
 %doc %{_datadir}/gtk-doc/html/orc/
 
 %files devel
-%defattr(-,root,root,-)
 %doc examples/*.c
 %{_includedir}/%{name}-0.4/
 %{_libdir}/liborc-*.so
@@ -114,12 +101,13 @@ make check
 %{_datadir}/aclocal/orc.m4
 
 %files compiler
-%defattr(-,root,root,-)
 %{_bindir}/orcc
 
 
-
 %changelog
+* Fri Aug 29 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.4.22-1
+- Update to 0.4.22
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.18-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 51fe5b9..667f03e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1a2552e8d127526c48d644fe6437b377  orc-0.4.18.tar.gz
+a130c227ded6e314f31a6fd75267d77a  orc-0.4.22.tar.bz2