From df4b0dcd67804c4853ef5bc315a2f11f16305adc795ebae30c60d15d99da28fc Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Mon, 19 Sep 2011 11:47:20 +0000
Subject: [PATCH] Update to raptor v2 2.0.4

OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/raptor?expand=0&rev=6
---
 baselibs.conf         |  2 +-
 curl-types.patch      | 12 ------------
 raptor-1.4.21.tar.bz2 |  3 ---
 raptor.changes        | 11 +++++++++++
 raptor.spec           | 25 +++++++++++--------------
 raptor2-2.0.4.tar.bz2 |  3 +++
 6 files changed, 26 insertions(+), 30 deletions(-)
 delete mode 100644 curl-types.patch
 delete mode 100644 raptor-1.4.21.tar.bz2
 create mode 100644 raptor2-2.0.4.tar.bz2

diff --git a/baselibs.conf b/baselibs.conf
index 8e07074..78ce446 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1 @@
-libraptor1
+libraptor2
diff --git a/curl-types.patch b/curl-types.patch
deleted file mode 100644
index c960417..0000000
--- a/curl-types.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/raptor_internal.h
-===================================================================
---- src/raptor_internal.h.orig
-+++ src/raptor_internal.h
-@@ -852,7 +852,6 @@ int raptor_utf8_is_nfc(const unsigned ch
- 
- #ifdef RAPTOR_WWW_LIBCURL
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #endif
- 
diff --git a/raptor-1.4.21.tar.bz2 b/raptor-1.4.21.tar.bz2
deleted file mode 100644
index a4c6faa..0000000
--- a/raptor-1.4.21.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:668cb44e54dbfc8f5a67a197d15ce11131a91501915c191ea48edf4822c14687
-size 1213412
diff --git a/raptor.changes b/raptor.changes
index 4873d25..63209a2 100644
--- a/raptor.changes
+++ b/raptor.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Sep 19 11:41:09 UTC 2011 - tittiatcoke@gmail.com
+
+- update to raptor2 v2.0.4
+  + RDF/JSON parser now supports YAJL V2
+  + Support libcurl 7.21.7 that removed the curl/types.h header
+  + TRiG parser now supports the optional ':' in 'uri : { }' syntax
+  + WWW module now supports setting SSL client side certificates
+  + various bugfixes
+  + see also http://librdf.org/raptor/RELEASE.html#rel2_0_4
+
 -------------------------------------------------------------------
 Thu Aug 11 19:07:13 UTC 2011 - aj@suse.de
 
diff --git a/raptor.spec b/raptor.spec
index 4f32383..76ac673 100644
--- a/raptor.spec
+++ b/raptor.spec
@@ -21,13 +21,12 @@
 Name:           raptor
 BuildRequires:  curl-devel gtkdoc libxml2-devel libxslt-devel pkg-config
 Summary:        RDF Parser Toolkit
-Version:        1.4.21
-Release:        9
+Version:        2.0.4
+Release:        1
 License:        LGPLv2.1+ ; ASLv..
 Group:          System/Libraries
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        %{name}2-%{version}.tar.bz2
 Source1:        baselibs.conf
-Patch1:         curl-types.patch
 Url:            http://www.redland.opensource.ac.uk/raptor/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -39,12 +38,12 @@ Authors:
 --------
     Dave Beckett <dave@dajobe.org>
 
-%package -n libraptor1
+%package -n libraptor2
 License:        LGPLv2.1+ ; ASLv..
 Summary:        RDF Parser Toolkit
 Group:          System/Libraries
 
-%description -n libraptor1
+%description -n libraptor2
 Raptor is the RDF Parser Toolkit for Redland that provides a set of
 standalone RDF parsers, generating triples from RDF/XML or N-Triples.
 
@@ -56,7 +55,7 @@ Authors:
 License:        LGPLv2.1+ ; ASLv..
 Summary:        Development package for the raptor library
 Group:          Development/Libraries/C and C++
-Requires:       libraptor1 = %{version} glibc-devel
+Requires:       libraptor2 = %{version} glibc-devel
 Requires:       raptor = %{version}
 Provides:       raptor-devel = %{version}
 Obsoletes:      raptor-devel < %{version}
@@ -71,12 +70,10 @@ Authors:
 
 %prep
 %setup -q
-%patch1 -p0
 
 %build
-autoreconf -fiv
 %configure --disable-static --with-pic --with-html-dir=%{_docdir}
-%{__make} %{?jobs:-j%jobs}
+%__make %{?_smp_flags}
 
 %install
 %{__make} DESTDIR="%{buildroot}" install
@@ -89,9 +86,9 @@ export MALLOC_CHECK_=2
 %{__make} check
 unset MALLOC_CHECK_
 
-%post -n libraptor1 -p /sbin/ldconfig
+%post -n libraptor2 -p /sbin/ldconfig
 
-%postun -n libraptor1 -p /sbin/ldconfig
+%postun -n libraptor2 -p /sbin/ldconfig
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -110,8 +107,8 @@ unset MALLOC_CHECK_
 %{_bindir}/*-config
 %{_libdir}/pkgconfig/*.pc
 
-%files -n libraptor1
+%files -n libraptor2
 %defattr(-,root,root)
-%{_libdir}/libraptor.so.1*
+%{_libdir}/libraptor.so.2*
 
 %changelog
diff --git a/raptor2-2.0.4.tar.bz2 b/raptor2-2.0.4.tar.bz2
new file mode 100644
index 0000000..7d7a503
--- /dev/null
+++ b/raptor2-2.0.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb9ede0f52949d566edae02228a4c450727affe6a1df91b8afd60e7499cada11
+size 1215949