diff --git a/.gitignore b/.gitignore index 33c1acd..586d0d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ rasqal-0.9.17.tar.gz +/rasqal-0.9.20.tar.gz diff --git a/rasqal-0.9.17-linking.patch b/rasqal-0.9.17-linking.patch deleted file mode 100644 index 14d0a20..0000000 --- a/rasqal-0.9.17-linking.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN rasqal-0.9.17.old/utils/Makefile.in rasqal-0.9.17/utils/Makefile.in ---- rasqal-0.9.17.old/utils/Makefile.in 2009-12-14 09:45:05.000000000 -0500 -+++ rasqal-0.9.17/utils/Makefile.in 2010-02-14 15:40:04.000000000 -0500 -@@ -285,7 +285,7 @@ man_MANS = roqet.1 - AM_CPPFLAGS = @RASQAL_INTERNAL_CPPFLAGS@ -I$(top_srcdir)/src - AM_CFLAGS = $(MEM) - roqet_SOURCES = roqet.c $(am__append_1) --roqet_LDADD = $(top_builddir)/src/librasqal.la -+roqet_LDADD = -lraptor $(top_builddir)/src/librasqal.la - srxread_SOURCES = srxread.c - srxread_LDADD = $(top_builddir)/src/librasqal.la - EXTRA_DIST = \ diff --git a/rasqal.spec b/rasqal.spec index 666c4c6..0e52dbc 100644 --- a/rasqal.spec +++ b/rasqal.spec @@ -1,24 +1,18 @@ Name: rasqal -Version: 0.9.17 -Release: 3%{?dist} +Version: 0.9.20 +Release: 1%{?dist} Summary: RDF Query Library Group: System Environment/Libraries License: LGPLv2+ or ASL 2.0 URL: http://librdf.org/rasqal/ Source: http://download.librdf.org/source/%{name}-%{version}.tar.gz -# Fix DSO linking error. Note that this is fixed in upstream trunk -# http://bugs.librdf.org/mantis/view.php?id=347 -# But their fix requires an autoreconf cycle. We just do a -# simple hack for the time being. This patch will be dropped -# in the next version after 0.9.17 -Patch0: %{name}-0.9.17-linking.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel BuildRequires: mpfr-devel BuildRequires: pcre-devel -BuildRequires: raptor-devel >= 1.4.18 +BuildRequires: raptor-devel >= 1.4.19 # for the testsuite BuildRequires: perl(XML::DOM) @@ -34,7 +28,6 @@ handles the RDF Data Query Language (RDQL) and SPARQL Query language. Summary: Development files for the Rasqal RDF libraries Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: gtk-doc Requires: pkgconfig Requires: raptor-devel %description devel @@ -43,7 +36,6 @@ Libraries, includes etc to develop with the Rasqal RDF query language library. %prep %setup -q -%patch0 -p1 -b .linking.fix # hack to nuke rpaths %if "%{_libdir}" != "/usr/lib" @@ -102,10 +94,15 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/rasqal.pc %{_mandir}/man1/rasqal-config.1* %{_mandir}/man3/librasqal.3* -%{_datadir}/gtk-doc/html/rasqal/ +%{_datadir}/gtk-doc/ %changelog +* Thu Sep 09 2010 Orcan Ogetbil - 0.9.20-1 +- Update to 0.9.20 +- Drop gtk-doc dependency RHBZ#604413 +- Drop upstreamed DSO linking patch + * Sun Jul 11 2010 Dan HorĂ¡k - 0.9.17-3 - don't fail the whole build due failed checks on s390(x) diff --git a/sources b/sources index 2e3cb42..c4d837d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee65a1c55da27d95f50d1e667b98d1d0 rasqal-0.9.17.tar.gz +c45b6cd784298e264e8757d14355ecce rasqal-0.9.20.tar.gz