- use rpmbuild(macros) deps for _gtkdocdir

[packages/glib2.git] / glib2.spec

diff --git a/glib2.spec b/glib2.spec
index f5b71f3548d6f7cbaf448c0a6a2c22ce5d7bdd89..b5326f40147c73a9d9bcacb9d607d99e7a88646a 100644 (file)
--- a/glib2.spec
+++ b/glib2.spec
@@ -11,23 +11,28 @@ Summary(pt_BR):     Conjunto de fun
 Summary(tr):   Yararlý ufak yordamlar kitaplýðý
 Summary(zh_CN):        ʵÓù¤¾ßº¯Êý¿â
 Name:          glib2
-Version:       2.0.6
-Release:       4
+Version:       2.4.7
+Release:       1
+Epoch:         1
 License:       LGPL
 Group:         Libraries
-Source0:       ftp://ftp.gtk.org/pub/gtk/v2.0/glib-%{version}.tar.bz2
+Source0:       http://ftp.gnome.org/pub/gnome/sources/glib/2.4/glib-%{version}.tar.bz2
+# Source0-md5: eff6fec89455addf8b0dee5a19e343be
 Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-am16.patch
 URL:           http://www.gtk.org/
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: gtk-doc >= 0.9-2
-BuildRequires: libtool
-BuildRequires: pkgconfig
+BuildRequires: autoconf >= 2.54
+BuildRequires: automake >= 1.7
+BuildRequires: docbook-dtd412-xml
+BuildRequires: docbook-style-xsl
+BuildRequires: gtk-doc >= 1.0
+BuildRequires: libtool >= 1:1.4.2-9
+BuildRequires: pkgconfig >= 0.14.0
+BuildRequires: gettext-devel
+BuildRequires: perl-base
+BuildRequires: rpmbuild(macros) >= 1.98
+Requires:      iconv
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _gtkdocdir      %{_defaultdocdir}/gtk-doc/html
-
 %description
 GLib, is a library which includes support routines for C such as
 lists, trees, hashes, memory allocation, and many other things. GLIB
@@ -55,7 +60,6 @@ Kirjasto, jossa on ty
 header-tiedostot ovat glib-devel-paketissa.
 
 %description -l ja
-
 GLib¤Ï¥æ¡¼¥Æ¥£¥ê¥Æ¥£´Ø¿ô¤ò½¸¤á¤¿ÊØÍø¤Ê¥é¥¤¥Ö¥é¥ê¤Ç¤¹¡£¤³¤Î£Ã¸À¸ìÍѥ饤¥Ö¥é¥ê¤Ï¡¢
 ¤¤¤¯¤Ä¤«¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤è¤¦À߷פµ¤ì¤Æ¤ª¤ê¡¢Â¿¤¯¤Î¥×¥í¥°¥é¥à¤«¤éÍ׵ᤵ¤ì¤ë»È¤¤¤ä¤¹¤¤
 ´Ø¿ô¤òÄ󶡤·¤Þ¤¹¡£
@@ -84,7 +88,7 @@ Summary(es):  Conjunto de funciones gr
 Summary(pl):   Pliki nag³ówkowe i dokumentacja do glib
 Summary(pt_BR):        Conjunto de ferramentas e biblioteca do kit de desenho do GIMP
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      gtk-doc-common
 
 %description devel
@@ -114,44 +118,38 @@ p
 
 %package static
 Summary:       Static glib libraries
-Summary(es):   Static libraries for glib development
 Summary(pl):   Biblioteki statyczne glib
 Summary(pt_BR):        Bibliotecas estáticas para desenvolvimento com glib
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Static glib libraries.
 
-%description static -l es
-Static libraries for glib development
-
 %description static -l pl
 Biblioteki statyczne glib.
 
 %description static -l pt_BR
-Bibliotecas estáticas para desenvolvimento com glib
+Bibliotecas estáticas para desenvolvimento com glib.
 
 %prep
 %setup -q -n glib-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
-rm -f missing[B
+gtkdocize --copy
 %{__libtoolize}
-aclocal
+%{__aclocal} -I m4macros
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-
-# Inside %%install gobject is linked against just built (installed)
-# version of glib.
-LDFLAGS="%{rpmldflags} -L%{buildroot}%{_libdir}"
 %configure \
        --enable-threads \
        --enable-gtk-doc \
-       --with-html-path=%{_gtkdocdir} \
-       --enable-static
+       --with-html-dir=%{_gtkdocdir} \
+       --enable-static \
+       --enable-debug=%{?debug:yes}%{!?debug:minimum} \
+       --enable-man
 %{__make}
 
 %install
@@ -160,11 +158,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        m4datadir=%{_aclocaldir} \
-       pkgconfigdir=%{_pkgconfigdir} \
-       HTML_DIR=%{_gtkdocdir}
+       pkgconfigdir=%{_pkgconfigdir}
 
-mv -f $RPM_BUILD_ROOT%{_mandir}/man1/glib{,2}-mkenums.1
-mv -f $RPM_BUILD_ROOT%{_mandir}/man1/glib{,2}-genmarshal.1
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
 %find_lang glib --with-gnome --all-name
 
@@ -176,22 +172,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f glib.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libg*.so.*.*
+%doc AUTHORS README NEWS
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc ChangeLog
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/lib*.la
+%{_libdir}/lib*.la
 %{_datadir}/glib-2.0
 %{_pkgconfigdir}/*
 %{_libdir}/glib-2.0
 %{_includedir}/*
 %{_gtkdocdir}/*
-
 %{_aclocaldir}/*
-%{_mandir}/man?/glib*
+%{_mandir}/man?/*
 
 %files static
 %defattr(644,root,root,755)