- merged 2.1.6 from DEVEL

Changed files:
    gal.spec -> 1.86

diff --git a/gal.spec b/gal.spec
index 4238ce006794fa4c62dd6afe8c7bb617247c0254..d2c340820bb4a412d52f0988ab635da17f9a2e36 100644 (file)
--- a/gal.spec
+++ b/gal.spec
@@ -6,27 +6,25 @@ Summary(pt_BR):       G App Libs: Biblioteca para uso em aplicativos GNOME
 Summary(ru):   âÉÂÌÉÏÔÅËÁ ÄÌÑ ÓÏÓÔÁ×ÎÙÈ ÄÏËÕÍÅÎÔÏ× × GNOME
 Summary(uk):   â¦Â̦ÏÔÅËÁ ÄÌÑ ËÏÍÐÏÎÅÎÔÎÉÈ ÄÏËÕÍÅÎÔ¦× × GNOME
 Name:          gal
-Version:       1.99.11
-Release:       2
+Version:       2.1.6
+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: 906c0640d3160a55aac98974aecfb316
-Patch0:                %{name}-iconv-in-glibc.patch
-Patch1:                %{name}-locale-names.patch
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
+# Source0-md5: 8121fd66132846d643b13720ade3c05b
+Patch0:                %{name}-locale-names.patch
+Patch1:                %{name}-iconv-in-glibc.patch
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: gettext-devel
-BuildRequires: gnome-common >= 2.3.0
-BuildRequires: gtk+2-devel >= 1:2.2.0
-BuildRequires: gtk-doc
-BuildRequires: intltool
-BuildRequires: libglade2-devel
-BuildRequires: libgnomecanvas-devel >= 2.2.0.2
-BuildRequires: libgnomeprint-devel >= 2.2.0
-BuildRequires: libgnomeprintui-devel >= 2.2.1
-BuildRequires: libgnomeui-devel >= 2.3.3.1-2
+BuildRequires: gnome-common >= 2.4.0
+BuildRequires: gtk+2-devel >= 1:2.4.0
+BuildRequires: gtk-doc >= 1.0
+BuildRequires: intltool >= 0.27.1
+BuildRequires: libglade2-devel >= 1:2.3.6
+BuildRequires: libgnomeprintui-devel >= 2.6.0
+BuildRequires: libgnomeui-devel >= 2.6.0
 BuildRequires: libtool
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
@@ -78,9 +76,9 @@ Summary(ru):  
 Summary(uk):   â¦Â̦ÏÔÅËÉ ÔÁ ÈÅÄÅÒÉ ÄÌÑ gal
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      libglade2-devel
-Requires:      libgnomeprintui-devel >= 2.2.1
-Requires:      libgnomeui-devel >= 2.3.3.1-2
+Requires:      libglade2-devel >= 1:2.3.6
+Requires:      libgnomeprintui-devel >= 2.6.0
+Requires:      libgnomeui-devel >= 2.6.0
 Obsoletes:     gal2-devel
 Obsoletes:     libgal19-devel
 
@@ -159,7 +157,7 @@ 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}
+%find_lang %{name}-2.2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -167,11 +165,11 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
-%files -f %{name}-%{version}.lang
+%files -f %{name}-2.2.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.2
 
 %files devel
 %defattr(644,root,root,755)