- release 13 (by relup.sh)

[packages/3store.git] / 3store.spec

diff --git a/3store.spec b/3store.spec
index 3d6efe28f38797c05b35a1addfd57342853e0385..395962f9eaa3037af9c93cae41bfc22a846ea7d3 100644 (file)
--- a/3store.spec
+++ b/3store.spec
@@ -1,21 +1,29 @@
+#
+# Conditional build:
+%bcond_with    glib2           # use glib2 (default glib)
+#
 Summary:       3store RDF engine
 Summary(pl.UTF-8):     Silnik RDF 3store
 Name:          3store
 Version:       2.2.22
-Release:       6
+Release:       13
 License:       GPL v2+
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/threestore/%{name}-%{version}.tar.gz
 # Source0-md5: 6fa70d2830c82eb030d8888f4da0c86c
 Patch0:                %{name}-ac.patch
+Patch1:                glib2.patch
+Patch2:                format-security.patch
 URL:           http://threestore.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: flex
-BuildRequires: glib-devel
+%{!?with_glib2:BuildRequires:  glib-devel}
+%{?with_glib2:BuildRequires:   glib2-devel}
 BuildRequires: libraptor-devel >= 0.9.10
 BuildRequires: libtool
 BuildRequires: mysql-devel
+%{?with_glib2:BuildRequires:   pkgconfig}
 BuildRequires: readline-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -36,7 +44,8 @@ Group:                Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 # for -lfl
 Requires:      flex
-Requires:      glib-devel
+%{!?with_glib2:Requires:       glib-devel}
+%{?with_glib2:Requires:        glib2-devel}
 Requires:      libraptor-devel >= 0.9.10
 Requires:      mysql-devel
 
@@ -61,6 +70,8 @@ Statyczna biblioteka 3store.
 %prep
 %setup -q
 %patch0 -p1
+%{?with_glib2:%patch1 -p1}
+%patch2 -p1
 
 %build
 %{__libtoolize}