X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gdome2.spec;h=7b2d649a2f5fa37c5bd58e815d04fb3f25d01c02;hb=refs%2Fheads%2FAC-branch;hp=f5df5b6e1fc228e558fe33fb6c5d1d2b4618bc46;hpb=2543afd2187524a5b2f13d13714adcce6b839357;p=packages%2Fgdome2.git

diff --git a/gdome2.spec b/gdome2.spec
index f5df5b6..7b2d649 100644
--- a/gdome2.spec
+++ b/gdome2.spec
@@ -1,25 +1,20 @@
-#
-# Conditional build:
-%bcond_with	glib1	# use glib 1.2 instead of 2.x
-#
 Summary:	DOM level2 library for accessing XML files
 Summary(pl):	Biblioteka dostêpu do plików XML, DOM poziom 2
 Name:		gdome2
 Version:	0.8.1
-Release:	2
+Release:	6
 License:	LGPL
 Group:		Libraries
 Source0:	http://gdome2.cs.unibo.it/tarball/%{name}-%{version}.tar.gz
 # Source0-md5:	bfc114e59eec50cbda8e4ece751ff022
+Patch0:		%{name}-glib2.patch
 URL:		http://gdome2.cs.unibo.it/
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{?with_glib1:BuildRequires:	glib-devel >= 1.2.10}
-%{!?with_glib1:BuildRequires:	glib2-devel >= 2.2.0}
+BuildRequires:	glib2-devel >= 2.2.0
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 2.4.26
-%{?with_glib1:Requires:	glib >= 1.2.10}
-%{!?with_glib1:Requires:	glib2 >= 2.2.0}
+BuildRequires:	pkgconfig
 Requires:	libxml2 >= 2.4.26
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -62,9 +57,8 @@ gdome2 wspiera r
 Summary:	Development files for gdome2
 Summary(pl):	Pliki nag³ówkowe gdome2
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
-%{?with_glib1:Requires:	glib-devel >= 1.2.10}
-%{!?with_glib1:Requires:	glib2-devel >= 2.2.0}
+Requires:	%{name} = %{version}-%{release}
+Requires:	glib2-devel >= 2.2.0
 Requires:	libxml2-devel >= 2.4.26
 
 %description devel
@@ -112,7 +106,7 @@ gdome2 wspiera r
 Summary:	Static libraries for gdome2
 Summary(pl):	Biblioteki statyczne dla gdome2
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 This package contains static libraries for developing with gdome2.
@@ -123,18 +117,16 @@ oprogramowania opartego o gdome2.
 
 %prep
 %setup -q
+%patch0 -p1
 
-%{!?with_glib1:echo 'AM_DEFUN([AM_PATH_GLIB], [$3])' >> acinclude.m4}
-%{?with_glib1:echo 'AM_DEFUN([AM_PATH_GLIB_2_0], [$3]' >> acinclude.m4}
+echo 'AM_DEFUN([AM_PATH_GLIB], [$3])' >> acinclude.m4
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure \
-	%{!?with_glib1:GLIB_CONFIG="pkg-config glib-2.0"} \
-	%{?with_glib1:--enable-glib-1}
+%configure
 
 %{__make}