- merged from DEVEL and updated to 2.4.0

Changed files:
    gal.spec -> 1.103

diff --git a/gal.spec b/gal.spec
index 17765c531c09845f3e78c50d1906b53a13ba33ee..c751119ebf6251e869761360e3d79edcbf5943d6 100644 (file)
--- a/gal.spec
+++ b/gal.spec
@@ -6,25 +6,25 @@ Summary(pt_BR):       G App Libs: Biblioteca para uso em aplicativos GNOME
 Summary(ru):   âÉÂÌÉÏÔÅËÁ ÄÌÑ ÓÏÓÔÁ×ÎÙÈ ÄÏËÕÍÅÎÔÏ× × GNOME
 Summary(uk):   â¦Â̦ÏÔÅËÁ ÄÌÑ ËÏÍÐÏÎÅÎÔÎÉÈ ÄÏËÕÍÅÎÔ¦× × GNOME
 Name:          gal
 Summary(ru):   âÉÂÌÉÏÔÅËÁ ÄÌÑ ÓÏÓÔÁ×ÎÙÈ ÄÏËÕÍÅÎÔÏ× × GNOME
 Summary(uk):   â¦Â̦ÏÔÅËÁ ÄÌÑ ËÏÍÐÏÎÅÎÔÎÉÈ ÄÏËÕÍÅÎÔ¦× × GNOME
 Name:          gal

-Version:       2.2.5
+Version:       2.4.0

 Release:       1
 Epoch:         1
 License:       LGPL
 Group:         X11/Libraries
 Release:       1
 Epoch:         1
 License:       LGPL
 Group:         X11/Libraries

-Source0:       http://ftp.gnome.org/pub/gnome/sources/gal/2.2/%{name}-%{version}.tar.bz2
-# Source0-md5: a3face85eb306dffd773fe8812912882
+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.8.0
 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.8.0

-BuildRequires: gtk+2-devel >= 2:2.4.4
+BuildRequires: gtk+2-devel >= 2:2.6.2

 BuildRequires: gtk-doc >= 1.0
 BuildRequires: intltool >= 0.27.1
 BuildRequires: gtk-doc >= 1.0
 BuildRequires: intltool >= 0.27.1

-BuildRequires: libglade2-devel >= 1:2.4.0
-BuildRequires: libgnomeprintui-devel >= 2.6.1
-BuildRequires: libgnomeui-devel >= 2.6.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
 BuildRequires: libtool
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig


@@ -76,9 +76,9 @@ Summary(ru):  
 Summary(uk):   â¦Â̦ÏÔÅËÉ ÔÁ ÈÅÄÅÒÉ ÄÌÑ gal
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Summary(uk):   â¦Â̦ÏÔÅËÉ ÔÁ ÈÅÄÅÒÉ ÄÌÑ gal
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}

-Requires:      libglade2-devel >= 1:2.4.0
-Requires:      libgnomeprintui-devel >= 2.6.1
-Requires:      libgnomeui-devel >= 2.6.1
+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
 
 Obsoletes:     gal2-devel
 Obsoletes:     libgal19-devel
 


@@ -142,7 +142,6 @@ intltoolize --copy --force
        --enable-static \
        --disable-gtk-doc \
        --with-html-dir=%{_gtkdocdir}/%{name}
        --enable-static \
        --disable-gtk-doc \
        --with-html-dir=%{_gtkdocdir}/%{name}

-

 %{__make}
 
 %install
 %{__make}
 
 %install


@@ -156,7 +155,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/lib*.{la,a}
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 

-%find_lang %{name}-2.2
+%find_lang %{name}-2.4

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -164,11 +163,11 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 

-%files -f %{name}-2.2.lang
+%files -f %{name}-2.4.lang

 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/lib*.so.*.*

-%{_datadir}/gal-2.2
+%{_datadir}/gal-2.4

 
 %files devel
 %defattr(644,root,root,755)
 
 %files devel
 %defattr(644,root,root,755)