packages: glib2/glib2.spec - merged with DEVEL for gtk+2 >= 2.24.0
lisu
lisu at pld-linux.org
Thu Feb 3 21:17:40 CET 2011
Author: lisu Date: Thu Feb 3 20:17:40 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- merged with DEVEL for gtk+2 >= 2.24.0
---- Files affected:
packages/glib2:
glib2.spec (1.226 -> 1.227)
---- Diffs:
================================================================
Index: packages/glib2/glib2.spec
diff -u packages/glib2/glib2.spec:1.226 packages/glib2/glib2.spec:1.227
--- packages/glib2/glib2.spec:1.226 Sat Jan 29 15:47:06 2011
+++ packages/glib2/glib2.spec Thu Feb 3 21:17:35 2011
@@ -19,13 +19,13 @@
Summary(tr.UTF-8): Yararlı ufak yordamlar kitaplığı
Summary(zh_CN.UTF-8): 实用工具函数库
Name: glib2
-Version: 2.26.1
-Release: 2
+Version: 2.27.93
+Release: 1
Epoch: 1
License: LGPL v2+
Group: Libraries
-Source0: http://ftp.gnome.org/pub/GNOME/sources/glib/2.26/glib-%{version}.tar.bz2
-# Source0-md5: 17535accceef55bcb17a74d73f9c2aef
+Source0: http://ftp.gnome.org/pub/GNOME/sources/glib/2.27/glib-%{version}.tar.bz2
+# Source0-md5: 73954628c437408c189d62670a7032f7
Patch0: %{name}-makefile.patch
URL: http://www.gtk.org/
BuildRequires: autoconf >= 2.62
@@ -41,9 +41,8 @@
BuildRequires: pcre-devel >= 7.8
BuildRequires: perl-base
BuildRequires: pkgconfig >= 1:0.16.0
-BuildRequires: rpm-perlprov
BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: rpmbuild(macros) >= 1.527
BuildRequires: sed >= 4.0
BuildRequires: zlib-devel
Requires: iconv
@@ -180,7 +179,7 @@
%setup -q -n glib-%{version}
%patch0 -p1
%{__sed} -i 's#^en at shaw##' po/LINGUAS
-rm po/en at shaw.po
+%{__rm} po/en at shaw.po
%if !%{with apidocs}
%{__sed} -e '/SUBDIRS/s/docs//' -i Makefile.am
@@ -196,9 +195,11 @@
%{__autoheader}
%{__automake}
%configure \
+ --disable-silent-rules \
+ %{__enable_disable apidocs gtk-doc} \
%{?with_apidocs:--with-html-dir=%{_gtkdocdir}} \
- --%{?with_selinux:en}%{!?with_selinux:dis}able-selinux \
- --%{?with_static_libs:en}%{!?with_static_libs:dis}able-static \
+ %{__enable_disable selinux} \
+ %{__enable_disable static_libs static} \
--enable-debug=%{?debug:yes} \
--enable-man \
--enable-threads \
@@ -216,7 +217,9 @@
> $RPM_BUILD_ROOT%{_libdir}/gio/modules/giomodule.cache
-rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/libgiofam.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gio/modules/libgiofam.la \
+ %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/gio/modules/libgiofam.a}
+
%find_lang glib20
@@ -338,6 +341,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.227 2011/02/03 20:17:35 lisu
+- merged with DEVEL for gtk+2 >= 2.24.0
+
Revision 1.226 2011/01/29 14:47:06 charles
- removed obsolete --{dis,en}able-gtk-doc option
- fixed %istall if set without apidocs
@@ -354,6 +360,34 @@
Revision 1.222 2010/10/31 14:48:04 megabajt
- reverted previous commit; HEAD should be 2.26.x (2.27.x is on DEVEL)
+
+Revision 1.221.2.8 2011/02/03 13:22:55 wiget
+- 2.27.93
+- use %__enable_disable macro
+- disable silet rules
+
+Revision 1.221.2.7 2011/01/25 13:40:55 atler
+- don't remove static libs if building without static_libs
+- don't package mans from main package if building without apidocs
+
+Revision 1.221.2.6 2011/01/13 19:20:25 wiget
+- 2.27.91
+
+Revision 1.221.2.5 2011/01/09 23:26:07 wiget
+- 2.27.90
+
+Revision 1.221.2.4 2010/12/23 09:14:23 lisu
+- 2.27.5
+
+Revision 1.221.2.3 2010/12/08 09:04:57 lisu
+- 2.27.4
+- use rm macro
+
+Revision 1.221.2.2 2010/11/09 21:16:59 megabajt
+- updated to 2.27.3
+
+Revision 1.221.2.1 2010/11/01 17:50:23 megabajt
+- updated to 2.27.2
Revision 1.221 2010/10/31 14:42:23 megabajt
- updated to 2.27.1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glib2/glib2.spec?r1=1.226&r2=1.227&f=u
More information about the pld-cvs-commit
mailing list