- 0.9.13, updated system-raptor patch

- removed obsolete amfix,system-repat patches

Changed files:
    redland-amfix.patch -> 1.2
    redland-system-raptor.patch -> 1.2
    redland-system-repat.patch -> 1.2
    redland.spec -> 1.8

diff --git a/redland-amfix.patch b/redland-amfix.patch
deleted file mode 100644 (file)
index 2e59f9c..0000000
--- a/redland-amfix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- redland-0.9.12/repat/Makefile.am.orig      2002-09-06 20:00:12.000000000 +0200
-+++ redland-0.9.12/repat/Makefile.am   2003-05-22 23:18:13.000000000 +0200
-@@ -1,10 +1,8 @@
--noinst_LIBRARIES = librepat.a
- noinst_LTLIBRARIES = librepat.la
- 
- CPPFLAGS=@CPPFLAGS@ @LIBRDF_XML_CPPFLAGS@
- CFLAGS=@CFLAGS@ @REPAT_FLAGS@
- 
--librepat_a_SOURCES = rdfparse.c rdfparse.h
- librepat_la_SOURCES = rdfparse.c rdfparse.h
- 
- noinst_PROGRAMS = rdfdump rdftest
---- redland-0.9.12/raptor/configure.in.orig    2003-02-12 13:38:50.000000000 +0100
-+++ redland-0.9.12/raptor/configure.in 2003-05-22 23:21:25.000000000 +0200
-@@ -104,14 +104,9 @@
- 
- # was AC_REPLACE_FUNCS(strcasecmp) but strcasecmp has two alternatives:
- # the other non-standard function stricmp or a local alternative
--LIBOBJS=
--LTLIBOBJS=
- if test $ac_cv_func_stricmp = no -a $ac_cv_func_stricmp = no; then
--  LIBOBJS="$LIBOBJS strcasecmp.o"
--  LTLIBOBJS="$LTLIBOBJS strcasecmp.lo"
-+  AC_LIBOBJ([strcasecmp])
- fi
--AC_SUBST(LIBOBJS)
--AC_SUBST(LTLIBOBJS)
- 
- 
- AC_MSG_CHECKING(whether need to declare optind)

diff --git a/redland-system-raptor.patch b/redland-system-raptor.patch
index ee9da0a4af7194579c48491813f49a5f35011a4d..722f91c49c815b2e3ad519fc2d9f2d04e2add7c5 100644 (file)
--- a/redland-system-raptor.patch
+++ b/redland-system-raptor.patch
@@ -1,5 +1,5 @@
---- redland-0.9.12/configure.in.orig   2003-01-31 12:07:51.000000000 +0100
-+++ redland-0.9.12/configure.in        2003-05-22 23:10:38.000000000 +0200
+--- redland-0.9.13/configure.ac.orig   2003-01-31 12:07:51.000000000 +0100
++++ redland-0.9.13/configure.ac        2003-05-22 23:10:38.000000000 +0200
 @@ -629,8 +629,7 @@
      PARSER_SRCS="$PARSER_SRCS rdf_parser_$parser.c"
  
@@ -10,68 +10,146 @@
      fi
  
      n=HAVE_${uname}_RDF_PARSER
---- redland-0.9.12/Makefile.am.orig    2003-02-12 18:55:10.000000000 +0100
-+++ redland-0.9.12/Makefile.am 2003-05-22 23:14:29.000000000 +0200
+--- redland-0.9.13/Makefile.am.orig    2003-02-12 18:55:10.000000000 +0100
++++ redland-0.9.13/Makefile.am 2003-05-22 23:14:29.000000000 +0200
 @@ -23,7 +23,7 @@
  noinst_SCRIPTS = redland-src-config
  
  # Subdirectories to build/install etc.
--SUBDIRS=@SD@ repat raptor librdf examples utils
-+SUBDIRS=@SD@ repat librdf raptor examples utils
+-SUBDIRS=raptor librdf examples utils demos @SD@
++SUBDIRS=librdf raptor examples utils demos @SD@
  CONFIG_SUBDIRS=raptor
  # Subdirectories to use for distribution
  DIST_SUBDIRS=librdf docs examples \
---- redland-0.9.12/raptor/Makefile.am.orig     2003-02-13 00:50:02.000000000 +0100
-+++ redland-0.9.12/raptor/Makefile.am  2003-05-22 23:13:47.000000000 +0200
-@@ -20,25 +20,15 @@
+--- redland-0.9.13/raptor/Makefile.am.orig     2003-08-23 23:13:37.000000000 +0200
++++ redland-0.9.13/raptor/Makefile.am  2003-09-07 01:03:32.647791880 +0200
+@@ -20,29 +20,18 @@
  
  
  bin_PROGRAMS = rapper
 -bin_SCRIPTS = raptor-config
--noinst_SCRIPTS = raptor-src-config
--lib_LTLIBRARIES = libraptor.la
 +noinst_SCRIPTS = raptor-config raptor-src-config
+ noinst_SCRIPTS = raptor-src-config
+-lib_LTLIBRARIES = libraptor.la
  
 -include_HEADERS = raptor.h ntriples.h
 +noinst_HEADERS = raptor.h ntriples.h raptor_internal.h win32_config.h
  
 -noinst_HEADERS = raptor_internal.h win32_config.h
 -
--man_MANS = rapper.1 libraptor.3
+-man_MANS = rapper.1 libraptor.3 raptor-config.1
 +man_MANS = rapper.1
  
- rapper_SOURCES = rdfdump.c
--rapper_LDADD = libraptor.la @REDLAND_LIBS@
-+rapper_LDADD = -lraptor @REDLAND_LIBS@
- rapper_DEPENDENCIES = @REDLAND_LIBS@
+ rapper_SOURCES = rdfdump.c raptor_getopt.h
+-rapper_LDADD = libraptor.la @RAPPER_EXTRA_OBJS@ @REDLAND_LIBS@
+-rapper_DEPENDENCIES = libraptor.la @RAPPER_EXTRA_OBJS@ @REDLAND_LIBS@
++rapper_LDADD = -lraptor @RAPPER_EXTRA_OBJS@ @REDLAND_LIBS@
++rapper_DEPENDENCIES = @RAPPER_EXTRA_OBJS@ @REDLAND_LIBS@
+ EXTRA_rapper_SOURCES = getopt.c
+ 
 -libraptor_la_SOURCES = raptor_parse.c ntriples_parse.c \
 -raptor_uri.c raptor_libxml.c raptor_win32.c raptor_locator.c \
--raptor_namespace.c raptor_qname.c raptor_general.c raptor_utf8.c
--
+-raptor_namespace.c raptor_qname.c raptor_general.c raptor_utf8.c \
+-raptor_www.c raptor_set.c raptor_xml.c raptor_sax2.c \
+-raptor_identifier.c raptor_xml_writer.c
 -libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@
 -libraptor_la_LIBADD = @LTLIBOBJS@
- 
+-
  EXTRA_DIST=ChangeLog \
  README      NEWS      LICENSE.txt \
---- redland-0.9.12/examples/Makefile.am.orig   2003-01-03 13:16:27.000000000 +0100
-+++ redland-0.9.12/examples/Makefile.am        2003-05-22 23:26:31.000000000 +0200
+ README.html NEWS.html LICENSE.html INSTALL.html \
+@@ -104,23 +104,23 @@
+ # Some people need a little help ;-)
+ test: check
+ 
+-raptor_uri_test: $(srcdir)/raptor_uri.c libraptor.la
+-      $(LINK) $(DEFS) $(CPPFLAGS) -I$(srcdir) -I. -DSTANDALONE $(srcdir)/raptor_uri.c libraptor.la $(LIBS)
++raptor_uri_test: $(srcdir)/raptor_uri.c
++      $(LINK) $(DEFS) $(CPPFLAGS) -I$(srcdir) -I. -DSTANDALONE $(srcdir)/raptor_uri.c -lraptor $(LIBS)
+ 
+-raptor_namespace_test: $(srcdir)/raptor_namespace.c libraptor.la
+-      $(LINK) $(DEFS) $(CPPFLAGS) -I$(srcdir) -I. -DSTANDALONE $(srcdir)/raptor_namespace.c libraptor.la $(LIBS) @REDLAND_LIBS@
++raptor_namespace_test: $(srcdir)/raptor_namespace.c
++      $(LINK) $(DEFS) $(CPPFLAGS) -I$(srcdir) -I. -DSTANDALONE $(srcdir)/raptor_namespace.c -lraptor $(LIBS) @REDLAND_LIBS@
+ 
+ strcasecmp_test: $(srcdir)/strcasecmp.c
+       $(LINK) $(DEFS) $(CPPFLAGS) -I$(srcdir) -I. -DSTANDALONE $(srcdir)/strcasecmp.c
+ 
+-raptor_www_test: $(srcdir)/raptor_www_test.c libraptor.la
+-      $(LINK) $(DEFS) $(CPPFLAGS) -I$(srcdir) -I. -DSTANDALONE $(srcdir)/raptor_www_test.c libraptor.la $(LIBS) @REDLAND_LIBS@
++raptor_www_test: $(srcdir)/raptor_www_test.c
++      $(LINK) $(DEFS) $(CPPFLAGS) -I$(srcdir) -I. -DSTANDALONE $(srcdir)/raptor_www_test.c -lraptor $(LIBS) @REDLAND_LIBS@
+ 
+-raptor_set_test: $(srcdir)/raptor_set.c libraptor.la
+-      $(LINK) $(DEFS) $(CPPFLAGS) -I$(srcdir) -I. -DSTANDALONE $(srcdir)/raptor_set.c libraptor.la $(LIBS) @REDLAND_LIBS@
++raptor_set_test: $(srcdir)/raptor_set.c
++      $(LINK) $(DEFS) $(CPPFLAGS) -I$(srcdir) -I. -DSTANDALONE $(srcdir)/raptor_set.c -lraptor $(LIBS) @REDLAND_LIBS@
+ 
+-raptor_xml_test: $(srcdir)/raptor_xml.c libraptor.la
+-      $(LINK) $(DEFS) $(CPPFLAGS) -I$(srcdir) -I. -DSTANDALONE $(srcdir)/raptor_xml.c libraptor.la $(LIBS) @REDLAND_LIBS@
++raptor_xml_test: $(srcdir)/raptor_xml.c
++      $(LINK) $(DEFS) $(CPPFLAGS) -I$(srcdir) -I. -DSTANDALONE $(srcdir)/raptor_xml.c -lraptor $(LIBS) @REDLAND_LIBS@
+ 
+ 
+ deb: distcheck
+--- redland-0.9.13/examples/Makefile.am.orig   2003-01-03 13:16:27.000000000 +0100
++++ redland-0.9.13/examples/Makefile.am        2003-05-22 23:26:31.000000000 +0200
 @@ -15,7 +15,7 @@
  examples: $(EXAMPLES)
  
- CPPFLAGS=-I$(top_srcdir)/librdf
--LDFLAGS=@LIBRDF_LDFLAGS@ $(top_builddir)/librdf/librdf.la $(top_builddir)/raptor/libraptor.la
-+LDFLAGS=@LIBRDF_LDFLAGS@ $(top_builddir)/librdf/librdf.la
- LIBS=@LIBRDF_LIBS@
+ AM_CPPFLAGS=-I$(top_srcdir)/librdf
+-AM_LDFLAGS=@LIBRDF_LDFLAGS@ $(top_builddir)/librdf/librdf.la $(top_builddir)/raptor/libraptor.la
++AM_LDFLAGS=@LIBRDF_LDFLAGS@ $(top_builddir)/librdf/librdf.la
+ LIBS=@LIBS@ @LIBRDF_LIBS@
  
  example1_SOURCES = example1.c
+@@ -31,13 +31,13 @@
+ 
+ 
+ redland_dbus_SOURCES = redland_dbus.c
+-redland_dbus_LDADD=$(top_builddir)/librdf/librdf.la $(top_builddir)/raptor/libraptor.la
++redland_dbus_LDADD=$(top_builddir)/librdf/librdf.la -lraptor
+ redland_dbus_CFLAGS=$(shell pkg-config --cflags dbus-1 glib-2.0 dbus-glib-1 gthread)
+ redland_dbus_LDFLAGS=$(shell pkg-config --libs dbus-1 glib-2.0 dbus-glib-1 gthread)
+-redland_dbus_DEPENDENCIES = @LIBRDF_LDFLAGS@ $(top_builddir)/librdf/librdf.la $(top_builddir)/raptor/libraptor.la
++redland_dbus_DEPENDENCIES = @LIBRDF_LDFLAGS@ $(top_builddir)/librdf/librdf.la
+ 
+ # redland_gui_SOURCES = redland_gui.c
+-# redland_gui_LDADD=$(top_builddir)/librdf/librdf.la $(top_builddir)/raptor/libraptor.la
++# redland_gui_LDADD=$(top_builddir)/librdf/librdf.la -lraptor
+ # redland_gui_CFLAGS=$(shell pkg-config --cflags gtk+-2.0)
+ # redland_gui_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
+-# redland_gui_DEPENDENCIES = @LIBRDF_LDFLAGS@ $(top_builddir)/librdf/librdf.la $(top_builddir)/raptor/libraptor.la
++# redland_gui_DEPENDENCIES = @LIBRDF_LDFLAGS@ $(top_builddir)/librdf/librdf.la
 --- redland-0.9.12/utils/Makefile.am.orig      2003-02-12 11:28:42.000000000 +0100
 +++ redland-0.9.12/utils/Makefile.am   2003-05-22 23:30:11.000000000 +0200
 @@ -5,7 +5,7 @@
- EXTRA_DIST=update-api-0912.pl
+ EXTRA_DIST=update-api-0912.pl $(man_MANS)
  
- CPPFLAGS=-I$(top_srcdir)/librdf
--LDFLAGS=@LIBRDF_LDFLAGS@ $(top_builddir)/librdf/librdf.la $(top_builddir)/raptor/libraptor.la
-+LDFLAGS=@LIBRDF_LDFLAGS@ $(top_builddir)/librdf/librdf.la
- LIBS=@LIBRDF_LIBS@
+ AM_CPPFLAGS=-I$(top_srcdir)/librdf
+-AM_LDFLAGS=@LIBRDF_LDFLAGS@ $(top_builddir)/librdf/librdf.la $(top_builddir)/raptor/libraptor.la
++AM_LDFLAGS=@LIBRDF_LDFLAGS@ $(top_builddir)/librdf/librdf.la
+ LIBS=@LIBS@ @LIBRDF_LIBS@
  
  redland_db_upgrade_SOURCES = db_upgrade.c
+--- redland-0.9.13/raptor/examples/Makefile.am.orig    2003-04-15 21:47:30.000000000 +0200
++++ redland-0.9.13/raptor/examples/Makefile.am 2003-09-07 01:50:55.716579728 +0200
+@@ -34,14 +34,14 @@
+ AM_CPPFLAGS=-I$(top_srcdir)
+ 
+ raptor_abort_SOURCES = raptor_abort.c
+-raptor_abort_LDADD=$(top_builddir)/libraptor.la @REDLAND_LIBS@
+-raptor_abort_DEPENDENCIES = $(top_builddir)/libraptor.la @REDLAND_LIBS@
++raptor_abort_LDADD=-lraptor @REDLAND_LIBS@
++raptor_abort_DEPENDENCIES = @REDLAND_LIBS@
+ 
+ grapper_SOURCES = grapper.c
+-grapper_LDADD=$(top_builddir)/libraptor.la @REDLAND_LIBS@
++grapper_LDADD=-lraptor @REDLAND_LIBS@
+ grapper_CFLAGS=$(shell pkg-config --cflags gtk+-2.0)
+ grapper_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
+-grapper_DEPENDENCIES = $(top_builddir)/libraptor.la @REDLAND_LIBS@
++grapper_DEPENDENCIES = @REDLAND_LIBS@
+ 
+ 
+ 

diff --git a/redland-system-repat.patch b/redland-system-repat.patch
deleted file mode 100644 (file)
index b812573..0000000
--- a/redland-system-repat.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nur redland-0.9.12.orig/configure.in redland-0.9.12/configure.in
---- redland-0.9.12.orig/configure.in   2003-05-23 21:15:06.000000000 +0200
-+++ redland-0.9.12/configure.in        2003-05-23 21:17:50.000000000 +0200
-@@ -900,10 +900,7 @@
- fi
- 
- if test $need_repat = 1; then
--  # Always have local copy
--  SD="$SD repat"
--  LIBRDF_INTERNAL_CPPFLAGS="-I\$(top_srcdir) $LIBRDF_INTERNAL_CPPFLAGS"
--  LIBRDF_INTERNAL_LIBS="\$(top_builddir)/repat/librepat.la $LIBRDF_INTERNAL_LIBS"
-+  LIBRDF_INTERNAL_LIBS="-lrepat $LIBRDF_INTERNAL_LIBS"
- fi
- 
- 
-diff -Nur redland-0.9.12.orig/Makefile.am redland-0.9.12/Makefile.am
---- redland-0.9.12.orig/Makefile.am    2003-05-23 21:15:06.000000000 +0200
-+++ redland-0.9.12/Makefile.am 2003-05-23 21:18:11.000000000 +0200
-@@ -23,7 +23,7 @@
- noinst_SCRIPTS = redland-src-config
- 
- # Subdirectories to build/install etc.
--SUBDIRS=@SD@ repat librdf raptor examples utils
-+SUBDIRS=@SD@ librdf raptor examples utils
- CONFIG_SUBDIRS=raptor
- # Subdirectories to use for distribution
- DIST_SUBDIRS=librdf docs examples \

diff --git a/redland.spec b/redland.spec
index 140b567b5392c2ef495e1925b394d9fc4a189eab..8d4b05311d220ab3a16ae0963b6b63c3046bd1f2 100644 (file)
--- a/redland.spec
+++ b/redland.spec
@@ -2,23 +2,20 @@
 Summary:       Redland - a library that provides a high-level interface for RDF
 Summary(pl):   Redland - biblioteka udostêpniaj±ca wysokopoziomowy interfejs do RDF
 Name:          redland
-Version:       0.9.12
+Version:       0.9.13
 Release:       0.1
 License:       LGPL v2 or MPL 1.1
 Group:         Libraries
-# Source0-md5: 545ffc5e1da2e240392b0dbe32afa821
 Source0:       http://www.redland.opensource.ac.uk/dist/source/%{name}-%{version}.tar.gz
+# Source0-md5: 8ae0f6e001d84c4381cd91f28b498282
 Patch0:                %{name}-system-raptor.patch
-Patch1:                %{name}-amfix.patch
-Patch2:                %{name}-system-repat.patch
 URL:           http://www.redland.opensource.ac.uk/
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: autoconf >= 2.53
+BuildRequires: automake >= 1.6
 BuildRequires: db-devel
 BuildRequires: libraptor-devel
 BuildRequires: libtool
 BuildRequires: openssl-devel
-BuildRequires: repat-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -45,9 +42,8 @@ Summary:      Headers for Redland RDF library
 Summary(pl):   Pliki nag³ówkowe biblioteki Redland RDF
 Group:         Development/Libraries
 Requires:      %{name} = %{version}
-Requires:      libraptor-devel
 Requires:      db-devel
-Requires:      repat-devel
+Requires:      libraptor-devel
 
 %description devel
 Headers for Redland RDF library.
@@ -82,8 +78,6 @@ Testowy program parsera Raptor RDF ze wsparciem dla Redland RDF.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -108,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# don't want this here (already in libraptor-devel)
+rm -f $RPM_BUILD_ROOT%{_pkgconfigdir}/raptor.pc
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -119,6 +116,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog FAQS.html LICENSE.html NEWS.html README.html RELEASE.html TODO.html
 %attr(755,root,root) %{_bindir}/redland-db-upgrade
 %attr(755,root,root) %{_libdir}/librdf.so.*.*.*
+%{_mandir}/man1/redland-db-upgrade.1*
 
 %files devel
 %defattr(644,root,root,755)
@@ -129,6 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/librdf.h
 %{_includedir}/rdf_*.h
 %{_includedir}/redland.h
+%{_mandir}/man1/redland-config.1*
 %{_mandir}/man3/redland.3*
 
 %files static