Author: megabajt Date: Sat Dec 22 23:23:59 2007 GMT Module: SPECS Tag: DEVEL ---- Log message: - merged changes from HEAD
---- Files affected: SPECS: glib2.spec (1.157.4.5 -> 1.157.4.6) ---- Diffs: ================================================================ Index: SPECS/glib2.spec diff -u SPECS/glib2.spec:1.157.4.5 SPECS/glib2.spec:1.157.4.6 --- SPECS/glib2.spec:1.157.4.5 Fri Dec 21 04:04:50 2007 +++ SPECS/glib2.spec Sun Dec 23 00:23:54 2007 @@ -20,13 +20,14 @@ Version: 2.15.0 Release: 1 Epoch: 1 -License: LGPL +License: LGPL v2+ Group: Libraries Source0: ftp://ftp.gtk.org/pub/glib/2.15/glib-%{version}.tar.bz2 # Source0-md5: 52536475a3f301842cf3448f19af094c 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 @@ -36,12 +37,17 @@ %{?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: pkgconfig >= 1:0.16.0 BuildRequires: rpmbuild(macros) >= 1.197 %{!?with_apidocs:BuildRequires: sed >= 4.0} Requires: iconv +Requires: pcre >= 7.2 +Provides: glib2-libs Obsoletes: glib2-libs +# [EMAIL PROTECTED] vs. [EMAIL PROTECTED] +Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -100,6 +106,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 @@ -159,6 +166,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %if !%{with apidocs} sed -e '/SUBDIRS/s/docs//' -i Makefile.am @@ -179,7 +187,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} @@ -191,6 +200,8 @@ m4datadir=%{_aclocaldir} \ pkgconfigdir=%{_pkgconfigdir} +[ -d $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED] ] || \ + mv -f $RPM_BUILD_ROOT%{_datadir}/locale/[EMAIL PROTECTED],latin} %find_lang glib20 --with-gnome %clean @@ -241,10 +252,44 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.157.4.6 2007-12-22 23:23:54 megabajt +- merged changes from HEAD + Revision 1.157.4.5 2007-12-21 03:04:50 patrys - 2.15.0 - here comes gio +Revision 1.167 2007/11/24 18:10:23 megabajt +- updated to 2.14.4 + +Revision 1.166 2007-11-07 17:01:32 megabajt +- updated to 2.14.3 + +Revision 1.165 2007/11/04 22:53:38 ankry +- [EMAIL PROTECTED] -> [EMAIL PROTECTED], rel. 2 + +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 + +Revision 1.162 2007/09/16 19:32:07 megabajt +- updated to 2.14.1 + +Revision 1.161 2007/08/14 16:46:11 megabajt +- updated to 2.14.0 + +Revision 1.160 2007/07/30 18:00:02 qboosh +- LGPL v2+ + +Revision 1.159 2007/07/26 08:42:32 megabajt +- updated to 2.12.13 + +Revision 1.158 2007/06/15 08:11:21 glen +- Provide: glib2-libs to avoid massive rebuilds; rel 2 + Revision 1.157.4.4 2007-06-07 15:26:15 megabajt - updated to 2.13.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/glib2.spec?r1=1.157.4.5&r2=1.157.4.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
