X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gal.spec;h=c751119ebf6251e869761360e3d79edcbf5943d6;hb=fc3e0cc94c814d7c1681092a67f1b9e9d33ba131;hp=8879e00c3f60fb813585c3caac317f38e36225b7;hpb=30d6c58dd357b163be4b97dc76a42de3b6282608;p=packages%2Fgal.git

diff --git a/gal.spec b/gal.spec
index 8879e00..c751119 100644
--- a/gal.spec
+++ b/gal.spec
@@ -6,28 +6,28 @@ Summary(pt_BR):	G App Libs: Biblioteca para uso em aplicativos GNOME
 Summary(ru):	âÉÂÌÉÏÔÅËÁ ÄÌÑ ÓÏÓÔÁ×ÎÙÈ ÄÏËÕÍÅÎÔÏ× × GNOME
 Summary(uk):	â¦Â̦ÏÔÅËÁ ÄÌÑ ËÏÍÐÏÎÅÎÔÎÉÈ ÄÏËÕÍÅÎÔ¦× × GNOME
 Name:		gal
-Version:	1.99.10
+Version:	2.4.0
 Release:	1
 Epoch:		1
 License:	LGPL
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/1.99/%{name}-%{version}.tar.bz2
-# Source0-md5:	72284a1e174329cb42149ae327f43995
-BuildRequires:	autoconf
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gal/2.4/%{name}-%{version}.tar.bz2
+# Source0-md5:	ce94075fa92400328ff02d7b8f3c7f3a
+Patch0:		%{name}-iconv-in-glibc.patch
+Patch1:		%{name}-gcc-3.4.patch
+BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	gettext-devel
-BuildRequires:	gnome-common >= 2.3.0
-BuildRequires:	gnome-vfs2-devel
-BuildRequires:	gtk+2-devel
-BuildRequires:	gtk-doc
-BuildRequires:	intltool
-BuildRequires:	libglade2-devel
-BuildRequires:	libgnomecanvas-devel
-BuildRequires:	libgnomeprint-devel >= 2.2.0
-BuildRequires:	libgnomeprintui-devel >= 2.2.1
-BuildRequires:	libgnomeui-devel >= 2.3.3.1-2
+BuildRequires:	gnome-common >= 2.8.0
+BuildRequires:	gtk+2-devel >= 2:2.6.2
+BuildRequires:	gtk-doc >= 1.0
+BuildRequires:	intltool >= 0.27.1
+BuildRequires:	libglade2-devel >= 1:2.5.0
+BuildRequires:	libgnomeprintui-devel >= 2.10.0
+BuildRequires:	libgnomeui-devel >= 2.10.0
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
+BuildRequires:	pkgconfig
 Obsoletes:	gal2
 Obsoletes:	libgal19
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -75,10 +75,10 @@ Summary(pt_BR):	Arquivos de inclus
 Summary(ru):	âÉÂÌÉÏÔÅËÉ É ÈÅÄÅÒÙ ÄÌÑ gal
 Summary(uk):	â¦Â̦ÏÔÅËÉ ÔÁ ÈÅÄÅÒÉ ÄÌÑ gal
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}
-Requires:	libglade2-devel
-Requires:	libgnomeprintui-devel >= 2.2.1
-Requires:	libgnomeui-devel >= 2.3.3.1-2
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	libglade2-devel >= 1:2.5.0
+Requires:	libgnomeprintui-devel >= 2.10.0
+Requires:	libgnomeui-devel >= 2.10.0
 Obsoletes:	gal2-devel
 Obsoletes:	libgal19-devel
 
@@ -110,7 +110,7 @@ Summary(es):	Bibliotecas est
 Summary(pl):	Biblioteki statyczne gala
 Summary(pt_BR):	Bibliotecas estáticas do gal
 Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{epoch}:%{version}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 Obsoletes:	gal2-static
 
 %description static
@@ -127,22 +127,21 @@ Bibliotecas est
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p0
 
 %build
-rm -f missing
 glib-gettextize --copy --force
 intltoolize --copy --force
 %{__libtoolize}
-%{__aclocal} -I %{_aclocaldir}/gnome2-macros
+%{__aclocal}
 %{__autoheader}
 %{__autoconf}
 %{__automake}
-
 %configure \
 	--enable-static \
 	--disable-gtk-doc \
 	--with-html-dir=%{_gtkdocdir}/%{name}
-
 %{__make}
 
 %install
@@ -154,7 +153,9 @@ rm -rf $RPM_BUILD_ROOT
 # shutup check-files
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/lib*.{la,a}
 
-%find_lang %{name}-%{version}
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
+%find_lang %{name}-2.4
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -162,11 +163,11 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%files -f %{name}-%{version}.lang
+%files -f %{name}-2.4.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%{_datadir}/gal-2.0
+%{_datadir}/gal-2.4
 
 %files devel
 %defattr(644,root,root,755)