SPECS: gdome2.spec - rel 5; always build with glib2

[arekm]

Author: arekm                        Date: Sun Oct 16 20:25:13 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 5; always build with glib2

---- Files affected:
SPECS:
   gdome2.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/gdome2.spec
diff -u SPECS/gdome2.spec:1.22 SPECS/gdome2.spec:1.23
--- SPECS/gdome2.spec:1.22	Sun Oct 16 20:25:16 2005
+++ SPECS/gdome2.spec	Sun Oct 16 22:25:07 2005
@@ -1,27 +1,21 @@
 # $Revision$, $Date$
-#
-# 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:	4
+Release:	5
 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
 BuildRequires:	pkgconfig
-%{?with_glib1:Requires:	glib >= 1.2.10}
-%{!?with_glib1:Requires:	glib2 >= 2.2.0}
 Requires:	libxml2 >= 2.4.26
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -65,8 +59,7 @@
 Summary(pl):	Pliki nagłówkowe gdome2
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-%{?with_glib1:Requires:	glib-devel >= 1.2.10}
-%{!?with_glib1:Requires:	glib2-devel >= 2.2.0}
+Requires:	glib2-devel >= 2.2.0
 Requires:	libxml2-devel >= 2.4.26
 
 %description devel
@@ -125,18 +118,16 @@
 
 %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}
 
@@ -179,6 +170,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2005/10/16 20:25:07  arekm
+- rel 5; always build with glib2
+
 Revision 1.22  2005/10/16 18:25:16  darekr
 - strict deps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gdome2.spec?r1=1.22&r2=1.23&f=u