SPECS: glib2.spec - added asneeded patch - use system pcre

qboosh qboosh at pld-linux.org
Wed Oct 24 20:50:08 CEST 2007


Author: qboosh                       Date: Wed Oct 24 18:50:08 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added asneeded patch
- use system pcre

---- Files affected:
SPECS:
   glib2.spec (1.163 -> 1.164) 

---- Diffs:

================================================================
Index: SPECS/glib2.spec
diff -u SPECS/glib2.spec:1.163 SPECS/glib2.spec:1.164
--- SPECS/glib2.spec:1.163	Tue Oct 16 18:52:21 2007
+++ SPECS/glib2.spec	Wed Oct 24 20:50:03 2007
@@ -22,12 +22,12 @@
 Epoch:		1
 License:	LGPL v2+
 Group:		Libraries
-#Source0:	ftp://ftp.gtk.org/pub/glib/2.14/glib-%{version}.tar.bz2
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-%{version}.tar.bz2
+Source0:	ftp://ftp.gtk.org/pub/glib/2.14/glib-%{version}.tar.bz2
 # Source0-md5:	fca5d26c8efea4e6e547c81c801bf67c
 Patch0:		%{name}-makefile.patch
 Patch1:		%{name}-SEGV.patch
 Patch2:		%{name}-noarch.patch
+Patch3:		%{name}-asneeded.patch
 URL:		http://www.gtk.org/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1:1.7
@@ -37,11 +37,13 @@
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.8}
 %{?with_apidocs:BuildRequires:	gtk-doc-automake >= 1.8}
 BuildRequires:	libtool >= 1:1.4.2-9
+BuildRequires:	pcre-devel >= 7.2
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig >= 1:0.14.0
 BuildRequires:	rpmbuild(macros) >= 1.197
 %{!?with_apidocs:BuildRequires:	sed >= 4.0}
 Requires:	iconv
+Requires:	pcre >= 7.2
 Provides:	glib2-libs
 Obsoletes:	glib2-libs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -102,6 +104,7 @@
 Summary(pt_BR.UTF-8):	Conjunto de ferramentas e biblioteca do kit de desenho do GIMP
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	pcre-devel >= 7.2
 
 %description devel
 Header files for the support library for the GIMP's X libraries, which
@@ -161,6 +164,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %if !%{with apidocs}
 sed -e '/SUBDIRS/s/docs//' -i Makefile.am
@@ -181,7 +185,8 @@
 	--%{?with_static_libs:en}%{!?with_static_libs:dis}able-static \
 	--enable-debug=%{?debug:yes} \
 	--enable-man \
-	--enable-threads
+	--enable-threads \
+	--with-pcre=system
 
 %{__make}
 
@@ -240,6 +245,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.164  2007/10/24 18:50:03  qboosh
+- added asneeded patch
+- use system pcre
+
 Revision 1.163  2007/10/16 16:52:21  megabajt
 - updated to 2.14.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/glib2.spec?r1=1.163&r2=1.164&f=u



More information about the pld-cvs-commit mailing list