- use rpmbuild(macros) deps for _gtkdocdir

[packages/glib2.git] / glib2.spec

diff --git a/glib2.spec b/glib2.spec
index 98314ece334ff4a0db8cd5ef395460db167fc61f..b5326f40147c73a9d9bcacb9d607d99e7a88646a 100644 (file)
--- a/glib2.spec
+++ b/glib2.spec
@@ -11,15 +11,14 @@ Summary(pt_BR):     Conjunto de fun
 Summary(tr):   Yararlý ufak yordamlar kitaplýðý
 Summary(zh_CN):        ʵÓù¤¾ßº¯Êý¿â
 Name:          glib2
-Version:       2.4.6
-Release:       2
+Version:       2.4.7
+Release:       1
 Epoch:         1
 License:       LGPL
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/gnome/sources/glib/2.4/glib-%{version}.tar.bz2
-# Source0-md5: a45db7d82480da431f6cd00ea041a534
+# Source0-md5: eff6fec89455addf8b0dee5a19e343be
 Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-locale-names.patch
 URL:           http://www.gtk.org/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake >= 1.7
@@ -30,7 +29,8 @@ BuildRequires:        libtool >= 1:1.4.2-9
 BuildRequires: pkgconfig >= 0.14.0
 BuildRequires: gettext-devel
 BuildRequires: perl-base
-BuildRequires: rpm-build >= 4.1-8.2
+BuildRequires: rpmbuild(macros) >= 1.98
+Requires:      iconv
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -135,9 +135,6 @@ Bibliotecas est
 %prep
 %setup -q -n glib-%{version}
 %patch0 -p1
-%patch1 -p1
-
-rm po/no.po
 
 %build
 gtkdocize --copy
@@ -163,6 +160,8 @@ rm -rf $RPM_BUILD_ROOT
        m4datadir=%{_aclocaldir} \
        pkgconfigdir=%{_pkgconfigdir}
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
 %find_lang glib --with-gnome --all-name
 
 %clean