upgrading package: redland 1.0.8 -> 1.0.10

redland/redland.spec

@@ -21,11 +21,6 @@
 ##  SUCH DAMAGE.
 ##
 
-#   package version
-%define       V_raptor           1.4.18
-%define       V_rasqal           0.9.16
-%define       V_redland          1.0.8
-
 #   package information
 Name:         redland
 Summary:      Redland RDF Application Framework
@@ -36,21 +31,19 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        XML
 License:      LGPL/GPL
-Version:      %{V_redland}
-Release:      20080706
+Version:      1.0.10
+Release:      20100111
 
 #   list of sources
-Source0:      http://download.librdf.org/source/raptor-%{V_raptor}.tar.gz
-Source1:      http://download.librdf.org/source/rasqal-%{V_rasqal}.tar.gz
-Source2:      http://download.librdf.org/source/redland-%{V_redland}.tar.gz
+Source0:      http://download.librdf.org/source/redland-%{version}.tar.gz
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130
+BuildPreReq:  OpenPKG, openpkg >= 20040130, pkgconfig
 PreReq:       OpenPKG, openpkg >= 20040130
-BuildPreReq:  libxml, libxslt, pcre, openssl, sqlite
-PreReq:       libxml, libxslt, pcre, openssl, sqlite
+BuildPreReq:  redland-raptor, redland-rasqal, openssl, sqlite, db
+PreReq:       redland-raptor, redland-rasqal, openssl, sqlite, db
 AutoReq:      no
 AutoReqProv:  no
 
@@ -61,109 +54,40 @@ AutoReqProv:  no
     and Serializers for reading and writing RDF; Storage for graphs.
 
 %track
-    prog redland:raptor = {
-        version   = %{V_raptor}
-        url       = http://librdf.org/
-        regex     = raptor-(__VER__)\.tar\.gz
-    }
-    prog redland:rasqal = {
-        version   = %{V_rasqal}
-        url       = http://librdf.org/
-        regex     = rasqal-(__VER__)\.tar\.gz
-    }
-    prog redland:redland = {
-        version   = %{V_redland}
+    prog redland = {
+        version   = %{version}
         url       = http://librdf.org/
         regex     = redland-(__VER__)\.tar\.gz
     }
 
 %prep
-    %setup -q -c
-    %setup -q -D -T -a 1
-    %setup -q -D -T -a 2
+    %setup -q
 
 %build
-    ln -s raptor-%{V_raptor}   raptor
-    ln -s rasqal-%{V_rasqal}   rasqal
-    ln -s redland-%{V_redland} redland
-    ( cd raptor-%{V_raptor}
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags}" \
     LDFLAGS="%{l_ldflags}" \
     ./configure \
-          --prefix=%{l_prefix} \
-          --mandir=%{l_prefix}/man \
-          --datarootdir=%{l_prefix} \
-          --includedir=%{l_prefix}/include/redland \
-          --with-xml2-config=%{l_prefix}/bin/xml2-config \
-          --with-xslt-config=%{l_prefix}/bin/xslt-config \
-          --with-xml-parser=libxml \
-          --with-www=xml \
-          --disable-shared
-      %{l_make} %{l_mflags -O}
-    ) || exit $?
-    ( cd rasqal-%{V_rasqal}
-      CC="%{l_cc}" \
-      CFLAGS="%{l_cflags -O}" \
-      CPPFLAGS="%{l_cppflags}" \
-      LDFLAGS="%{l_ldflags}" \
-      ./configure \
-          --prefix=%{l_prefix} \
-          --mandir=%{l_prefix}/man \
-          --includedir=%{l_prefix}/include/redland \
-          --enable-pcre \
-          --with-pcre-config=%{l_prefix}/bin/pcre-config \
-          --with-regex-library=pcre \
-          --enable-xml2 \
-          --with-xml2-config=%{l_prefix}/bin/xml2-config \
-          --with-raptor=internal \
-          --with-redland=internal \
-          --disable-shared
-      %{l_make} %{l_mflags -O}
-    ) || exit $?
-    ( cd redland-%{V_redland}
-      for subdir in raptor rasqal; do
-          rm -rf $subdir/*
-          ( echo "#!/bin/sh"; echo "exit 0" ) >$subdir/configure; chmod a+x $subdir/configure
-          ( echo "all:"; echo "install:" ) >$subdir/Makefile
-          ln -s ../../$subdir/src $subdir/src
-      done
-      CC="%{l_cc}" \
-      CFLAGS="%{l_cflags -O}" \
-      CPPFLAGS="%{l_cppflags}" \
-      LDFLAGS="%{l_ldflags}" \
-      RAPTOR_CONFIG="`pwd`/../raptor-%{V_raptor}/src/raptor-config" \
-      RASQAL_CONFIG="`pwd`/../rasqal-%{V_rasqal}/src/rasqal-config" \
-      ./configure \
+        --cache-file=config.cache \
         --prefix=%{l_prefix} \
         --mandir=%{l_prefix}/man \
         --includedir=%{l_prefix}/include/redland \
         --enable-release \
         --disable-assertions \
-          --with-raptor=internal \
-          --with-rasqal=internal \
         --with-openssl-digests \
         --with-sqlite=yes \
         --with-sqlite-version=3 \
         --without-threestore \
         --without-mysql \
         --without-postgresql \
+        --disable-gtk-doc \
         --disable-shared
     %{l_make} %{l_mflags -O}
-    ) || exit $?
 
 %install
     rm -rf $RPM_BUILD_ROOT
-    ( cd raptor-%{V_raptor}
-      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
-    ) || exit $?
-    ( cd rasqal-%{V_rasqal}
-      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
-    ) || exit $?
-    ( cd redland-%{V_redland}
     %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
-    ) || exit $?
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gtk-doc
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/gtk-doc